X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FGit%2FTGitPath.cpp;h=dbd0dc02d0f238cafb69ab80056029878f9485c7;hp=759d811b6caaca5cb3bc6a77fbea5d6fd274e3d2;hb=880651835af8d405e30e3ac03e47bb415cdf37bc;hpb=494a73c5e5b662fada8f48ad88b7c2a554bebce1

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index 759d811..dbd0dc0 100644
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -102,6 +102,9 @@ int CTGitPath::ParserAction(BYTE action)
 		m_Action|= LOGACTIONS_DELETED;
 	if(action == 'H')
 		m_Action|= LOGACTIONS_CACHE;
+	if(action == 'C' )
+		m_Action|= LOGACTIONS_COPY;
+
 	return m_Action;
 }
 void CTGitPath::SetFromGit(const char* pPath)
@@ -125,6 +128,18 @@ void CTGitPath::SetFromGit(const char* pPath, bool bIsDirectory)
 	m_bIsDirectory = bIsDirectory;
 }
 
+void CTGitPath::SetFromGit(const TCHAR* pPath, bool bIsDirectory)
+{
+	Reset();
+	if (pPath)
+	{
+		m_sFwdslashPath = pPath;
+		SanitizeRootPath(m_sFwdslashPath, true);
+	}
+	m_bDirectoryKnown = true;
+	m_bIsDirectory = bIsDirectory;
+}
+
 void CTGitPath::SetFromGit(const CString& sPath,CString *oldpath)
 {
 	Reset();
@@ -535,7 +550,7 @@ CString CTGitPath::GetBaseFilename() const
 	CString filename=GetFilename();
 	dot = filename.ReverseFind(_T('.'));
 	if(dot>0)
-		return filename.Left(dot-1);
+		return filename.Left(dot);
 	else
 		return filename;
 }
@@ -925,6 +940,7 @@ int CTGitPathList::FillUnRev(int action,CTGitPathList *list)
 		CString one;
 		while( pos>=0 && pos<out.size())
 		{
+			one.Empty();
 			g_Git.StringAppend(&one,&out[pos],CP_OEMCP);
 			if(!one.IsEmpty())
 			{
@@ -1051,6 +1067,7 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log)
 					sec++;
 					g_Git.StringAppend(&file1,&log[sec],CP_OEMCP);
 				}
+				pos=sec;
 
 			}else
 			{
@@ -1860,21 +1877,35 @@ CTGitPath * CTGitPathList::LookForGitPath(CString path)
 	}
 	return NULL;
 }
-
-CString CTGitPath::GetActionName()
+CString CTGitPath::GetActionName(int action)
 {
-	if(m_Action  & CTGitPath::LOGACTIONS_ADDED)
+	if(action  & CTGitPath::LOGACTIONS_UNMERGED)
+		return _T("Conflict");
+	if(action  & CTGitPath::LOGACTIONS_ADDED)
 		return _T("Added");
-	if(m_Action  & CTGitPath::LOGACTIONS_DELETED)
+	if(action  & CTGitPath::LOGACTIONS_DELETED)
 		return _T("Deleted");
-	if(m_Action  & CTGitPath::LOGACTIONS_UNMERGED)
-		return _T("Conflict");
-	if(m_Action  & CTGitPath::LOGACTIONS_MODIFIED)
+	if(action  & CTGitPath::LOGACTIONS_MODIFIED)
 		return _T("Modified");
-	if(m_Action  & CTGitPath::LOGACTIONS_REPLACED)
+	if(action  & CTGitPath::LOGACTIONS_REPLACED)
 		return _T("Rename");
+	if(action  & CTGitPath::LOGACTIONS_COPY)
+		return _T("Copy");
+	if(action & CTGitPath::LOGACTIONS_REBASE_EDIT)
+		return _T("Edit");
+	if(action & CTGitPath::LOGACTIONS_REBASE_SQUASH)
+		return _T("Squash");
+	if(action & CTGitPath::LOGACTIONS_REBASE_PICK)
+		return _T("Pick");
+	if(action & CTGitPath::LOGACTIONS_REBASE_SKIP)
+		return _T("Skip");
+
 	return _T("Unknown");
 }
+CString CTGitPath::GetActionName()
+{
+	return GetActionName(m_Action);
+}
 
 int CTGitPathList::GetAction()
 {