OSDN Git Service

FormatPatch Finished
authorFrank Li <lznuaa@gmail.com>
Thu, 25 Dec 2008 07:48:18 +0000 (15:48 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 25 Dec 2008 07:48:18 +0000 (15:48 +0800)
13 files changed:
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AddDlg.cpp
src/TortoiseProc/AddDlg.h
src/TortoiseProc/Commands/AddCommand.cpp
src/TortoiseProc/Commands/Command.cpp
src/TortoiseProc/Commands/FormatPatchCommand.cpp [new file with mode: 0644]
src/TortoiseProc/Commands/FormatPatchCommand.h [new file with mode: 0644]
src/TortoiseProc/Commands/IgnoreCommand.cpp
src/TortoiseProc/FormatPatchDlg.cpp [new file with mode: 0644]
src/TortoiseProc/FormatPatchDlg.h [new file with mode: 0644]
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
src/TortoiseProc/resource.h

index 62935b5..0ba5376 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index 9f11735..1b484ec 100644 (file)
@@ -21,7 +21,7 @@
 #include "messagebox.h"\r
 #include "DirFileEnum.h"\r
 #include "AddDlg.h"\r
-#include "SVNConfig.h"\r
+//#include "SVNConfig.h"\r
 #include "Registry.h"\r
 \r
 #define REFRESHTIMER   100\r
@@ -48,8 +48,8 @@ void CAddDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CAddDlg, CResizableStandAloneDialog)\r
        ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)\r
        ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
-       ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
-       ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
+       ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
+       ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
        ON_WM_TIMER()\r
 END_MESSAGE_MAP()\r
 \r
@@ -213,7 +213,7 @@ LRESULT CAddDlg::OnFileDropped(WPARAM, LPARAM lParam)
        // When the timer expires, we start the refresh thread,\r
        // but only if it isn't already running - otherwise we\r
        // restart the timer.\r
-       CTSVNPath path;\r
+       CTGitPath path;\r
        path.SetFromWin((LPCTSTR)lParam);\r
 \r
        if (!m_addListCtrl.HasPath(path))\r
index 1413d16..ecb3453 100644 (file)
@@ -19,7 +19,7 @@
 #pragma once\r
 \r
 #include "StandAloneDlg.h"\r
-#include "SVNStatusListCtrl.h"\r
+#include "GitStatusListCtrl.h"\r
 \r
 /**\r
  * \ingroup TortoiseProc\r
@@ -58,10 +58,10 @@ private:
 public:\r
        /** holds all the selected files/folders the user wants to add to version \r
         * control on exit */\r
-       CTSVNPathList   m_pathList;\r
+       CTGitPathList   m_pathList;\r
 \r
 private:\r
-       CSVNStatusListCtrl      m_addListCtrl;\r
+       CGitStatusListCtrl      m_addListCtrl;\r
        volatile LONG   m_bThreadRunning;\r
        CButton                 m_SelectAll;\r
        bool                    m_bCancelled;\r
index d76a5d8..775d5f8 100644 (file)
@@ -28,14 +28,17 @@ bool AddCommand::Execute()
        bool bRet = false;\r
        if (parser.HasKey(_T("noui")))\r
        {\r
+#if 0\r
                SVN svn;\r
                ProjectProperties props;\r
                props.ReadPropsPathList(pathList);\r
                bRet = !!svn.Add(pathList, &props, svn_depth_empty, FALSE, FALSE, TRUE);\r
                CShellUpdater::Instance().AddPathsForUpdate(pathList);\r
+#endif\r
        }\r
        else\r
        {\r
+#if 0\r
                if (pathList.AreAllPathsFiles())\r
                {\r
                        SVN svn;\r
@@ -46,10 +49,12 @@ bool AddCommand::Execute()
                }\r
                else\r
                {\r
+#endif\r
                        CAddDlg dlg;\r
                        dlg.m_pathList = pathList;\r
                        if (dlg.DoModal() == IDOK)\r
                        {\r
+#if 0\r
                                if (dlg.m_pathList.GetCount() == 0)\r
                                        return FALSE;\r
                                CSVNProgressDlg progDlg;\r
@@ -64,8 +69,9 @@ bool AddCommand::Execute()
                                progDlg.SetItemCount(dlg.m_pathList.GetCount());\r
                                progDlg.DoModal();\r
                                bRet = !progDlg.DidErrorsOccur();\r
+#endif\r
                        }\r
-               }\r
+       //      }\r
        }\r
        return bRet;\r
 }\r
index 5f8f059..162c62e 100644 (file)
 #include "MergeCommand.h"\r
 #include "SwitchCommand.h"\r
 #include "ExportCommand.h"\r
+#include "AddCommand.h"\r
+#include "IgnoreCommand.h"\r
+#include "FormatPatchCommand.h"\r
 \r
 #if 0\r
