From: Frank Li <lznuaa@gmail.com>
Date: Thu, 25 Dec 2008 09:11:03 +0000 (+0800)
Subject: Add Patch Import Command (git am)
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=e1130385d0bec0c6fa5f5b7b99b32b6f70bf2a62

Add Patch Import Command (git am)
---

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 0ba5376..6b9d03b 100644
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
diff --git a/src/TortoiseProc/Commands/Command.cpp b/src/TortoiseProc/Commands/Command.cpp
index 162c62e..a9e6f34 100644
--- a/src/TortoiseProc/Commands/Command.cpp
+++ b/src/TortoiseProc/Commands/Command.cpp
@@ -44,6 +44,8 @@
 #include "AddCommand.h"
 #include "IgnoreCommand.h"
 #include "FormatPatchCommand.h"
+#include "ImportPatchCommand.h"
+
 
 #if 0
 
@@ -121,6 +123,7 @@ typedef enum
 	cmdHelp,
 	cmdIgnore,
 	cmdImport,
+	cmdImportPatch,
 	cmdLock,
 	cmdLog,
 	cmdMerge,
@@ -185,6 +188,7 @@ static const struct CommandInfo
 	{	cmdHelp,			_T("help")				},
 	{	cmdIgnore,			_T("ignore")			},
 	{	cmdImport,			_T("import")			},
+	{	cmdImportPatch,		_T("importpatch")		},
 	{	cmdLock,			_T("lock")				},
 	{	cmdLog,				_T("log")				},
 	{	cmdMerge,			_T("merge")				},
@@ -284,6 +288,8 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 		return new IgnoreCommand;
 	case cmdFormatPatch:
 		return new FormatPatchCommand;
+	case cmdImportPatch:
+		return new ImportPatchCommand;
 
 #if 0
 
