From 190c1d326d1d6f54ec2c43ac61a4fc8f901e4419 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sat, 27 Jun 2009 23:54:03 +0800
Subject: [PATCH] Add SVN DCommit Command

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc                | Bin 438248 -> 438444 bytes
 src/TortoiseProc/Commands/Command.cpp           |  13 +++++-
 src/TortoiseProc/Commands/SVNDCommitCommand.cpp |  56 ++++++++++++++++++++++++
 src/TortoiseProc/Commands/SVNDCommitCommand.h   |  35 +++++++++++++++
 src/TortoiseProc/Commands/SVNRebaseCommand.cpp  |  32 ++++++++++++++
 src/TortoiseProc/Commands/SVNRebaseCommand.h    |  35 +++++++++++++++
 src/TortoiseProc/TortoiseProc.vcproj            |  44 ++++++++++++++-----
 src/TortoiseProc/resource.h                     | Bin 162320 -> 162320 bytes
 8 files changed, 201 insertions(+), 14 deletions(-)
 create mode 100644 src/TortoiseProc/Commands/SVNDCommitCommand.cpp
 create mode 100644 src/TortoiseProc/Commands/SVNDCommitCommand.h
 create mode 100644 src/TortoiseProc/Commands/SVNRebaseCommand.cpp
 create mode 100644 src/TortoiseProc/Commands/SVNRebaseCommand.h

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index d240b74b6d5487209712ff2a81b974596ec38f31..aa57bcd506bbad35b6e2b3251318569a5509c996 100644
GIT binary patch
delta 148
zcmaEHUuw-msfHHD7N!>F7M2#)Eo>ES(>YpL#HJ^-vT<oTGx#vLGB`5$F~l<jGlT$H
z!3-V@3JgjN&J3jtML?L!kjGHMpfLU55+>>CYLi*`gp(O^fTD>&xfn3c1Ij*(XOR~#
n1}aQsC}zk28juVm6M<UO8B(VoEMXO&Zm@z)YWspVHV;hzOx-22

delta 32
ocmZ4UQ0m2fsfHHD7N!>F7M2#)Eo>ES(<?k!__lksvn6Q)0NdXS<^TWy

diff --git a/src/TortoiseProc/Commands/Command.cpp b/src/TortoiseProc/Commands/Command.cpp
index 8466501..22bf3a2 100644
--- a/src/TortoiseProc/Commands/Command.cpp
+++ b/src/TortoiseProc/Commands/Command.cpp
@@ -62,7 +62,8 @@
 #include "SendMailCommand.h"
 #include "CatCommand.h"
 #include "RefBrowseCommand.h"
-
+#include "SVNDCommitCommand.h"
+#include "SVNRebaseCommand.h"
 
 #if 0
 
@@ -178,7 +179,9 @@ typedef enum
 	cmdSubUpdate,
 	cmdSubSync,
 	cmdRefLog,
-	cmdRefBrowse
+	cmdRefBrowse,
+	cmdSVNDCommit,
+	cmdSVNRebase,
 	
 } TGitCommand;
 
@@ -254,6 +257,8 @@ static const struct CommandInfo
 	{	cmdSubSync,			_T("subsync")			},
 	{	cmdRefLog,			_T("reflog")			},
 	{	cmdRefBrowse,		_T("refbrowse")			},
+	{	cmdSVNDCommit,		_T("svndcommit")		},
+	{	cmdSVNRebase,		_T("svnrebase")			},
 };
 
 
@@ -365,6 +370,10 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 		return new CatCommand;
 	case cmdRefBrowse:
 		return new RefBrowseCommand;
+	case cmdSVNDCommit:
+		return new SVNDCommitCommand;
+	case cmdSVNRebase:
+		return new SVNRebaseCommand;
 #if 0
 
 	
diff --git a/src/TortoiseProc/Commands/SVNDCommitCommand.cpp b/src/TortoiseProc/Commands/SVNDCommitCommand.cpp
new file mode 100644
index 0000000..2179884
--- /dev/null
+++ b/src/TortoiseProc/Commands/SVNDCommitCommand.cpp
@@ -0,0 +1,56 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2007-2008 - TortoiseGit
+
+// 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 "SVNDCommitCommand.h"
+
+#include "SysProgressDlg.h"
+#include "ProgressDlg.h"
+#include "MessageBox.h"
+#include "RenameDlg.h"
+#include "Git.h"
+#include "ShellUpdater.h"
+#include "CommonResource.h"
+
+bool SVNDCommitCommand::Execute()
+{
+	if(!g_Git.CheckCleanWorkTree())
+	{
+		if(CMessageBox::Show(NULL,	IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
+		{
+			CString cmd,out;
+			cmd=_T("git.exe stash apply ");
+			if(g_Git.Run(cmd,&out,CP_ACP))
+			{
+				CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
+				return false;
+			}
+
+		}else
+		{
+			return false;
+		}
+	}
+
+	CProgressDlg progress;
+	progress.m_GitCmd=_T("git.exe svn dcommit");
+	if(progress.DoModal()==IDOK)
+		return TRUE;
+
+	return true;
+}
diff --git a/src/TortoiseProc/Commands/SVNDCommitCommand.h b/src/TortoiseProc/Commands/SVNDCommitCommand.h
new file mode 100644
index 0000000..1e02c7a
--- /dev/null
+++ b/src/TortoiseProc/Commands/SVNDCommitCommand.h
@@ -0,0 +1,35 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2007 - TortoiseGit
+
+// 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
+ * Copies dropped items.
+ */
+class SVNDCommitCommand : public Command
+{
+public:
+	/**
+	 * Executes the command.
+	 */
+	virtual bool			Execute();
+};
+
+
diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
new file mode 100644
index 0000000..be3c9c1
--- /dev/null
+++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
@@ -0,0 +1,32 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2007-2008 - TortoiseGit
+
+// 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 "SVNRebaseCommand.h"
+
+#include "SysProgressDlg.h"
+#include "ProgressDlg.h"
+#include "MessageBox.h"
+#include "RenameDlg.h"
+#include "Git.h"
+#include "ShellUpdater.h"
+
+bool SVNRebaseCommand::Execute()
+{
+	return true;
+}
diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.h b/src/TortoiseProc/Commands/SVNRebaseCommand.h
new file mode 100644
index 0000000..cec001a
--- /dev/null
+++ b/src/TortoiseProc/Commands/SVNRebaseCommand.h
@@ -0,0 +1,35 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2007 - TortoiseGit
+
+// 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
+ * Copies dropped items.
+ */
+class SVNRebaseCommand : public Command
+{
+public:
+	/**
+	 * Executes the command.
+	 */
+	virtual bool			Execute();
+};
+
+
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 6dc63f4..6dbe9fe 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -580,11 +580,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\copy.ico"
+				RelativePath=".\copy.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\copy.ico"
+				RelativePath="..\Resources\copy.ico"
 				>
 			</File>
 			<File
@@ -612,11 +612,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
@@ -860,11 +860,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\newfolder.ico"
+				RelativePath=".\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\newfolder.ico"
+				RelativePath="..\Resources\newfolder.ico"
 				>
 			</File>
 			<File
@@ -896,11 +896,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\refresh.ico"
+				RelativePath=".\refresh.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\refresh.ico"
+				RelativePath="..\Resources\refresh.ico"
 				>
 			</File>
 			<File
@@ -976,11 +976,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
@@ -1080,11 +1080,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\up.ico"
+				RelativePath=".\up.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\up.ico"
+				RelativePath="..\Resources\up.ico"
 				>
 			</File>
 			<File
@@ -1979,6 +1979,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="SVN"
+				>
+				<File
+					RelativePath=".\Commands\SVNDCommitCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SVNDCommitCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SVNRebaseCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SVNRebaseCommand.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Utility Dialogs"
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index b48bd46ba2722ab2ddaa337d96a9472505fd80dd..5f0806d51f3ff33b954cfaf0f935f6af0252e3c3 100644
GIT binary patch
delta 76
zcmbR6g>%9e&W0_FH$tW>gfMco+l4Z2w+m%jBsw|ZHrMpNEG9N#KL&pWX9gbzR|ZE0
gKZbaQV1|(ChLMbt(+>b;r*CUxl-m9vi^+f=0LuLrTmS$7

delta 38
ucmbR6g>%9e&W0_FH$oUqCmV9;P7f$yWNY6L!nl1y2-6kO?GLh;4EO;oiVlGQ

-- 
2.11.0