From 1a001428212883d1073068bf85d4b279aa446296 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Thu, 14 May 2009 10:46:42 +0800 Subject: [PATCH] Try to enable show merged file --- doc/doc.build | 1 + src/Git/Git.cpp | 3 ++ src/Git/Git.h | 7 +-- src/Git/GitRev.cpp | 7 ++- src/Git/TGitPath.cpp | 5 ++ src/TortoiseGit.sln | 94 +++++++++++++++++++++++++++++++++++++ src/TortoiseProc/GitLogListBase.cpp | 1 + src/TortoiseProc/GitLogListBase.h | 2 +- src/TortoiseProc/LogDlgHelper.h | 2 +- src/TortoiseProc/gitlogcache.h | 2 +- 10 files changed, 117 insertions(+), 7 deletions(-) diff --git a/doc/doc.build b/doc/doc.build index 12b6dc273..9a0c8f730 100644 --- a/doc/doc.build +++ b/doc/doc.build @@ -20,6 +20,7 @@ All user/site specific configuration is stored in doc.build.user. + diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 49a50595a..03a1cffde 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -476,6 +476,9 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, if(mask& CGit::LOG_INFO_FOLLOW) param += _T(" --follow "); + if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE) + param += _T(" -c "); + if(from != NULL && to != NULL) { CString range; diff --git a/src/Git/Git.h b/src/Git/Git.h index 87a820217..530dff648 100644 --- a/src/Git/Git.h +++ b/src/Git/Git.h @@ -79,7 +79,8 @@ public: LOG_INFO_DETECT_COPYRENAME=0x100, LOG_INFO_FIRST_PARENT = 0x200, LOG_INFO_NO_MERGE = 0x400, - LOG_INFO_FOLLOW = 0x800 + LOG_INFO_FOLLOW = 0x800, + LOG_INFO_SHOW_MERGEDFILE=0x1000 }LOG_INFO_MASK; int GetRemoteList(STRING_VECTOR &list); @@ -89,9 +90,9 @@ public: //hash is empty means all. -1 means all - int GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME, + int GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME|LOG_INFO_SHOW_MERGEDFILE, CString *from=NULL,CString *to=NULL); - int GetLog(BYTE_VECTOR& logOut,CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME, + int GetLog(BYTE_VECTOR& logOut,CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME|LOG_INFO_SHOW_MERGEDFILE, CString *from=NULL,CString *to=NULL); BOOL EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData); diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp index 26921071f..f9ddc4fe5 100644 --- a/src/Git/GitRev.cpp +++ b/src/Git/GitRev.cpp @@ -145,6 +145,10 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start) else break; } + if(m_ParentHash.size()>1) + { + int a=1; + } break; case LOG_REV_COMMIT_FILE: break; @@ -176,6 +180,7 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start) if(filebegin>=0) { + filelist.append(log,filebegin,pos); this->m_Files.ParserFromLog(filelist); this->m_Action=this->m_Files.GetAction(); @@ -248,7 +253,7 @@ int GitRev::SafeFetchFullInfo(CGit *git) BYTE_VECTOR onelog; TCHAR oldmark=this->m_Mark; - git->GetLog(onelog,m_CommitHash,NULL,1,CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_DETECT_COPYRENAME); + git->GetLog(onelog,m_CommitHash,NULL,1,CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_DETECT_COPYRENAME|CGit::LOG_INFO_SHOW_MERGEDFILE); CString oldhash=m_CommitHash; GIT_REV_LIST oldlist=this->m_ParentHash; ParserFromLog(onelog); diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp index 94846fc1d..ecf5a732e 100644 --- a/src/Git/TGitPath.cpp +++ b/src/Git/TGitPath.cpp @@ -988,6 +988,11 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log) if(log[pos]==':') { + bool merged=false; + if(log[pos+1] ==';') + { + merged=true; + } int end=log.find(0,pos); int actionstart=-1; int numfile=1; diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln index 620253764..910edda04 100644 --- a/src/TortoiseGit.sln +++ b/src/TortoiseGit.sln @@ -105,183 +105,277 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "..\ext\build\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.Build.0 = Debug|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.Build.0 = Debug|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.Build.0 = Release|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.Build.0 = Debug|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.Build.0 = Debug|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.Build.0 = Debug|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.ActiveCfg = Debug|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.Build.0 = Debug|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.Build.0 = Release|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.Build.0 = Release|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.Build.0 = Debug|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.ActiveCfg = Debug|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.Build.0 = Debug|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.Build.0 = Release|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.Build.0 = Release|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.Build.0 = Debug|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.ActiveCfg = Debug|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.Build.0 = Debug|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.Build.0 = Debug|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.ActiveCfg = Debug|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.Build.0 = Debug|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.Build.0 = Release|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.Build.0 = Release|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.Build.0 = Debug|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.ActiveCfg = Debug|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.Build.0 = Debug|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.Build.0 = Release|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.Build.0 = Release|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.Build.0 = Debug|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.ActiveCfg = Debug|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.Build.0 = Debug|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.Build.0 = Release|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.Build.0 = Release|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.Build.0 = Debug|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.ActiveCfg = Debug|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.Build.0 = Debug|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.Build.0 = Release|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.ActiveCfg = Release|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.Build.0 = Release|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.Build.0 = Debug|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.ActiveCfg = Debug|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.Build.0 = Debug|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.Build.0 = Release|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.Build.0 = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Mixed Platforms.Build.0 = Debug|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.ActiveCfg = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.Build.0 = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.Build.0 = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.Build.0 = Release|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Mixed Platforms.Build.0 = Debug|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.Build.0 = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.ActiveCfg = Debug|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.Build.0 = Debug|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.Build.0 = Release|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.Build.0 = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.Build.0 = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Mixed Platforms.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Mixed Platforms.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.ActiveCfg = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.Build.0 = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.ActiveCfg = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.Build.0 = Release|x64 + {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|x64 {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32 {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32 {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|x64 {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.Build.0 = Debug|x64 + {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|x64 {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32 {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32 {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64 {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.Build.0 = Release|x64 + {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Mixed Platforms.Build.0 = Debug|x64 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.ActiveCfg = Debug|Win32 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.Build.0 = Debug|Win32 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|x64 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.Build.0 = Debug|x64 + {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Mixed Platforms.Build.0 = Release|x64 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.ActiveCfg = Release|Win32 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|x64 {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.Build.0 = Release|x64 + {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Mixed Platforms.Build.0 = Debug|x64 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.ActiveCfg = Debug|Win32 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.Build.0 = Debug|Win32 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|x64 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|x64 + {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Mixed Platforms.Build.0 = Release|x64 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.ActiveCfg = Release|Win32 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.Build.0 = Release|Win32 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.ActiveCfg = Release|x64 {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.Build.0 = Release|x64 + {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Mixed Platforms.Build.0 = Debug|x64 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Win32.ActiveCfg = Debug|Win32 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Win32.Build.0 = Debug|Win32 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|x64.ActiveCfg = Debug|x64 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|x64.Build.0 = Debug|x64 + {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Mixed Platforms.Build.0 = Release|x64 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32 {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64 + {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Mixed Platforms.Build.0 = Debug|x64 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Win32.ActiveCfg = Debug|Win32 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Win32.Build.0 = Debug|Win32 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x64.ActiveCfg = Debug|x64 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x64.Build.0 = Debug|x64 + {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Mixed Platforms.Build.0 = Release|x64 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.ActiveCfg = Release|Win32 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.Build.0 = Release|Win32 {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.ActiveCfg = Release|x64 + {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Mixed Platforms.Build.0 = Debug|x64 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Win32.ActiveCfg = Debug|Win32 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Win32.Build.0 = Debug|Win32 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|x64.ActiveCfg = Debug|Win32 + {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Mixed Platforms.Build.0 = Release|x64 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Win32.ActiveCfg = Release|Win32 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Win32.Build.0 = Release|Win32 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|x64.ActiveCfg = Release|x64 {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|x64.Build.0 = Release|x64 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.Build.0 = Debug|x64 {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.ActiveCfg = Debug|Win32 {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.Build.0 = Debug|Win32 {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|x64.ActiveCfg = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.Build.0 = Release|x64 {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.ActiveCfg = Release|Win32 {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.Build.0 = Release|Win32 {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x64.ActiveCfg = Release|x64 {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x64.Build.0 = Release|x64 + {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Mixed Platforms.Build.0 = Debug|x64 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Win32.ActiveCfg = Debug|Win32 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Win32.Build.0 = Debug|Win32 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|x64.ActiveCfg = Debug|Win32 + {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Mixed Platforms.Build.0 = Release|x64 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Win32.ActiveCfg = Release|Win32 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Win32.Build.0 = Release|Win32 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|x64.ActiveCfg = Release|x64 {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|x64.Build.0 = Release|x64 + {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Mixed Platforms.Build.0 = Debug|x64 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Win32.ActiveCfg = Debug|Win32 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Win32.Build.0 = Debug|Win32 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|x64.ActiveCfg = Debug|Win32 + {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Mixed Platforms.Build.0 = Release|x64 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Win32.ActiveCfg = Release|Win32 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Win32.Build.0 = Release|Win32 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|x64.ActiveCfg = Release|x64 {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|x64.Build.0 = Release|x64 + {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Mixed Platforms.Build.0 = Debug|x64 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Win32.ActiveCfg = Debug|Win32 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Win32.Build.0 = Debug|Win32 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|x64.ActiveCfg = Debug|Win32 + {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Mixed Platforms.Build.0 = Release|x64 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Win32.ActiveCfg = Release|Win32 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Win32.Build.0 = Release|Win32 {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|x64.ActiveCfg = Release|x64 diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 6dd415e6f..d861888c9 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1731,6 +1731,7 @@ void CGitLogListBase::FetchFullLogInfo(CString &from, CString &to) CGit::LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE| CGit::LOG_INFO_DETECT_COPYRENAME| + CGit::LOG_INFO_SHOW_MERGEDFILE | m_ShowMask; CTGitPath *path; diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h index b91a7d247..ffb7b50b3 100644 --- a/src/TortoiseProc/GitLogListBase.h +++ b/src/TortoiseProc/GitLogListBase.h @@ -152,7 +152,7 @@ public: void DiffSelectedRevWithPrevious(); bool IsSelectionContinuous(); int FillGitShortLog(); - int FillGitLog(CTGitPath *path,int infomask=CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE,CString *from=NULL,CString *to=NULL); + int FillGitLog(CTGitPath *path,int infomask=CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,CString *from=NULL,CString *to=NULL); inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); } int FetchLogAsync(void * data=NULL); diff --git a/src/TortoiseProc/LogDlgHelper.h b/src/TortoiseProc/LogDlgHelper.h index 945f8d48a..031c51c4d 100644 --- a/src/TortoiseProc/LogDlgHelper.h +++ b/src/TortoiseProc/LogDlgHelper.h @@ -58,7 +58,7 @@ public: m_FirstFreeLane=0; } void ClearAll(); - int ParserFromLog(CTGitPath *path =NULL,int count = -1,int infomask=CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE, + int ParserFromLog(CTGitPath *path =NULL,int count = -1,int infomask=CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_SHOW_MERGEDFILE, CString *from=NULL,CString *to=NULL); int FetchShortLog(CTGitPath *path , CString &hash,int count=-1 ,int mask=CGit::LOG_INFO_ONLY_HASH ); diff --git a/src/TortoiseProc/gitlogcache.h b/src/TortoiseProc/gitlogcache.h index fbaea283d..9d8840e8c 100644 --- a/src/TortoiseProc/gitlogcache.h +++ b/src/TortoiseProc/gitlogcache.h @@ -8,7 +8,7 @@ #define LOG_DATA_MAGIC 0x99aa00FF #define LOG_DATA_ITEM_MAGIC 0x0F8899CC #define LOG_DATA_FILE_MAGIC 0x19999FFF -#define LOG_INDEX_VERSION 0x3 +#define LOG_INDEX_VERSION 0x4 struct SLogCacheIndexHeader { -- 2.11.4.GIT