OSDN Git Service

Workaround Issue 73: Error while reading/writing the registry key MSysGit Access...
[tortoisegit/TortoiseGitJp.git] / src / Git / Git.cpp
index 5a947f6..49a5059 100644 (file)
@@ -99,6 +99,8 @@ static BOOL FindGitPath()
                if ( FileExists(buf) )\r
                {\r
                        // dir found\r
+                       pfin[1] = 0;\r
+                       CGit::ms_LastMsysGitDir = buf;\r
                        return TRUE;\r
                }\r
        }\r
@@ -112,84 +114,19 @@ static BOOL FindGitPath()
 \r
 CString CGit::ms_LastMsysGitDir;\r
 CGit g_Git;\r
-BOOL g_IsWingitDllload = TRUE;\r
 \r
-LPBYTE wgGetRevisionID_safe(const char *pszProjectPath, const char *pszName)\r
-{\r
-       //if(g_IsWingitDllload)\r
-       //      return wgGetRevisionID(pszProjectPath,pszName);\r
-       //else\r
-       return NULL;\r
-}\r
-\r
-BOOL wgEnumFiles_safe(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
-{\r
-       //if(g_IsWingitDllload)\r
-       //      return wgEnumFiles(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);\r
-       //else\r
-       //      return g_Git.EnumFiles(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);\r
-       return FALSE;\r
-}\r
-\r
-BOOL CGit::IsVista()\r
-{\r
-\r
-       if( CRegStdWORD(_T("Software\\TortoiseGit\\CacheType") ) == 0)\r
-       {\r
-               g_IsWingitDllload=FALSE;\r
-               return TRUE;\r
-       }\r
+// contains system environment that should be used by child processes (RunAsync)\r
+// initialized by CheckMsysGitDir\r
+static LPTSTR l_processEnv = NULL;\r
 \r
-       OSVERSIONINFO osvi;\r
-    BOOL bIsWindowsXPorLater;\r
 \r
-    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));\r
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);\r
-\r
-    GetVersionEx(&osvi);\r
-       \r
-       if(osvi.dwMajorVersion >= 6)\r
-               return TRUE;\r
-       else\r
-               return FALSE;\r
-}\r
-\r
-static void InitWinGitDll()\r
-{\r
-       __try\r
-       {\r
-\r
-               if( CGit::IsVista () )\r
-               {\r
-                       g_IsWingitDllload=FALSE;\r
-                       return;\r
-               }\r
-               if ( !wgInit() )\r
-               {\r
-                               // TODO\r
-               }\r
-       }\r
-       __except(1)\r
-       {\r
-               g_IsWingitDllload=FALSE;\r
-               return;\r
-       }\r
 \r
-}\r
 CGit::CGit(void)\r
 {\r
-\r
        GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
        m_CurrentDir.ReleaseBuffer();\r
 \r
-#if 0\r
-       // make sure git/bin is in PATH before wingit.dll gets (delay) loaded by wgInit()\r
-       if ( !CheckMsysGitDir() )\r
-       {\r
-               // TODO\r
-       }\r
-       InitWinGitDll();\r
-#endif\r
+       CheckMsysGitDir();\r
 }\r
 \r
 CGit::~CGit(void)\r
@@ -232,7 +169,13 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
        si.wShowWindow=SW_HIDE;\r
        si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
 \r
