status bar cancel button work

diff --git a/Git/GitStatusListCtrl.cpp b/Git/GitStatusListCtrl.cpp
index d73f24d..c8591d3 100644 (file)
--- a/Git/GitStatusListCtrl.cpp
+++ b/Git/GitStatusListCtrl.cpp
@@ -1022,7 +1022,7 @@ DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
 \r
 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */)\r
 {\r
-#if 0\r
+\r
        Locker lock(m_critSec);\r
        WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
 \r
@@ -1057,6 +1057,8 @@ void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFold
                        continue;\r
                if (entry->IsFolder() && (!bShowFolders))\r
                        continue;       // don't show folders if they're not wanted.\r
+\r
+#if 0\r
                git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);\r
                DWORD showFlags = GetShowFlagsFromGitStatus(status);\r
                if (entry->IsLocked())\r
@@ -1065,10 +1067,12 @@ void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFold
                        showFlags |= SVNSLC_SHOWSWITCHED;\r
                if (!entry->changelist.IsEmpty())\r
                        showFlags |= SVNSLC_SHOWINCHANGELIST;\r
-\r
-               bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0) && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));\r
+#endif\r
+               bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0) \r
+                       && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));\r
 \r
                // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item\r
+#if 0\r
                if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))\r
                {\r
                        if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))\r
@@ -1105,6 +1109,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFold
                                AddEntry(entry, langID, listIndex++);\r
                        }\r
                }\r
+#endif\r
        }\r
 \r
        SetItemCount(listIndex);\r
@@ -1156,12 +1161,12 @@ void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFold
 \r
        m_bEmpty = (GetItemCount() == 0);\r
        Invalidate();\r
-#endif\r
+\r
 }\r
 \r
 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)\r
 {\r
-#if 0\r
+\r
        Locker lock(m_critSec);\r
        WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
 \r
@@ -1196,6 +1201,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bo
                        continue;\r
                if (entry->IsFolder() && (!bShowFolders))\r
                        continue;       // don't show folders if they're not wanted.\r
+#if 0\r
                git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);\r
                DWORD showFlags = GetShowFlagsFromSVNStatus(status);\r
                if (entry->IsLocked())\r
@@ -1238,6 +1244,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bo
                                AddEntry(entry, langID, listIndex++);\r
                        }\r
                }\r
+#endif\r
        }\r
 \r
        SetItemCount(listIndex);\r
@@ -1287,7 +1294,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bo
 \r
        m_bEmpty = (GetItemCount() == 0);\r
        Invalidate();\r
-#endif\r
+\r
 }\r
 \r
 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)\r

diff --git a/TortoiseProc/CommitDlg.cpp b/TortoiseProc/CommitDlg.cpp
index 3068174..d5acd76 100644 (file)
--- a/TortoiseProc/CommitDlg.cpp
+++ b/TortoiseProc/CommitDlg.cpp
@@ -586,20 +586,21 @@ UINT CCommitDlg::StatusThread()
                        reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
                m_History.Load(reg, _T("logmsgs"));\r
        }\r
-\r
+#endif\r
     // Initialise the list control with the status of the files/folders below us\r
        BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
        m_ListCtrl.CheckIfChangelistsArePresent(false);\r
 \r
-       DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWLOCKS | GitSLC_SHOWINCHANGELIST;\r
-       dwShow |= DWORD(m_regAddBeforeCommit) ? GitSLC_SHOWUNVERSIONED : 0;\r
+       DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;\r
+       dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;\r
        if (success)\r
        {\r
                if (m_checkedPathList.GetCount())\r
                        m_ListCtrl.Show(dwShow, m_checkedPathList);\r
                else\r
                {\r
-                       DWORD dwCheck = m_bSelectFilesForCommit ? GitSLC_SHOWDIRECTS|GitSLC_SHOWMODIFIED|GitSLC_SHOWADDED|GitSLC_SHOWREMOVED|GitSLC_SHOWREPLACED|GitSLC_SHOWMERGED|GitSLC_SHOWLOCKS : 0;\r
+                       DWORD dwCheck = m_bSelectFilesForCommit ?SVNSLC_SHOWDIRECTS|SVNSLC_SHOWMODIFIED|SVNSLC_SHOWADDED|SVNSLC_SHOWREMOVED\r
+                               |SVNSLC_SHOWREPLACED|SVNSLC_SHOWMERGED|SVNSLC_SHOWLOCKS : 0;\r
                        m_ListCtrl.Show(dwShow, dwCheck);\r
                        m_bSelectFilesForCommit = true;\r
                }\r
@@ -627,7 +628,7 @@ UINT CCommitDlg::StatusThread()
                {\r
                        m_bShowUnversioned = TRUE;\r
                        GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
-                       DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;\r
+                       DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
                        m_ListCtrl.Show(dwShow);\r
                }\r
        }\r
@@ -657,11 +658,12 @@ UINT CCommitDlg::StatusThread()
                // we have the list, now signal the main thread about it\r
                SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
        }\r
+\r
        InterlockedExchange(&m_bRunThread, FALSE);\r
        InterlockedExchange(&m_bThreadRunning, FALSE);\r
        // force the cursor to normal\r
        RefreshCursor();\r
-#endif\r
+\r
        return 0;\r
 }\r
 \r