+\r
+\r
+class CGitCall_EnumFiles : public CGitCall\r
+{\r
+public:\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
+ m_pEnumCb(pEnumCb),\r
+ m_pUserData(pUserData)\r
+ {\r
+ }\r
+\r
+ typedef std::map<CStringA,char> TStrCharMap;\r
+\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
+\r
+ virtual bool OnOutputData(const BYTE* data, size_t size)\r
+ {\r
+ m_DataCollector.append(data,size);\r
+ while(true)\r
+ {\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
+ 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
+ }\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
+\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
+ 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 TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
+{\r
+ if(!pszProjectPath || *pszProjectPath=='\0')\r
+ return FALSE;\r
+\r
+ CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);\r
+ CString cmd;\r
+\r
+/* char W_szToDir[MAX_PATH];\r
+ strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);\r
+ if(W_szToDir[strlen(W_szToDir)-1]!='\\')\r
+ strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);\r
+\r
+ SetCurrentDirectoryA(W_szToDir);\r
+ GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);\r
+*/\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
+ // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least\r
+ // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with\r
+ // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just\r
+ // use forward slashes for supplied project and sub paths\r
+\r
+ CString sProjectPath = pszProjectPath;\r
+ sProjectPath.Replace(_T('\\'), _T('/'));\r
+\r
+ if (pszSubPath)\r
+ {\r
+ CString sSubPath = pszSubPath;\r
+ sSubPath.Replace(_T('\\'), _T('/'));\r
+\r
+ cmd.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);\r
+ }\r
+ else\r
+ {\r
+ cmd.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath, sMode);\r
+ }\r
+\r
+ //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");\r
+\r
+ W_GitCall.SetCmd(cmd);\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 --cached -- \"%s\""),path.GetGitPathString());\r
+\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
+}\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