-       if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
+       LPTSTR pEnv = l_processEnv;\r
+       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
+\r
+       if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
        {\r
                LPVOID lpMsgBuf;\r
                FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
@@ -257,6 +200,9 @@ void CGit::StringAppend(CString *str,BYTE *p,int code,int length)
 {\r
      //USES_CONVERSION;\r
         //str->Append(A2W_CP((LPCSTR)p,code));\r
+       if(str == NULL)\r
+               return ;\r
+\r
        WCHAR * buf;\r
 \r
        int len ;\r
@@ -359,13 +305,15 @@ CString CGit::GetUserName(void)
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 CString CGit::GetUserEmail(void)\r
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 \r
 CString CGit::GetCurrentBranch(void)\r
@@ -390,6 +338,52 @@ CString CGit::GetCurrentBranch(void)
        return CString("");\r
 }\r
 \r
+int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)\r
+{\r
+       // read current branch name like git-gui does, by parsing the .git/HEAD file directly\r
+\r
+       if ( sProjectRoot.IsEmpty() )\r
+               return -1;\r
+\r
+       CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");\r
+\r
+       FILE *pFile;\r
+       _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));\r
+\r
+       if (!pFile)\r
+       {\r
+               return -1;\r
+       }\r
+\r
+       char s[256] = {0};\r
+    fgets(s, sizeof(s), pFile);\r
+\r
+       fclose(pFile);\r
+\r
+       const char *pfx = "ref: refs/heads/";\r
+       const int len = 16;//strlen(pfx)\r
+\r
+       if ( !strncmp(s, pfx, len) )\r
+       {\r
+               //# We're on a branch.  It might not exist.  But\r
+               //# HEAD looks good enough to be a branch.\r
+               sBranchOut = s + len;\r
+               sBranchOut.TrimRight(_T(" \r\n\t"));\r
+\r
+               if ( sBranchOut.IsEmpty() )\r
+                       return -1;\r
+       }\r
+       else\r
+       {\r
+               //# Assume this is a detached head.\r
+               sBranchOut = "HEAD";\r
+\r
+               return 1;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
 int CGit::BuildOutputFormat(CString &format,bool IsFull)\r
 {\r
        CString log;\r
@@ -409,15 +403,16 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
                format += log;\r
                log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
                format += log;\r
-               log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
-               format += log;\r
                log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
                format += log;\r
        }\r
+       \r
        log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
        format += log;\r
        log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
        format += log;\r
+       log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
+       format += log;\r
 \r
        if(IsFull)\r
        {\r
@@ -427,14 +422,14 @@ int CGit::BuildOutputFormat(CString &format,bool IsFull)
        return 0;\r
 }\r
 \r
-int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count,int mask)\r
+int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count,int mask,CString *from,CString *to)\r
 {\r
        CGitCall_ByteVector gitCall(CString(),&logOut);\r
-       return GetLog(&gitCall,hash,path,count,mask);\r
+       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)\r
+int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)\r
 {\r
 \r
        CString cmd;\r
@@ -481,6 +476,12 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
        if(mask& CGit::LOG_INFO_FOLLOW)\r
                param += _T(" --follow ");\r
 \r
+       if(from != NULL && to != NULL)\r
+       {\r
+               CString range;\r
+               range.Format(_T(" %s..%s "),*from,*to);\r
+               param += range;\r
+       }\r
        param+=hash;\r
 \r
        cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
@@ -600,13 +601,12 @@ int CGit::RunLogFile(CString cmd,CString &filename)
 \r
 git_revnum_t CGit::GetHash(CString &friendname)\r
 {\r
-       // NOTE: could replace this with wgGetRevisionID call\r
-\r
        CString cmd;\r
        CString out;\r
        cmd.Format(_T("git.exe rev-parse %s" ),friendname);\r
        Run(cmd,&out,CP_UTF8);\r
-       int pos=out.ReverseFind(_T('\n'));\r
+//     int pos=out.ReverseFind(_T('\n'));\r
+       int pos=out.FindOneOf(_T("\r\n"));\r
        if(pos>0)\r
                return out.Left(pos);\r
        return out;\r
@@ -690,6 +690,30 @@ int CGit::GetRemoteList(STRING_VECTOR &list)
        return ret;\r
 }\r
 \r
+int CGit::GetRefList(STRING_VECTOR &list)\r
+{\r
+       int ret;\r
+       CString cmd,output;\r
+       cmd=_T("git show-ref -d");\r
+       ret=g_Git.Run(cmd,&output,CP_UTF8);\r
+       if(!ret)\r
+       {\r
+               int pos=0;\r
+               CString one;\r
+               while( pos>=0 )\r
+               {\r
+                       one=output.Tokenize(_T("\n"),pos);\r
+                       int start=one.Find(_T(" "),0);\r
+                       if(start>0)\r
+                       {\r
+                               CString name;\r
+                               name=one.Right(one.GetLength()-start-1);\r
+                               list.push_back(name);\r
+                       }\r
+               }\r
+       }\r
+       return ret;\r
+}\r
 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)\r
 {\r
        int ret;\r
@@ -741,17 +765,33 @@ BOOL CGit::CheckMsysGitDir()
        }\r
 \r
        //setup ssh client\r
