OSDN Git Service

Fix Un-rev Group problem.
authorFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 06:11:56 +0000 (14:11 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 06:11:56 +0000 (14:11 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp
src/Git/TGitPath.cpp
src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user
src/TortoiseProc/CommitDlg.cpp
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
src/crashrpt/CrashRpt.vcproj.FSL.B20596.user

index a2c7e45..494f74c 100644 (file)
@@ -1787,7 +1787,9 @@ void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
        for (int i=0; i<GetItemCount(); ++i)\r
        {\r
                CTGitPath * entry = (CTGitPath*)GetItemData(i);\r
-               SetCheck(i, entry->m_Checked);\r
+               ASSERT(entry);\r
+               if(entry)\r
+                       SetCheck(i, entry->m_Checked);\r
        }\r
 \r
        m_bBlock = FALSE;\r
@@ -2705,6 +2707,9 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                        while ((index = GetNextSelectedItem(pos)) >= 0)\r
                                        {\r
                                                CTGitPath * path=(CTGitPath*)GetItemData(index);\r
+                                               ASSERT(path);\r
+                                               if(path == NULL)\r
+                                                       continue;\r
                                                CString cmd;\r
                                                cmd.Format(_T("git.exe add %s"),path->GetGitPathString());\r
                                                CString output;\r
@@ -5157,7 +5162,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
 \r
        }\r
 \r
-\r
+#if 0\r
        m_bHasIgnoreGroup = false;\r
 \r
        // now add the items which don't belong to a group\r
@@ -5203,7 +5208,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
                        it->second = InsertGroup(groupindex, &grp);\r
                }\r
        }\r
-\r
+#endif\r
        return bHasGroups;\r
 }\r
 \r
index cb3d369..df743b3 100644 (file)
@@ -948,7 +948,7 @@ int CTGitPathList::ParserFromLog(CString &log)
                        {\r
                                path.SetFromGit(one.Right(one.GetLength()-rename-4),&one.Left(rename));\r
                        }else\r
-                               path.SetFromGit(one.Right(one.GetLength()-tabstart));\r
+                               path.SetFromGit(one);\r
                                \r
                        CTGitPath *GitPath=LookForGitPath(path.GetGitPathString());\r
                        if(GitPath)\r
index f1fabbf..e077687 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command=""\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command=""\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 9d0cf37..16bbce6 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 347927c..ae5c3ce 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 4ad7b75..55dd3ea 100644 (file)
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command=""\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 8e15097..0d7e285 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
                        Name="Debug|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 7b23d16..f71be87 100644 (file)
@@ -664,8 +664,7 @@ UINT CCommitDlg::StatusThread()
                        m_ListCtrl.Show(dwShow, m_checkedPathList);\r
                else\r
                {\r
-                       DWORD dwCheck = m_bSelectFilesForCommit ?SVNSLC_SHOWDIRECTS|SVNSLC_SHOWMODIFIED|SVNSLC_SHOWADDED|SVNSLC_SHOWREMOVED\r
-                               |SVNSLC_SHOWREPLACED|SVNSLC_SHOWMERGED|SVNSLC_SHOWLOCKS : 0;\r
+                       DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;\r
                        m_ListCtrl.Show(dwShow, dwCheck);\r
                        m_bSelectFilesForCommit = true;\r
                }\r
@@ -690,17 +689,17 @@ UINT CCommitDlg::StatusThread()
        }\r
        if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))\r
        {\r
-//             if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
-//             {\r
-//                     m_bShowUnversioned = TRUE;\r
-//                     GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
-//                     DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
-//                     m_ListCtrl.Show(dwShow);\r
-//             }\r
+               if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
+               {\r
+                       m_bShowUnversioned = TRUE;\r
+                       GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
+                       DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
+                       m_ListCtrl.Show(dwShow);\r
+               }\r
        }\r
 \r
-//     CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
-//     SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
+       CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
+       SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
 \r
        m_autolist.clear();\r
        // we don't have to block the commit dialog while we fetch the\r
index 73a2bb7..271096d 100644 (file)
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:log /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
+                               CommandArguments="/command:commit /path:&quot;D:\\test4\\tt&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 4ad7b75..55dd3ea 100644 (file)
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       >\r
-                       <DebugSettings\r
-                               Command=""\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-02"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r