-#include "AddCommand.h"\r
+\r
 #include "BlameCommand.h"\r
 #include "CatCommand.h"\r
 #include "CheckoutCommand.h"\r
@@ -62,7 +65,7 @@
 #include "DropMoveCommand.h"\r
 \r
 #include "HelpCommand.h"\r
-#include "IgnoreCommand.h"\r
+\r
 #include "ImportCommand.h"\r
 #include "LockCommand.h"\r
 \r
@@ -113,6 +116,7 @@ typedef enum
        cmdDropExport,\r
        cmdDropMove,\r
        cmdFetch,\r
+       cmdFormatPatch,\r
        cmdExport,\r
        cmdHelp,\r
        cmdIgnore,\r
@@ -176,6 +180,7 @@ static const struct CommandInfo
        {       cmdDropExport,          _T("dropexport")                },\r
        {       cmdDropMove,            _T("dropmove")                  },\r
        {       cmdFetch,                       _T("fetch")                             },\r
+       {       cmdFormatPatch,         _T("formatpatch")               },\r
        {       cmdExport,                      _T("export")                    },\r
        {       cmdHelp,                        _T("help")                              },\r
        {       cmdIgnore,                      _T("ignore")                    },\r
@@ -273,9 +278,15 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new SwitchCommand;\r
        case cmdExport:\r
                return new ExportCommand;\r
-#if 0\r
        case cmdAdd:\r
                return new AddCommand;\r
+       case cmdIgnore:\r
+               return new IgnoreCommand;\r
+       case cmdFormatPatch:\r
+               return new FormatPatchCommand;\r
+\r
+#if 0\r
+\r
        case cmdBlame:\r
                return new BlameCommand;\r
        case cmdCat:\r
@@ -307,8 +318,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 \r
        case cmdHelp:\r
                return new HelpCommand;\r
-       case cmdIgnore:\r
-               return new IgnoreCommand;\r
+\r
        case cmdImport:\r
                return new ImportCommand;\r
        case cmdLock:\r
@@ -341,8 +351,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 \r
        case cmdResolve:\r
                return new ResolveCommand;\r
-       case cmdRevert:\r
-               return new RevertCommand;\r
+\r
        case cmdRevisionGraph:\r
                return new RevisionGraphCommand;\r
        case cmdSettings:\r
diff --git a/src/TortoiseProc/Commands/FormatPatchCommand.cpp b/src/TortoiseProc/Commands/FormatPatchCommand.cpp
new file mode 100644 (file)
index 0000000..0c1138e
--- /dev/null
@@ -0,0 +1,65 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2007-2008 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#include "StdAfx.h"\r
+#include "FormatPatchCommand.h"\r
+\r
+#include "MessageBox.h"\r
+#include "FormatPatchDlg.h"\r
+#include "InputLogDlg.h"\r
+#include "Git.h"\r
+#include "DirFileEnum.h"\r
+#include "ShellUpdater.h"\r
+\r
+bool FormatPatchCommand::Execute()\r
+{\r
+       CFormatPatchDlg dlg;\r
+//     dlg.m_bIsTag=TRUE;\r
+       \r
+       if(dlg.DoModal()==IDOK)\r
+       {\r
+               CString cmd;\r
+               CString range;\r
+\r
+               switch(dlg.m_Radio)\r
+               {\r
+               case IDC_RADIO_SINCE:\r
+                       range=dlg.m_Since;\r
+                       break;\r
+               case IDC_RADIO_NUM:\r
+                       range.Format(_T("-n%d"),dlg.m_Num);\r
+                       break;\r
+               case IDC_RADIO_RANGE:\r
+                       range.Format(_T("%s..%s"),dlg.m_From,dlg.m_To);\r
+                       break;\r
+               }\r
+               cmd.Format(_T("git.exe format-patch -o \"%s\" %s"),\r
+                       dlg.m_Dir,\r
+                       range\r
+                       );\r
+\r
+               CString out;\r
+               if(g_Git.Run(cmd,&out))\r
+               {\r
+                       CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
+               }\r
+               return TRUE;\r
+               \r
+       }\r
+       return FALSE;\r
+}\r
diff --git a/src/TortoiseProc/Commands/FormatPatchCommand.h b/src/TortoiseProc/Commands/FormatPatchCommand.h
new file mode 100644 (file)
index 0000000..0976fb0
--- /dev/null
@@ -0,0 +1,35 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2007 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#pragma once\r
+#include "Command.h"\r
+\r
+/**\r
+ * \ingroup TortoiseProc\r
+ * Renames files and folders.\r
+ */\r
+class FormatPatchCommand : public Command\r
+{\r
+public:\r
+       /**\r
+        * Executes the command.\r
+        */\r
+       virtual bool                    Execute();\r
+};\r
+\r
+\r
index 37bc0d5..ec3458a 100644 (file)
 \r
 #include "MessageBox.h"\r
 #include "PathUtils.h"\r