-       CRegString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
-       CString ssh=sshclient;\r
+       CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
 \r
-       if(!ssh.IsEmpty())\r
+       if(!sshclient.IsEmpty())\r
        {\r
-               _tputenv_s(_T("GIT_SSH"),ssh);\r
+               _tputenv_s(_T("GIT_SSH"),sshclient);\r
        }else\r
        {\r
-               _tputenv_s(_T("GIT_SSH"),_T(""));\r
+               TCHAR sPlink[MAX_PATH];\r
+               GetModuleFileName(NULL, sPlink, _countof(sPlink));\r
+               LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));\r
+               if (ptr) {\r
+                       _tcscpy(ptr + 1, _T("TortoisePlink.exe"));\r
+                       _tputenv_s(_T("GIT_SSH"), sPlink);\r
+               }\r
        }\r
 \r
+       {\r
+               TCHAR sAskPass[MAX_PATH];\r
+               GetModuleFileName(NULL, sAskPass, _countof(sAskPass));\r
+               LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));\r
+               if (ptr) \r
+               {\r
+                       _tcscpy(ptr + 1, _T("SshAskPass.exe"));\r
+                       _tputenv_s(_T("DISPLAY"),_T(":9999"));\r
+                       _tputenv_s(_T("SSH_ASKPASS"),sAskPass);\r
+               }\r
+       }\r
        // search PATH if git/bin directory is alredy present\r
        if ( FindGitPath() )\r
        {\r
@@ -761,7 +801,7 @@ BOOL CGit::CheckMsysGitDir()
 \r
        // add git/bin path to PATH\r
 \r
-       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+       CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
        CString str=msysdir;\r
        if(str.IsEmpty())\r
        {\r
@@ -789,6 +829,7 @@ BOOL CGit::CheckMsysGitDir()
 \r
        _tputenv_s(_T("PATH"),path);\r
 \r
+       CString sOldPath = oldpath;\r
        free(oldpath);\r
 \r
 \r
@@ -798,6 +839,12 @@ BOOL CGit::CheckMsysGitDir()
        }\r
        else\r
        {\r
+#ifdef _TORTOISESHELL\r
+               l_processEnv = GetEnvironmentStrings();\r
+               // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process\r
+               _tputenv_s(_T("PATH"),sOldPath);\r
+#endif\r
+\r
                bInitialized = TRUE;\r
                return true;\r
        }\r
@@ -807,7 +854,7 @@ BOOL CGit::CheckMsysGitDir()
 class CGitCall_EnumFiles : public CGitCall\r
 {\r
 public:\r
-       CGitCall_EnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
+       CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
        :       m_pszProjectPath(pszProjectPath),\r
                m_pszSubPath(pszSubPath),\r
                m_nFlags(nFlags),\r
@@ -818,77 +865,120 @@ public:
 \r
        typedef std::map<CStringA,char> TStrCharMap;\r
 \r
-       const char *    m_pszProjectPath;\r
-       const char *    m_pszSubPath;\r
+       const TCHAR *   m_pszProjectPath;\r
+       const TCHAR *   m_pszSubPath;\r
        unsigned int    m_nFlags;\r
        WGENUMFILECB *  m_pEnumCb;\r
        void *                  m_pUserData;\r
 \r
        BYTE_VECTOR             m_DataCollector;\r
-       TStrCharMap             m_FileStatus;\r
 \r
        virtual bool    OnOutputData(const BYTE* data, size_t size)\r
        {\r
                m_DataCollector.append(data,size);\r
                while(true)\r
                {\r
-                       int found=m_DataCollector.findData((const BYTE*)"\n",1);\r
+                       // lines from igit.exe are 0 terminated\r
+                       int found=m_DataCollector.findData((const BYTE*)"",1);\r
                        if(found<0)\r
                                return false;\r
-                       CStringA line;\r
-                       char* pline=line.GetBuffer(found+1);\r
-                       memcpy(pline,&*m_DataCollector.begin(),found);\r
-                       pline[found]='\0';\r
-                       line.ReleaseBuffer();\r
-                       OnSingleLine(line);\r
-                       m_DataCollector.erase(m_DataCollector.begin(),m_DataCollector.begin()+found+1);\r
+                       OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );\r
+                       m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);\r
                }\r
                return false;//Should never reach this\r
        }\r
        virtual void    OnEnd()\r
        {\r
-               for(TStrCharMap::iterator itFileStatus=m_FileStatus.begin();itFileStatus!=m_FileStatus.end();++itFileStatus)\r
-               {\r
-                       wgFile_s fileStatus;\r
-                       fileStatus.sFileName=itFileStatus->first;\r
-                       switch(itFileStatus->second)\r
-                       {\r
-                       case 'C':       fileStatus.nStatus=WGFS_Modified;break;\r
-                       case 'H':       fileStatus.nStatus=WGFS_Normal;break;\r
-                       case 'R':       fileStatus.nStatus=WGFS_Deleted;break;\r
-                       case '?':       fileStatus.nStatus=WGFS_Empty;break;//Other?\r
-                       case 'K'://Todo: Killed?\r
-                       case 'M'://Todo: What to do with this state? WGFS_Conflicted?\r
-                       default://Unexpected status. Show as normal.\r
-                               fileStatus.nStatus=WGFS_Normal;\r
-                       }\r
-                       fileStatus.sha1=NULL;//Unknown with this call\r
-                       fileStatus.nFlags=0;//Never a directory with this call. Git doesnt track directories as such.\r
-                       (*m_pEnumCb)(&fileStatus,m_pUserData);\r
-               }\r
        }\r
