if ( FileExists(buf) )\r
{\r
// dir found\r
+ pfin[1] = 0;\r
+ CGit::ms_LastMsysGitDir = buf;\r
return TRUE;\r
}\r
}\r
\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
+// contains system environment that should be used by child processes (RunAsync)\r
+// initialized by CheckMsysGitDir\r
+static LPTSTR l_processEnv = NULL;\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
-}\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
\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
GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
m_CurrentDir.ReleaseBuffer();\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
+\r
+ CheckMsysGitDir();\r
}\r
\r
CGit::~CGit(void)\r
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
+ 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
\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
\r
_tputenv_s(_T("PATH"),path);\r
\r
+ CString sOldPath = oldpath;\r
free(oldpath);\r
\r
\r
}\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
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
+ UINT HexChar(char ch)\r
{\r
- //Parse single line\r
- int space=line.Find(' ');\r
- if(space<0)\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
+ 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
+ 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
+ }\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]) << 8) | HexChar(line[1]);\r
+ line += 2;\r
+ }\r
+\r
+ line++;\r
+ }\r
+\r
+ // filename\r
+ fileStatus.sFileName = line;\r
+\r
+ if ( (*m_pEnumCb)(&fileStatus,m_pUserData) )\r
+ return false;\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
{\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
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
+\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"), CUnicodeUtils::GetUnicode(pszProjectPath), sMode, CUnicodeUtils::GetUnicode(pszSubPath));\r
+ else\r
+ cmd.Format(_T("igit.exe %s status %s"), CUnicodeUtils::GetUnicode(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