Fix switch\checkout don't get current base version information problem

Update log Tag branch information after switch\checkout

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index 2cdbadc..45675c9 100644 (file)
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -1126,7 +1126,7 @@ bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash)
                                track,\r
                                force,\r
                                dlg.m_BranchTagName,\r
-                               dlg.m_Base\r
+                               dlg.m_VersionName\r
                                );\r
 \r
        \r
@@ -1136,7 +1136,7 @@ bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash)
                                track,\r
                                force,\r
                                dlg.m_BranchTagName,\r
-                               dlg.m_Base\r
+                               dlg.m_VersionName\r
                                );\r
                }\r
                CString out;\r
@@ -1175,7 +1175,7 @@ bool CAppUtils::Switch(CString *CommitHash)
                         force,\r
                         track,\r
                         branch,\r
-                        dlg.m_Base);\r
+                        dlg.m_VersionName);\r
 \r
                CProgressDlg progress;\r
                progress.m_GitCmd=cmd;\r

diff --git a/src/TortoiseProc/Commands/RevertCommand.cpp b/src/TortoiseProc/Commands/RevertCommand.cpp
index dc7e0ce..f34779f 100644 (file)
--- a/src/TortoiseProc/Commands/RevertCommand.cpp
+++ b/src/TortoiseProc/Commands/RevertCommand.cpp
@@ -30,14 +30,17 @@ bool RevertCommand::Execute()
        if (dlg.DoModal() == IDOK)\r
        {\r
 \r
-               if (dlg.m_pathList.GetCount() == 0)\r
+               if (dlg.m_selectedPathList.GetCount() == 0)\r
                        return FALSE;\r
                CString cmd;\r
                CString out;\r
-               for(int i=0;i< dlg.m_pathList.GetCount() ;i++)\r
+               for(int i=0;i< dlg.m_selectedPathList.GetCount() ;i++)\r
                {\r
-                       cmd.Format(_T("git.exe reset --hard -- \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
-                       g_Git.Run(cmd,&out);\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

diff --git a/src/TortoiseProc/Commands/SwitchCommand.cpp b/src/TortoiseProc/Commands/SwitchCommand.cpp
index 5582227..400414b 100644 (file)
--- a/src/TortoiseProc/Commands/SwitchCommand.cpp
+++ b/src/TortoiseProc/Commands/SwitchCommand.cpp
@@ -26,5 +26,5 @@
 \r
 bool SwitchCommand::Execute()\r
 {\r
-       return CAppUtils::CreateBranchTag(NULL);\r
+       return CAppUtils::Switch(NULL);\r
 }\r

diff --git a/src/TortoiseProc/CreateBranchTagDlg.cpp b/src/TortoiseProc/CreateBranchTagDlg.cpp
index fe3b87b..5f5b7a3 100644 (file)
--- a/src/TortoiseProc/CreateBranchTagDlg.cpp
+++ b/src/TortoiseProc/CreateBranchTagDlg.cpp
@@ -90,6 +90,7 @@ void CCreateBranchTagDlg::OnBnClickedOk()
 {\r
        // TODO: Add your control notification handler code here\r
        this->UpdateData(TRUE);\r
+\r
        if(this->m_BranchTagName.Trim().IsEmpty())\r
        {\r
                CMessageBox::Show(NULL,_T("Branch\\Tag name can't empty"),_T("TortiseGit"),MB_OK);\r

diff --git a/src/TortoiseProc/GitLogList.cpp b/src/TortoiseProc/GitLogList.cpp
index 0649b43..5d2d01d 100644 (file)
--- a/src/TortoiseProc/GitLogList.cpp
+++ b/src/TortoiseProc/GitLogList.cpp
@@ -1184,6 +1184,9 @@ void CGitLogList::OnContextMenu(CWnd* pWnd, CPoint point)
                        break;\r
                case ID_SWITCHTOREV:\r
                        CAppUtils::Switch(&pSelLogEntry->m_CommitHash);\r
+                       m_HashMap.clear();\r
+                       g_Git.GetMapHashToFriendName(m_HashMap);\r
+                       Invalidate();\r
                        break;\r
 \r
                default:\r

diff --git a/src/TortoiseProc/GitSwitchDlg.cpp b/src/TortoiseProc/GitSwitchDlg.cpp
index 981897f..b616c1d 100644 (file)
--- a/src/TortoiseProc/GitSwitchDlg.cpp
+++ b/src/TortoiseProc/GitSwitchDlg.cpp
@@ -91,7 +91,7 @@ void CGitSwitchDlg::OnBnClickedOk()
        // TODO: Add your control notification handler code here\r
        this->UpdateData(TRUE);\r
        \r
-       \r
+       UpdateRevsionName();\r
        //this->m_Version.SaveHistory();\r
 \r
        OnOK();\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 506a869..714c8c9 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\"\r
-                               CommandArguments="/command:commit /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
+                               CommandArguments="/command:log /path:&quot;D:\\Test&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r