-       bool OnSingleLine(CStringA line)\r
+\r
+       BYTE HexChar(char ch)\r
+       {\r
+               if (ch >= '0' && ch <= '9')\r
+                       return (UINT)(ch - '0');\r
+               else if (ch >= 'A' && ch <= 'F')\r
+                       return (UINT)(ch - 'A') + 10;\r
+               else if (ch >= 'a' && ch <= 'f')\r
+                       return (UINT)(ch - 'a') + 10;\r
+               else\r
+                       return 0;\r
+       }\r
+\r
+       bool OnSingleLine(LPCSTR line)\r
        {\r
                //Parse single line\r
-               int space=line.Find(' ');\r
-               if(space<0)\r
+\r
+               wgFile_s fileStatus;\r
+\r
+               // file/dir type\r
+\r
+               fileStatus.nFlags = 0;\r
+               if (*line == 'D')\r
+                       fileStatus.nFlags |= WGFF_Directory;\r
+               else if (*line != 'F')\r
+                       // parse error\r
                        return false;\r
-               char status=line[0];\r
-               CStringA path=line;\r
-               path=path.Mid(space+1);\r
-               m_FileStatus[path]=status;\r
-               return true;\r
-       }\r
+               line += 2;\r
+\r
+               // status\r
+\r
+               fileStatus.nStatus = WGFS_Unknown;\r
+               switch (*line)\r
+               {\r
+               case 'N': fileStatus.nStatus = WGFS_Normal; break;\r
+               case 'M': fileStatus.nStatus = WGFS_Modified; break;\r
+               case 'S': fileStatus.nStatus = WGFS_Staged; break;\r
+               case 'A': fileStatus.nStatus = WGFS_Added; break;\r
+               case 'C': fileStatus.nStatus = WGFS_Conflicted; break;\r
+               case 'D': fileStatus.nStatus = WGFS_Deleted; break;\r
+               case 'I': fileStatus.nStatus = WGFS_Ignored; break;\r
+               case 'U': fileStatus.nStatus = WGFS_Unversioned; break;\r
+               case 'E': fileStatus.nStatus = WGFS_Empty; break;\r
+               case '?': fileStatus.nStatus = WGFS_Unknown; break;\r
+               default:\r
+                       // parse error\r
+                       return false;\r
+               }\r
+               line += 2;\r
+\r
+               // file sha1\r
+\r
+               BYTE sha1[20];\r
+               fileStatus.sha1 = NULL;\r
+               if ( !(fileStatus.nFlags & WGFF_Directory) )\r
+               {\r
+                       for (int i=0; i<20; i++)\r
+                       {\r
+                               sha1[i]  = (HexChar(line[0])<<4)&0xF0;\r
+                               sha1[i] |= HexChar(line[1])&0xF;\r
+\r
+                               line += 2;\r
+                       }\r
 \r
+                       line++;\r
+               }\r
 \r
