Share resource file between TortoiseGitBlame and TortoiseProc

[tortoisegit/TortoiseGitJp.git] / src / Git / Git.cpp

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 0c2933e..94a9738 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -2,6 +2,7 @@
 #include "Git.h"\r
 #include "atlconv.h"\r
 #include "GitRev.h"\r
+#include "registry.h"\r
 \r
 #define MAX_DIRBUFFER 1000\r
 CGit g_Git;\r
@@ -181,7 +182,7 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
                log.Format(_T("#<%c>%%b%%n"),LOG_REV_COMMIT_BODY);\r
                format += log;\r
        }\r
-       log.Format(_T("#<%c>%%H%%n"),LOG_REV_COMMIT_HASH);\r
+       log.Format(_T("#<%c>%%m%%H%%n"),LOG_REV_COMMIT_HASH);\r
        format += log;\r
        log.Format(_T("#<%c>%%P%%n"),LOG_REV_COMMIT_PARENT);\r
        format += log;\r
@@ -194,21 +195,39 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
        return 0;\r
 }\r
 \r
-int CGit::GetLog(CString& logOut, CString &hash, int count)\r
+int CGit::GetLog(CString& logOut, CString &hash,  CTGitPath *path ,int count,int mask)\r
 {\r
 \r
        CString cmd;\r
        CString log;\r
        CString num;\r
        CString since;\r
+\r
+       CString file;\r
+\r
+       if(path)\r
+               file.Format(_T(" -- \"%s\""),path->GetGitPathString());\r
+       \r
        if(count>0)\r
                num.Format(_T("-n%d"),count);\r
 \r
-       cmd.Format(_T("git.exe log %s -C --numstat --raw --pretty=format:\""),\r
-                               num);\r
+       CString param;\r
+\r
+       if(mask& LOG_INFO_STAT )\r
+               param += _T(" --numstat ");\r
+       if(mask& LOG_INFO_FILESTATE)\r
+               param += _T(" --raw ");\r
+\r
+       if(mask& LOG_INFO_FULLHISTORY)\r
+               param += _T(" --full-history ");\r
+\r
+       cmd.Format(_T("git.exe log %s -C --left-right --boundary --topo-order --parents %s --pretty=format:\""),\r
+                               num,param);\r
+\r
        BuildOutputFormat(log);\r
        cmd += log;\r
-       cmd += CString(_T("\"  "))+hash;\r
+       cmd += CString(_T("\"  "))+hash+file;\r
+\r
        return Run(cmd,&logOut);\r
 }\r
 \r
@@ -222,7 +241,7 @@ int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)
                n=100;\r
        else\r
                n=count;\r
-       cmd.Format(_T("git.exe log --topo-order -n%d --pretty=format:\""),n);\r
+       cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);\r
        BuildOutputFormat(log,false);\r
        cmd += log+_T("\"");\r
        if (path)\r
@@ -408,7 +427,7 @@ int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
 {\r
        int ret;\r
        CString cmd,output;\r
-       cmd=_T("git show-ref");\r
+       cmd=_T("git show-ref -d");\r
        ret=g_Git.Run(cmd,&output);\r
        if(!ret)\r
        {\r
@@ -431,4 +450,52 @@ int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
                }\r
        }\r
        return ret;\r
+}\r
+\r
+BOOL CGit::CheckMsysGitDir()\r
+{\r
+       CRegString msysdir=CRegString(_T("Software\\TortoiseGit\\MSysGit"),_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+       CString str=msysdir;\r
+       if(str.IsEmpty())\r
+       {\r
+               CRegString msysinstalldir=CRegString(_T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation"),_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+               str=msysinstalldir;\r
+               str+="\\bin";\r
+               msysdir=str;\r
+               msysdir.write();\r
+\r
+       }\r
+       //CGit::m_MsysGitPath=str;\r
+\r
+       TCHAR *oldpath,*home;\r
+       size_t size;\r
+\r
+       _tdupenv_s(&home,&size,_T("HOME")); \r
+       \r
+       if(home == NULL)\r
+       {               \r
+               _tdupenv_s(&home,&size,_T("USERPROFILE")); \r
+               _tputenv_s(_T("HOME"),home);\r
+               free(home);\r
+       }\r
+       //set path\r
+       _tdupenv_s(&oldpath,&size,_T("PATH")); \r
+\r
+       CString path;\r
+       path.Format(_T("%s;"),str);\r
+       path+=oldpath;\r
+\r
+       _tputenv_s(_T("PATH"),path);\r
+\r
+       free(oldpath);\r
+\r
+       CString cmd,out;\r
+       cmd=_T("git.exe --version");\r
+       if(g_Git.Run(cmd,&out))\r
+       {\r
+               return false;\r
+       }\r
+       else\r
+               return true;\r
+\r
 }
\ No newline at end of file