Fixed issue #111: Undo Add does not work (keep added file) and enable "F5" at revert...

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / RevertCommand.cpp

diff --git a/src/TortoiseProc/Commands/RevertCommand.cpp b/src/TortoiseProc/Commands/RevertCommand.cpp
index f34779f..1b0dd70 100644 (file)
--- a/src/TortoiseProc/Commands/RevertCommand.cpp
+++ b/src/TortoiseProc/Commands/RevertCommand.cpp
@@ -20,7 +20,7 @@
 #include "RevertCommand.h"\r
 \r
 #include "RevertDlg.h"\r
-//#include "SVNProgressDlg.h"\r
+#include "SVNProgressDlg.h"\r
 #include "MessageBox.h"\r
 \r
 bool RevertCommand::Execute()\r
@@ -29,23 +29,12 @@ bool RevertCommand::Execute()
        dlg.m_pathList = pathList;\r
        if (dlg.DoModal() == IDOK)\r
        {\r
+               \r
+//             g_Git.Revert(dlg.m_selectedPathList,true);\r
 \r
-               if (dlg.m_selectedPathList.GetCount() == 0)\r
-                       return FALSE;\r
-               CString cmd;\r
-               CString out;\r
-               for(int i=0;i< dlg.m_selectedPathList.GetCount() ;i++)\r
-               {\r
-                       cmd.Format(_T("git.exe checkout -f -- \"%s\""),dlg.m_selectedPathList[i].GetGitPathString());\r
-                       if(g_Git.Run(cmd,&out))\r
-                       {\r
-                               CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
-                       }\r
-               }\r
-#if 0\r
-               CSVNProgressDlg progDlg;\r
+               CGitProgressDlg progDlg;\r
                theApp.m_pMainWnd = &progDlg;\r
-               progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Revert);\r
+               progDlg.SetCommand(CGitProgressDlg::GitProgress_Revert);\r
                if (parser.HasVal(_T("closeonend")))\r
                        progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));\r
                progDlg.SetOptions(dlg.m_bRecursive ? ProgOptRecursive : ProgOptNonRecursive);\r
@@ -53,7 +42,7 @@ bool RevertCommand::Execute()
                progDlg.SetItemCount(dlg.m_selectedPathList.GetCount());\r
                progDlg.SetSelectedList(dlg.m_selectedPathList);\r
                progDlg.DoModal();\r
-#endif\r
+\r
                return true;\r
        }\r
        return false;\r