Log can refresh when Click Rev button.

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 4e6f847..3353b54 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -6,9 +6,11 @@
 #include "GitConfig.h"\r
 #include <map>\r
 #include "UnicodeUtils.h"\r
+#include "gitdll.h"\r
 \r
 int CGit::m_LogEncode=CP_UTF8;\r
 \r
+\r
 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
 {\r
        LPCTSTR orgsrc;\r
@@ -126,12 +128,18 @@ CGit::CGit(void)
 {\r
        GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
        m_CurrentDir.ReleaseBuffer();\r
-\r
+       m_IsGitDllInited = false;\r
+       m_GitDiff=0;\r
        CheckMsysGitDir();\r
 }\r
 \r
 CGit::~CGit(void)\r
 {\r
+       if(this->m_GitDiff)\r
+       {\r
+               git_close_diff(m_GitDiff);\r
+               m_GitDiff=0;\r
+       }\r
 }\r
 \r
 static char g_Buffer[4096];\r
@@ -174,7 +182,9 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
        DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;\r
        \r
        //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password. \r
-       dwFlags |= DETACHED_PROCESS; \r
+       dwFlags |= DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP; \r
+\r
+       memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));\r
 \r
        if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
        {\r
@@ -186,6 +196,8 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
                return GIT_ERROR_CREATE_PROCESS;\r
        }\r
        \r
+       m_CurrentGitPi = pi;\r
+       \r
        CloseHandle(hWrite);\r
        if(piOut)\r
                *piOut=pi;\r
@@ -327,7 +339,7 @@ CString CGit::GetCurrentBranch(void)
        CString output;\r
        //Run(_T("git.exe branch"),&branch);\r
 \r
-       int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);\r
+       int ret=g_Git.Run(_T("git.exe branch --no-color"),&output,CP_UTF8);\r
        if(!ret)\r
        {               \r
                int pos=0;\r
@@ -468,10 +480,8 @@ int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count
        return GetLog(&gitCall,hash,path,count,mask,from,to);\r
 }\r
 \r
-//int CGit::GetLog(CGitCall* pgitCall, CString &hash,  CTGitPath *path ,int count,int mask)\r
-int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)\r
+CString CGit::GetLogCmd( CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to,bool paramonly)\r
 {\r
-\r
        CString cmd;\r
        CString log;\r
        CString num;\r
@@ -519,6 +529,9 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
        if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)\r
                param += _T(" -c ");\r
 \r
+       if(mask& CGit::LOG_INFO_FULL_DIFF)\r
+               param += _T(" --full-diff ");\r
+\r
        if(from != NULL && to != NULL)\r
        {\r
                CString range;\r
@@ -527,40 +540,35 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
        }\r
        param+=hash;\r
 \r
-       cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
+       if(paramonly)\r
+               cmd.Format(_T("%s -z --topo-order %s --parents "),\r
+                               num,param);\r
+       else\r
+               cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
                                num,param);\r
 \r
        BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
 \r
-       cmd += log;\r
-       cmd += CString(_T("\"  "))+hash+file;\r
+       if(paramonly)\r
+       {\r
+               cmd += hash+file;\r
+       }else\r
+       {\r
+               cmd += log;\r
+               cmd += CString(_T("\"  "))+hash+file;\r
+       }\r
 \r
-       pgitCall->SetCmd(cmd);\r
+       return cmd;\r
+}\r
+//int CGit::GetLog(CGitCall* pgitCall, CString &hash,  CTGitPath *path ,int count,int mask)\r
+int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)\r
+{\r
+       pgitCall->SetCmd( GetLogCmd(hash,path,count,mask,from,to) );\r
 \r
        return Run(pgitCall);\r
 //     return Run(cmd,&logOut);\r
 }\r
 \r
-#if 0\r
-int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)\r
-{\r
-       CString cmd;\r
-       CString log;\r
-       int n;\r
-       if(count<0)\r
-               n=100;\r
-       else\r
-               n=count;\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
-               cmd+= _T("  -- \"")+path->GetGitPathString()+_T("\"");\r
-       //cmd += CString(_T("\" HEAD~40..HEAD"));\r
-       return Run(cmd,&logOut);\r
-}\r
-#endif\r
-\r
 #define BUFSIZE 512\r
 void GetTempPath(CString &path)\r
 {\r
@@ -704,7 +712,7 @@ int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
 {\r
        int ret;\r
        CString cmd,output;\r
-       cmd=_T("git.exe branch");\r
+       cmd=_T("git.exe branch --no-color");\r
 \r
        if(type==(BRANCH_LOCAL|BRANCH_REMOTE))\r
                cmd+=_T(" -a");\r
@@ -740,7 +748,7 @@ int CGit::GetRemoteList(STRING_VECTOR &list)
 {\r
        int ret;\r
        CString cmd,output;\r
-       cmd=_T("git.exe config  --get-regexp remote.*.url");\r
+       cmd=_T("git.exe config  --get-regexp \"^^remote[.].*[.]url\"");\r
        ret=g_Git.Run(cmd,&output,CP_UTF8);\r
        if(!ret)\r
        {\r
@@ -957,6 +965,10 @@ BOOL CGit::CheckMsysGitDir()
 \r
     if( !FindGitPath() )\r
        {\r
+               if(!homesize)\r
+               {\r
+                       _tputenv_s(_T("HOME"),_T(""));\r
+               }\r
                return false;\r
        }\r
        else\r
@@ -1146,11 +1158,11 @@ BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsig
                CString sSubPath = pszSubPath;\r
                sSubPath.Replace(_T('\\'), _T('/'));\r
 \r
-               cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);\r
+               cmd.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);\r
        }\r
        else\r
        {\r
-               cmd.Format(_T("igit.exe \"%s\" status %s"), sProjectPath, sMode);\r
+               cmd.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath, sMode);\r
        }\r
 \r
        //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");\r
@@ -1246,4 +1258,49 @@ int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
        list.ParserFromLsFile(vector);\r
 \r
        return 0;\r
-}
\ No newline at end of file
+}\r
+\r
+bool CGit::IsFastForward(CString &from, CString &to)\r
+{\r
+       CString base,hash;\r
+       CString cmd;\r
+       cmd.Format(_T("git.exe merge-base %s %s"), to,from);\r
+\r
+       if(g_Git.Run(cmd,&base,CP_ACP))\r
+       {\r
+               //CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+               return false;\r
+       }\r
+       base=base.Left(40);\r
+\r
+       hash=g_Git.GetHash(from);\r
+\r
+       hash=hash.Left(40);\r
+       \r
+       return hash == base;\r
+}\r
+\r
+unsigned int CGit::Hash2int(CString &hash)\r
+{\r
+       int ret=0;\r
+       for(int i=0;i<8;i++)\r
+       {\r
+               ret =ret <<4;\r
+               if(hash[i]>=_T('a'))\r
+                       ret |= (hash[i]-_T('a')+10)&0xFF;\r
+               else if(hash[i]>=_T('A'))\r
+                       ret |= (hash[i]-_T('A')+10)&0xFF;\r
+               else\r
+                       ret |= (hash[i]-_T('0'))&0xFF;          \r
+               \r
+       }\r
+       return ret;\r
+}\r
+\r
+int CGit::RefreshGitIndex()\r
+{\r
+       CString cmd,output;\r
+       cmd=_T("git.exe update-index --refresh");\r
+       return Run(cmd,&output,CP_ACP);\r
+}\r
+\r