Commit DialogBox compile Okay

[tortoisegit/TortoiseGitJp.git] / TortoiseProc / Commands / CommitCommand.cpp

diff --git a/TortoiseProc/Commands/CommitCommand.cpp b/TortoiseProc/Commands/CommitCommand.cpp
index db4a263..80c7ece 100644 (file)
--- a/TortoiseProc/Commands/CommitCommand.cpp
+++ b/TortoiseProc/Commands/CommitCommand.cpp
@@ -20,7 +20,7 @@
 #include "CommitCommand.h"\r
 \r
 #include "CommitDlg.h"\r
-#include "SVNProgressDlg.h"\r
+//#include "SVNProgressDlg.h"\r
 #include "StringUtils.h"\r
 #include "Hooks.h"\r
 #include "MessageBox.h"\r
@@ -44,26 +44,28 @@ bool CommitCommand::Execute()
 {\r
        bool bRet = false;\r
        bool bFailed = true;\r
-       CTSVNPathList selectedList;\r
+       CTGitPathList selectedList;\r
        if (parser.HasKey(_T("logmsg")) && (parser.HasKey(_T("logmsgfile"))))\r
        {\r
                CMessageBox::Show(hwndExplorer, IDS_ERR_TWOLOGPARAMS, IDS_APPNAME, MB_ICONERROR);\r
                return false;\r
        }\r
        CString sLogMsg = LoadLogMessage();\r
-       bool bSelectFilesForCommit = !!DWORD(CRegStdWORD(_T("Software\\TortoiseSVN\\SelectFilesForCommit"), TRUE));\r
+       bool bSelectFilesForCommit = !!DWORD(CRegStdWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));\r
        DWORD exitcode = 0;\r
        CString error;\r
+#if 0\r
        if (CHooks::Instance().StartCommit(pathList, sLogMsg, exitcode, error))\r
        {\r
                if (exitcode)\r
                {\r
                        CString temp;\r
                        temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);\r
-                       CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                        return false;\r
                }\r
        }\r
+#endif\r
        while (bFailed)\r
        {\r
                bFailed = false;\r
@@ -92,26 +94,26 @@ bool CommitCommand::Execute()
                        pathList = dlg.m_updatedPathList;\r
                        sLogMsg = dlg.m_sLogMessage;\r
                        bSelectFilesForCommit = true;\r
-                       CSVNProgressDlg progDlg;\r
-                       progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);\r
-                       if (parser.HasVal(_T("closeonend")))\r
-                               progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));\r
-                       progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Commit);\r
-                       progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);\r
-                       progDlg.SetPathList(dlg.m_pathList);\r
-                       progDlg.SetCommitMessage(dlg.m_sLogMessage);\r
-                       progDlg.SetDepth(dlg.m_bRecursive ? svn_depth_infinity : svn_depth_empty);\r
-                       progDlg.SetSelectedList(dlg.m_selectedPathList);\r
-                       progDlg.SetItemCount(dlg.m_itemsCount);\r
-                       progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);\r
-                       progDlg.DoModal();\r
-                       CRegDWORD err = CRegDWORD(_T("Software\\TortoiseSVN\\ErrorOccurred"), FALSE);\r
-                       err = (DWORD)progDlg.DidErrorsOccur();\r
-                       bFailed = progDlg.DidErrorsOccur();\r
-                       bRet = progDlg.DidErrorsOccur();\r
-                       CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseSVN\\CommitReopen"), FALSE);\r
-                       if (DWORD(bFailRepeat)==0)\r
-                               bFailed = false;                // do not repeat if the user chose not to in the settings.\r
+//                     CGitProgressDlg progDlg;\r
+//                     progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);\r
+//                     if (parser.HasVal(_T("closeonend")))\r
+//                             progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));\r
+//                     progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);\r
+//                     progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);\r
+//                     progDlg.SetPathList(dlg.m_pathList);\r
+//                     progDlg.SetCommitMessage(dlg.m_sLogMessage);\r
+//                     progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);\r
+//                     progDlg.SetSelectedList(dlg.m_selectedPathList);\r
+//                     progDlg.SetItemCount(dlg.m_itemsCount);\r
+//                     progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);\r
+//                     progDlg.DoModal();\r
+//                     CRegDWORD err = CRegDWORD(_T("Software\\TortoiseSVN\\ErrorOccurred"), FALSE);\r
+//                     err = (DWORD)progDlg.DidErrorsOccur();\r
+//                     bFailed = progDlg.DidErrorsOccur();\r
+//                     bRet = progDlg.DidErrorsOccur();\r
+//                     CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseSVN\\CommitReopen"), FALSE);\r
+//                     if (DWORD(bFailRepeat)==0)\r
+//                             bFailed = false;                // do not repeat if the user chose not to in the settings.\r
                }\r
        }\r
        return bRet;\r