From 4c70ba4ad1f2a2787cd93b818f748f09ca34bafb Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Tue, 20 Jan 2009 14:11:56 +0800
Subject: [PATCH] Fix Un-rev Group problem.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Git/GitStatusListCtrl.cpp                      | 11 +++--
 src/Git/TGitPath.cpp                               |  2 +-
 .../IBugTraqProvider.vcproj.FSL.B20596.user        | 56 ----------------------
 .../TortoiseBlame.vcproj.FSL.B20596.user           | 56 ----------------------
 .../TortoiseGitBlame.vcproj.FSL.B20596.user        | 56 ----------------------
 .../CustomActions.vcproj.FSL.B20596.user           | 28 -----------
 .../Plink/TortoisePlink.vcproj.FSL.B20596.user     | 56 ----------------------
 src/TortoiseProc/CommitDlg.cpp                     | 21 ++++----
 .../TortoiseProc.vcproj.FSL.B20596.user}           | 16 +++----
 src/crashrpt/CrashRpt.vcproj.FSL.B20596.user       | 28 -----------
 10 files changed, 27 insertions(+), 303 deletions(-)
 copy src/{crashrpt/CrashRpt.vcproj.FSL.B20596.user => TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user} (78%)

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index a2c7e4532..494f74c14 100644
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -1787,7 +1787,9 @@ void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
 	for (int i=0; i<GetItemCount(); ++i)
 	{
 		CTGitPath * entry = (CTGitPath*)GetItemData(i);
-		SetCheck(i, entry->m_Checked);
+		ASSERT(entry);
+		if(entry)
+			SetCheck(i, entry->m_Checked);
 	}
 
 	m_bBlock = FALSE;
@@ -2705,6 +2707,9 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
 					while ((index = GetNextSelectedItem(pos)) >= 0)
 					{
 						CTGitPath * path=(CTGitPath*)GetItemData(index);
+						ASSERT(path);
+						if(path == NULL)
+							continue;
 						CString cmd;
 						cmd.Format(_T("git.exe add %s"),path->GetGitPathString());
 						CString output;
@@ -5157,7 +5162,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
 
 	}
 
-
+#if 0
 	m_bHasIgnoreGroup = false;
 
 	// now add the items which don't belong to a group
@@ -5203,7 +5208,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
 			it->second = InsertGroup(groupindex, &grp);
 		}
 	}
-
+#endif
 	return bHasGroups;
 }
 
diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index cb3d369b9..df743b3cf 100644
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -948,7 +948,7 @@ int CTGitPathList::ParserFromLog(CString &log)
 			{
 				path.SetFromGit(one.Right(one.GetLength()-rename-4),&one.Left(rename));
 			}else
-				path.SetFromGit(one.Right(one.GetLength()-tabstart));
+				path.SetFromGit(one);
 				
 			CTGitPath *GitPath=LookForGitPath(path.GetGitPathString());
 			if(GitPath)
diff --git a/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user b/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
index f1fabbfbc..e077687f6 100644
--- a/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
+++ b/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
@@ -34,34 +34,6 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
@@ -89,33 +61,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user b/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
index 9d0cf37a9..16bbce6f0 100644
--- a/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
+++ b/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
@@ -34,34 +34,6 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
@@ -89,33 +61,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
index 347927c71..ae5c3cef3 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
@@ -34,34 +34,6 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
@@ -89,33 +61,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
index 4ad7b75ea..55dd3eacf 100644
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
@@ -33,33 +33,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user
index 8e150974e..0d7e2850a 100644
--- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user
+++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user
@@ -34,34 +34,6 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
 			Name="Debug|Win32"
 			>
 			<DebugSettings
@@ -89,33 +61,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 7b23d1660..f71be8757 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -664,8 +664,7 @@ UINT CCommitDlg::StatusThread()
 			m_ListCtrl.Show(dwShow, m_checkedPathList);
 		else
 		{
-			DWORD dwCheck = m_bSelectFilesForCommit ?SVNSLC_SHOWDIRECTS|SVNSLC_SHOWMODIFIED|SVNSLC_SHOWADDED|SVNSLC_SHOWREMOVED
-				|SVNSLC_SHOWREPLACED|SVNSLC_SHOWMERGED|SVNSLC_SHOWLOCKS : 0;
+			DWORD dwCheck = m_bSelectFilesForCommit ? dwShow : 0;
 			m_ListCtrl.Show(dwShow, dwCheck);
 			m_bSelectFilesForCommit = true;
 		}
@@ -690,17 +689,17 @@ UINT CCommitDlg::StatusThread()
 	}
 	if ((m_ListCtrl.GetItemCount()==0)&&(m_ListCtrl.HasUnversionedItems()))
 	{
-//		if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
-//		{
-//			m_bShowUnversioned = TRUE;
-//			GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
-//			DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;
-//			m_ListCtrl.Show(dwShow);
-//		}
+		if (CMessageBox::Show(m_hWnd, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)
+		{
+			m_bShowUnversioned = TRUE;
+			GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);
+			DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;
+			m_ListCtrl.Show(dwShow);
+		}
 	}
 
-//	CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
-//	SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
+	CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);
+	SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());
 
 	m_autolist.clear();
 	// we don't have to block the commit dialog while we fetch the
diff --git a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
similarity index 78%
copy from src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
copy to src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 4ad7b75ea..271096dc0 100644
--- a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -6,12 +6,12 @@
 	>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Win32"
 			>
 			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
+				Command="$(TargetPath)"
+				WorkingDirectory="D:\Profiles\b20596\tortoisegit"
+				CommandArguments="/command:commit /path:&quot;D:\\test4\\tt&quot;"
 				Attach="false"
 				DebuggerType="3"
 				Remote="1"
@@ -22,7 +22,7 @@
 				SQLDebugging=""
 				Environment=""
 				EnvironmentMerge="true"
-				DebuggerFlavor=""
+				DebuggerFlavor="0"
 				MPIRunCommand=""
 				MPIRunArguments=""
 				MPIRunWorkingDirectory=""
@@ -34,16 +34,16 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Release|Win32"
 			>
 			<DebugSettings
-				Command=""
+				Command="$(TargetPath)"
 				WorkingDirectory=""
 				CommandArguments=""
 				Attach="false"
 				DebuggerType="3"
 				Remote="1"
-				RemoteMachine="B20596-02"
+				RemoteMachine="B20596-01"
 				RemoteCommand=""
 				HttpUrl=""
 				PDBPath=""
diff --git a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user b/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
index 4ad7b75ea..55dd3eacf 100644
--- a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
+++ b/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
@@ -33,33 +33,5 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="B20596-02"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>
-- 
2.11.4.GIT