#include "GitRev.h"\r
#include "registry.h"\r
#include "GitConfig.h"\r
+#include <map>\r
+#include "UnicodeUtils.h"\r
\r
\r
static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
if ( FileExists(buf) )\r
{\r
// dir found\r
+ pfin[1] = 0;\r
+ CGit::ms_LastMsysGitDir = buf;\r
return TRUE;\r
}\r
}\r
\r
\r
#define MAX_DIRBUFFER 1000\r
+#define CALL_OUTPUT_READ_CHUNK_SIZE 1024\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
-\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 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
-\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
+// contains system environment that should be used by child processes (RunAsync)\r
+// initialized by CheckMsysGitDir\r
+static LPTSTR l_processEnv = NULL;\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
//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
\r
return FALSE;\r
}\r
-int CGit::Run(CString cmd,BYTE_VECTOR *vector)\r
+int CGit::Run(CGitCall* pcall)\r
{\r
PROCESS_INFORMATION pi;\r
HANDLE hRead;\r
- if(RunAsync(cmd,&pi,&hRead))\r
+ if(RunAsync(pcall->GetCmd(),&pi,&hRead))\r
return GIT_ERROR_CREATE_PROCESS;\r
\r
DWORD readnumber;\r
- BYTE data;\r
- while(ReadFile(hRead,&data,1,&readnumber,NULL))\r
+ BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];\r
+ bool bAborted=false;\r
+ while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))\r
{\r
- //g_Buffer[readnumber]=0;\r
- vector->push_back(data);\r
-// StringAppend(output,g_Buffer,codes);\r
+ //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?\r
+ if(!bAborted)//For now, flush output when command aborted.\r
+ if(pcall->OnOutputData(data,readnumber))\r
+ bAborted=true;\r
}\r
+ if(!bAborted)\r
+ pcall->OnEnd();\r
\r
\r
CloseHandle(pi.hThread);\r
\r
CloseHandle(hRead);\r
return exitcode;\r
+}\r
+class CGitCall_ByteVector : public CGitCall\r
+{\r
+public:\r
+ CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}\r
+ virtual bool OnOutputData(const BYTE* data, size_t size)\r
+ {\r
+ size_t oldsize=m_pvector->size();\r
+ m_pvector->resize(m_pvector->size()+size);\r
+ memcpy(&*(m_pvector->begin()+oldsize),data,size);\r
+ return false;\r
+ }\r
+ BYTE_VECTOR* m_pvector;\r
\r
+};\r
+int CGit::Run(CString cmd,BYTE_VECTOR *vector)\r
+{\r
+ CGitCall_ByteVector call(cmd,vector);\r
+ return Run(&call);\r
}\r
int CGit::Run(CString cmd, CString* output,int code)\r
{\r
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
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,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
{\r
\r
CString cmd;\r
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
cmd += log;\r
cmd += CString(_T("\" "))+hash+file;\r
\r
- return Run(cmd,&logOut);\r
+ pgitCall->SetCmd(cmd);\r
+\r
+ return Run(pgitCall);\r
+// return Run(cmd,&logOut);\r
}\r
\r
#if 0\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
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
\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
}\r
+\r
+\r
+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
+ : 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 char * m_pszProjectPath;\r
+ const char * 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
+ UINT 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] = (BYTE)((HexChar(line[0]) << 8) | HexChar(line[1]));\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
+{\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(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
+ // 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_OEMCP))\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_OEMCP))\r
+ return -1;\r
+ \r
+ cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitOldPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ return -1;\r
+ }\r
+ else\r
+ {\r
+ cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\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
OSDN Git Service