diff --git a/src/TortoiseProc/Commands/ImportPatchCommand.cpp b/src/TortoiseProc/Commands/ImportPatchCommand.cpp
new file mode 100644
index 0000000..67b6570
--- /dev/null
+++ b/src/TortoiseProc/Commands/ImportPatchCommand.cpp
@@ -0,0 +1,49 @@
+// TortoiseSVN - a Windows shell extension for easy version control
+
+// Copyright (C) 2007-2008 - TortoiseSVN
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+#include "StdAfx.h"
+#include "ImportPatchCommand.h"
+
+#include "MessageBox.h"
+#include "ImportPatchDlg.h"
+#include "InputLogDlg.h"
+#include "Git.h"
+#include "DirFileEnum.h"
+#include "ShellUpdater.h"
+
+bool ImportPatchCommand::Execute()
+{
+	CImportPatchDlg dlg;
+//	dlg.m_bIsTag=TRUE;
+	CString cmd;
+	if(dlg.DoModal()==IDOK)
+	{
+		for(int i=0;i<dlg.m_PathList.GetCount();i++)
+		{			
+			cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());
+			CString output;
+			if(g_Git.Run(cmd,&output))
+			{
+				CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
+				return FALSE;
+			}
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
diff --git a/src/TortoiseProc/Commands/ImportPatchCommand.h b/src/TortoiseProc/Commands/ImportPatchCommand.h
new file mode 100644
index 0000000..7a6494e
--- /dev/null
+++ b/src/TortoiseProc/Commands/ImportPatchCommand.h
@@ -0,0 +1,35 @@
+// TortoiseSVN - a Windows shell extension for easy version control
+
+// Copyright (C) 2007 - TortoiseSVN
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+#pragma once
+#include "Command.h"
+
+/**
+ * \ingroup TortoiseProc
+ * Renames files and folders.
+ */
+class ImportPatchCommand : public Command
+{
+public:
+	/**
+	 * Executes the command.
+	 */
+	virtual bool			Execute();
+};
+
+
diff --git a/src/TortoiseProc/ImportPatchDlg.cpp b/src/TortoiseProc/ImportPatchDlg.cpp
new file mode 100644
index 0000000..8503a3a
--- /dev/null
+++ b/src/TortoiseProc/ImportPatchDlg.cpp
@@ -0,0 +1,157 @@
+// ImportPatchDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "TortoiseProc.h"
+#include "ImportPatchDlg.h"
+
+
+// CImportPatchDlg dialog
+
+IMPLEMENT_DYNAMIC(CImportPatchDlg, CResizableStandAloneDialog)
+
+CImportPatchDlg::CImportPatchDlg(CWnd* pParent /*=NULL*/)
+	: CResizableStandAloneDialog(CImportPatchDlg::IDD, pParent)
+{
+
+}
+
+CImportPatchDlg::~CImportPatchDlg()
+{
+
+}
+
+void CImportPatchDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_LIST_PATCH,m_cList);
+}
+
+BOOL CImportPatchDlg::OnInitDialog()
+{
+	CResizableStandAloneDialog::OnInitDialog();
+
+	AddAnchor(IDC_LIST_PATCH, TOP_LEFT, BOTTOM_RIGHT);
+	AddAnchor(IDC_BUTTON_ADD, TOP_RIGHT);
+	AddAnchor(IDC_BUTTON_UP, TOP_RIGHT);
+	AddAnchor(IDC_BUTTON_DOWN, TOP_RIGHT);
+	AddAnchor(IDC_BUTTON_REMOVE, TOP_RIGHT);
+
+	AddAnchor(IDOK,BOTTOM_RIGHT);
+	AddAnchor(IDCANCEL,BOTTOM_RIGHT);
+
+
+	return TRUE;
+}
+
+BEGIN_MESSAGE_MAP(CImportPatchDlg, CResizableStandAloneDialog)
+	ON_LBN_SELCHANGE(IDC_LIST_PATCH, &CImportPatchDlg::OnLbnSelchangeListPatch)
+	ON_BN_CLICKED(IDC_BUTTON_ADD, &CImportPatchDlg::OnBnClickedButtonAdd)
+	ON_BN_CLICKED(IDC_BUTTON_UP, &CImportPatchDlg::OnBnClickedButtonUp)
+	ON_BN_CLICKED(IDC_BUTTON_DOWN, &CImportPatchDlg::OnBnClickedButtonDown)
+	ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CImportPatchDlg::OnBnClickedButtonRemove)
+	ON_BN_CLICKED(IDOK, &CImportPatchDlg::OnBnClickedOk)
+END_MESSAGE_MAP()
+
+
+// CImportPatchDlg message handlers
+
+void CImportPatchDlg::OnLbnSelchangeListPatch()
+{
+	// TODO: Add your control notification handler code here
+	if(m_cList.GetSelectedCount() == 0)
+	{
+		this->GetDlgItem(IDC_BUTTON_UP)->EnableWindow(FALSE);
+		this->GetDlgItem(IDC_BUTTON_DOWN)->EnableWindow(FALSE);
+		this->GetDlgItem(IDC_BUTTON_REMOVE)->EnableWindow(FALSE);
+	}else
+	{
+		this->GetDlgItem(IDC_BUTTON_UP)->EnableWindow(TRUE);
+		this->GetDlgItem(IDC_BUTTON_DOWN)->EnableWindow(TRUE);
+		this->GetDlgItem(IDC_BUTTON_REMOVE)->EnableWindow(TRUE);
+
+	}
+
+}
+
+void CImportPatchDlg::OnBnClickedButtonAdd()
+{
+	
+	CFileDialog dlg(TRUE,NULL,
+					NULL,
+					OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT|OFN_ALLOWMULTISELECT,
+					_T("Patch Files(*.patch)|*.patch|Diff Files(*.diff)|*.diff|All Files(*.*)|*.*||"));
+	if(dlg.DoModal()==IDOK)
+	{
+		POSITION pos;
+		pos=dlg.GetStartPosition();
+		while(pos)
+		{
+			m_cList.InsertItem(0,dlg.GetNextPathName(pos));
+		}
+	}
+
+	// TODO: Add your control notification handler code here
+}
+
+void CImportPatchDlg::OnBnClickedButtonUp()
+{
+	// TODO: Add your control notification handler code here
+	POSITION pos;
+	pos=m_cList.GetFirstSelectedItemPosition();
+	while(pos)
+	{
+		int index=m_cList.GetNextSelectedItem(pos);
+		if(index>1)
+		{
+			CString old=m_cList.GetItemText(index,0);
+			m_cList.DeleteItem(index);
+
+			m_cList.InsertItem(index-1,old);
+		}
+	}
+
+}
+
+void CImportPatchDlg::OnBnClickedButtonDown()
+{
+	// TODO: Add your control notification handler code here
+	POSITION pos;
+	pos=m_cList.GetFirstSelectedItemPosition();
+	while(pos)
+	{
+		int index=m_cList.GetNextSelectedItem(pos);
+		
+		CString old=m_cList.GetItemText(index,0);
+		m_cList.DeleteItem(index);
+
+		m_cList.InsertItem(index+1,old);
+		
+	}
+}
+
+void CImportPatchDlg::OnBnClickedButtonRemove()
+{
+	// TODO: Add your control notification handler code here
+	POSITION pos;
+	pos=m_cList.GetFirstSelectedItemPosition();
+	while(pos)
+	{
+		int index=m_cList.GetNextSelectedItem(pos);
+		m_cList.DeleteItem(index);
+		pos=m_cList.GetFirstSelectedItemPosition();
+	}
+}
+
+void CImportPatchDlg::OnBnClickedOk()
+{
+	// TODO: Add your control notification handler code here
+	int i;
+	for(int i=0;i<m_cList.GetItemCount();i++)
+	{
+		CTGitPath path;
+		path.SetFromWin(m_cList.GetItemText(i,0));
+		m_PathList.AddPath(path);
+	}
+	OnOK();
+}
diff --git a/src/TortoiseProc/ImportPatchDlg.h b/src/TortoiseProc/ImportPatchDlg.h
new file mode 100644
index 0000000..ceab47e
--- /dev/null
+++ b/src/TortoiseProc/ImportPatchDlg.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "StandAloneDlg.h"
+// CImportPatchDlg dialog
+#include "TGitPath.h"
+
+class CImportPatchDlg : public CResizableStandAloneDialog
+{
+	DECLARE_DYNAMIC(CImportPatchDlg)
+
+public:
+	CImportPatchDlg(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CImportPatchDlg();
+
+// Dialog Data
+	enum { IDD = IDD_APPLY_PATCH_LIST };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual BOOL OnInitDialog();
+
+	CListCtrl m_cList;
+	DECLARE_MESSAGE_MAP()
+public:
+	afx_msg void OnLbnSelchangeListPatch();
+	afx_msg void OnBnClickedButtonAdd();
+	afx_msg void OnBnClickedButtonUp();
+	afx_msg void OnBnClickedButtonDown();
+	afx_msg void OnBnClickedButtonRemove();
+	afx_msg void OnBnClickedOk();
+
+	CTGitPathList m_PathList;
+};
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index a9e3f61..f24f034 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -1340,6 +1340,14 @@
 					RelativePath=".\Commands\FormatPatchCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Commands\ImportPatchCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\ImportPatchCommand.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1414,6 +1422,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ImportPatchDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ImportPatchDlg.h"
+				>
+			</File>
+			<File
 				RelativePath=".\MergeDlg.cpp"
 				>
 			</File>
diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index c0d2327..054e486 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
 			<DebugSettings
 				Command="$(TargetPath)"
 				WorkingDirectory="D:\Profiles\b20596\tortoisegit"
-				CommandArguments="/command:formatpatch /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"
+				CommandArguments="/command:importpatch /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"
 				Attach="false"
 				DebuggerType="3"
 				Remote="1"
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 6e8bb78..b5807ac 100644
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