+               // filename\r
+               int len = strlen(line);\r
+               if (len && len < 2048)\r
+               {\r
+                       WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));\r
+                       *buf = 0;\r
+                       MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);\r
+                       fileStatus.sFileName = buf;\r
 \r
+                       if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))\r
+                               return false;\r
+               }\r
 \r
+               return true;\r
+       }\r
 };\r
 \r
-BOOL CGit::EnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
+BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
 {\r
-       if(*pszProjectPath=='\0')\r
+       if(!pszProjectPath || *pszProjectPath=='\0')\r
                return FALSE;\r
+\r
        CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);\r
        CString cmd;\r
 \r
@@ -900,9 +990,116 @@ BOOL CGit::EnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigne
        SetCurrentDirectoryA(W_szToDir);\r
        GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);\r
 */\r
-       SetCurrentDir(CUnicodeUtils::GetUnicode(pszProjectPath));\r
-       cmd.Format(_T("git.exe ls-files -t -c -d -m"));// -- %s"),CUnicodeUtils::GetUnicode(pszProjectPath));\r
+       SetCurrentDir(pszProjectPath);\r
+\r
+       CString sMode;\r
+       if (nFlags)\r
+       {\r
+               if (nFlags & WGEFF_NoRecurse) sMode += _T("r");\r
+               if (nFlags & WGEFF_FullPath) sMode += _T("f");\r
+               if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");\r
+               if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");\r
+               if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");\r
+               if (nFlags & WGEFF_SingleFile) sMode += _T("s");\r
+       }\r
+       else\r
+       {\r
+               sMode = _T("-");\r
+       }\r
+\r
+       if (pszSubPath)\r
+               cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath, sMode, pszSubPath);\r
+       else\r
+               cmd.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath, sMode);\r
+\r
        W_GitCall.SetCmd(cmd);\r
-       Run(&W_GitCall);\r
+       // NOTE: should igit get added as a part of msysgit then use below line instead of the above one\r
+       //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);\r
+\r
+       if ( Run(&W_GitCall) )\r
+               return FALSE;\r
+\r
        return TRUE;\r
 }\r
+\r
+BOOL CGit::CheckCleanWorkTree()\r
+{\r
+       CString out;\r
+       CString cmd;\r
+       cmd=_T("git.exe rev-parse --verify HEAD");\r
+\r
+       if(g_Git.Run(cmd,&out,CP_UTF8))\r
+               return FALSE;\r
+\r
+       cmd=_T("git.exe update-index --ignore-submodules --refresh");\r
+       if(g_Git.Run(cmd,&out,CP_UTF8))\r
+               return FALSE;\r
+\r
+       cmd=_T("git.exe diff-files --quiet --ignore-submodules");\r
+       if(g_Git.Run(cmd,&out,CP_UTF8))\r
+               return FALSE;\r
+\r
+       cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");\r
+       if(g_Git.Run(cmd,&out,CP_UTF8))\r
+               return FALSE;\r
+\r
+       return TRUE;\r
+}\r
+int CGit::Revert(CTGitPathList &list,bool keep)\r
+{\r
+       int ret;\r
+       for(int i=0;i<list.GetCount();i++)\r
+       {       \r
+               ret = Revert((CTGitPath&)list[i],keep);\r
+               if(ret)\r
+                       return ret;\r
+       }\r
+       return 0;\r
+}\r
+int CGit::Revert(CTGitPath &path,bool keep)\r
+{\r
+       CString cmd, out;\r
+       if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
+       {       //To init git repository, there are not HEAD, so we can use git reset command\r
+               cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
+                       return -1;\r
+       }\r
+       else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )\r
+       {\r
+               cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
+                       return -1;\r
+               \r
+               cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
+                       return -1;\r
+       }\r
+       else\r
+       {\r
+               cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());\r
+               if(g_Git.Run(cmd,&out,CP_ACP))\r
+                       return -1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)\r
+{\r
+       BYTE_VECTOR vector;\r
+\r
+       CString cmd;\r
+       if(path)\r
+               cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());\r
+       else\r
+               cmd=_T("git.exe ls-files -u -t -z");\r
+\r
+       if(g_Git.Run(cmd,&vector))\r
+       {\r
+               return -1;\r
+       }\r
+\r
+       list.ParserFromLsFile(vector);\r
+\r
+       return 0;\r
+}
\ No newline at end of file