-#include "SVNProperties.h"\r
+//#include "SVNProperties.h"\r
 \r
 bool IgnoreCommand::Execute()\r
 {\r
+#if 0\r
        CString filelist;\r
        BOOL err = FALSE;\r
        for(int nPath = 0; nPath < pathList.GetCount(); nPath++)\r
@@ -88,5 +89,6 @@ bool IgnoreCommand::Execute()
                CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONINFORMATION);\r
                return true;\r
        }\r
+#endif\r
        return false;\r
 }
\ No newline at end of file
diff --git a/src/TortoiseProc/FormatPatchDlg.cpp b/src/TortoiseProc/FormatPatchDlg.cpp
new file mode 100644 (file)
index 0000000..8087b4f
--- /dev/null
@@ -0,0 +1,151 @@
+// FormatPatch.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "FormatPatchDlg.h"\r
+#include "git.h"\r
+#include "BrowseFolder.h"\r
+// CFormatPatchDlg dialog\r
+\r
+IMPLEMENT_DYNAMIC(CFormatPatchDlg, CResizableStandAloneDialog)\r
+\r
+CFormatPatchDlg::CFormatPatchDlg(CWnd* pParent /*=NULL*/)\r
+       : CResizableStandAloneDialog(CFormatPatchDlg::IDD, pParent)\r
+{\r
+       m_Num=1;\r
+}\r
+\r
+CFormatPatchDlg::~CFormatPatchDlg()\r
+{\r
+}\r
+\r
+void CFormatPatchDlg::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CDialog::DoDataExchange(pDX);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_DIR,    m_cDir);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_SINCE,  m_cSince);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_FROM,   m_cFrom);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_TO,             m_cTo);\r
+       DDX_Control(pDX, IDC_EDIT_NUM,                  m_cNum);\r
+\r
+       DDX_Text(pDX,IDC_EDIT_NUM,m_Num);\r
+\r
+       DDX_Text(pDX, IDC_COMBOBOXEX_DIR,       m_Dir);\r
+       DDX_Text(pDX, IDC_COMBOBOXEX_SINCE,     m_Since);\r
+       DDX_Text(pDX, IDC_COMBOBOXEX_FROM,      m_From);\r
+       DDX_Text(pDX, IDC_COMBOBOXEX_TO,        m_To);\r
+       \r
+\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CFormatPatchDlg, CResizableStandAloneDialog)\r
+       ON_BN_CLICKED(IDC_BUTTON_DIR, &CFormatPatchDlg::OnBnClickedButtonDir)\r
+       ON_BN_CLICKED(IDC_BUTTON_FROM, &CFormatPatchDlg::OnBnClickedButtonFrom)\r
+       ON_BN_CLICKED(IDC_BUTTON_TO, &CFormatPatchDlg::OnBnClickedButtonTo)\r
+       ON_BN_CLICKED(IDOK, &CFormatPatchDlg::OnBnClickedOk)\r
+       ON_BN_CLICKED(IDC_RADIO_SINCE, &CFormatPatchDlg::OnBnClickedRadio)\r
+       ON_BN_CLICKED(IDC_RADIO_NUM, &CFormatPatchDlg::OnBnClickedRadio)\r
+       ON_BN_CLICKED(IDC_RADIO_RANGE, &CFormatPatchDlg::OnBnClickedRadio)\r
+END_MESSAGE_MAP()\r
+\r
+BOOL CFormatPatchDlg::OnInitDialog()\r
+{\r
+       CResizableStandAloneDialog::OnInitDialog();\r
+       \r
+       AddAnchor(IDC_GROUP_DIR, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_DIR,TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_BUTTON_DIR, TOP_RIGHT);\r
+\r
+       AddAnchor(IDC_GROUP_VERSION, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_SINCE, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_EDIT_NUM, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_SPIN_NUM, TOP_RIGHT);\r
+\r
+       AddAnchor(IDC_COMBOBOXEX_FROM, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_TO, TOP_LEFT, TOP_RIGHT);\r
+\r
+       AddAnchor(IDC_BUTTON_FROM,  TOP_RIGHT);\r
+       AddAnchor(IDC_BUTTON_TO,        TOP_RIGHT);\r
+\r
+       m_cDir.SetPathHistory(TRUE);\r
+       m_cDir.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchURLS"), _T("path"));\r
+       m_cDir.SetCurSel(0);\r
+\r
+       CStringList list;\r
+       g_Git.GetBranchList(list,NULL,CGit::BRANCH_ALL);\r
+       m_cSince.AddString(list);\r
+\r
+       m_cFrom.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchFromURLS"), _T("ver"));\r
+       m_cFrom.SetCurSel(0);\r
+\r
+       m_cTo.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchToURLS"), _T("ver"));\r
+       m_cTo.SetCurSel(0);\r
+\r
+       this->CheckRadioButton(IDC_RADIO_SINCE,IDC_RADIO_RANGE,IDC_RADIO_SINCE);\r
+       \r
+       OnBnClickedRadio();\r
+\r
+       return TRUE;\r
+}\r
+// CFormatPatchDlg message handlers\r
+\r
+void CFormatPatchDlg::OnBnClickedButtonDir()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+       CBrowseFolder browseFolder;\r
+       browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
+       CString strCloneDirectory;\r
+       this->UpdateData(TRUE);\r
+       strCloneDirectory=m_Dir;\r
+       if (browseFolder.Show(GetSafeHwnd(), strCloneDirectory) == CBrowseFolder::OK) \r
+       {\r
+               m_Dir=strCloneDirectory;\r
+               this->UpdateData(FALSE);\r
+       }\r
+}\r
+\r
+void CFormatPatchDlg::OnBnClickedButtonFrom()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+}\r
+\r
+void CFormatPatchDlg::OnBnClickedButtonTo()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+}\r
+\r
+void CFormatPatchDlg::OnBnClickedOk()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+\r
+       m_cDir.SaveHistory();\r
+       m_cFrom.SaveHistory();\r
+       m_cTo.SaveHistory();\r
+       this->UpdateData(TRUE);\r
+       this->m_Radio=GetCheckedRadioButton(IDC_RADIO_SINCE,IDC_RADIO_RANGE);\r
+       OnOK();\r
+}\r
+\r
+void CFormatPatchDlg::OnBnClickedRadio()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+       int radio=this->GetCheckedRadioButton(IDC_RADIO_SINCE,IDC_RADIO_RANGE);\r
+       m_cSince.EnableWindow(FALSE);\r
+       m_cNum.EnableWindow(FALSE);\r
+       m_cFrom.EnableWindow(FALSE);\r
+       m_cTo.EnableWindow(FALSE);\r
+       switch(radio)\r
+       {\r
+       case IDC_RADIO_SINCE:\r
+               m_cSince.EnableWindow(TRUE);\r
+               break;\r
+       case IDC_RADIO_NUM:\r
+               m_cNum.EnableWindow(TRUE);\r
+               break;\r
+       case IDC_RADIO_RANGE:\r
+               m_cFrom.EnableWindow(TRUE);\r
+               m_cTo.EnableWindow(TRUE);\r
+       }\r
+}\r
diff --git a/src/TortoiseProc/FormatPatchDlg.h b/src/TortoiseProc/FormatPatchDlg.h
new file mode 100644 (file)
index 0000000..8f12238
--- /dev/null
@@ -0,0 +1,43 @@
+#pragma once\r
+\r
+#include "StandAloneDlg.h"\r
+#include "HistoryCombo.h"\r
+\r
+// CFormatPatchDlg dialog\r
+\r
+class CFormatPatchDlg : public CResizableStandAloneDialog\r
+{\r
+       DECLARE_DYNAMIC(CFormatPatchDlg)\r
+\r
+public:\r
+       CFormatPatchDlg(CWnd* pParent = NULL);   // standard constructor\r
+       virtual ~CFormatPatchDlg();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_FORMAT_PATCH };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+       virtual BOOL OnInitDialog();\r
+\r
+       CHistoryCombo m_cDir;\r
+       CHistoryCombo m_cSince;\r
+       CHistoryCombo m_cFrom;\r
+       CHistoryCombo m_cTo;\r
+       CEdit             m_cNum;\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+public:\r
+       int m_Num;\r
+       CString m_Dir;\r
+       CString m_From;\r
+       CString m_To;\r
+       CString m_Since;\r
+       int m_Radio;\r
+\r
+       afx_msg void OnBnClickedButtonDir();\r
+       afx_msg void OnBnClickedButtonFrom();\r
+       afx_msg void OnBnClickedButtonTo();\r
+       afx_msg void OnBnClickedOk();\r
+       afx_msg void OnBnClickedRadio();\r
+};\r
index 0e34756..a9e3f61 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="Add"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\AddCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\AddCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Ignore"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\IgnoreCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\IgnoreCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Patch"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\FormatPatchCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\FormatPatchCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Utility Dialogs"\r
                        >\r
                        <File\r
+                               RelativePath=".\AddDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\AddDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\ChangedDlg.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\FormatPatchDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\FormatPatchDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\GitSwitchDlg.cpp"\r
                                >\r
                        </File>\r
index 4104e04..c0d2327 100644 (file)
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:export /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
+                               CommandArguments="/command:formatpatch /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r
index c9fdf42..6e8bb78 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