#include "atlconv.h"\r
#include "GitRev.h"\r
#include "registry.h"\r
+#include "GitConfig.h"\r
+\r
+\r
+static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
+{\r
+ LPCTSTR orgsrc;\r
+\r
+ while (*src == _T(';'))\r
+ src++;\r
+\r
+ orgsrc = src;\r
+\r
+ if (!--maxlen)\r
+ goto nullterm;\r
+\r
+ while (*src && *src != _T(';'))\r
+ {\r
+ if (*src != _T('"'))\r
+ {\r
+ *dst++ = *src++;\r
+ if (!--maxlen)\r
+ {\r
+ orgsrc = src;\r
+ goto nullterm;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ src++;\r
+ while (*src && *src != _T('"'))\r
+ {\r
+ *dst++ = *src++;\r
+ if (!--maxlen)\r
+ {\r
+ orgsrc = src;\r
+ goto nullterm;\r
+ }\r
+ }\r
+\r
+ if (*src)\r
+ src++;\r
+ }\r
+ }\r
+\r
+ while (*src == _T(';'))\r
+ src++;\r
+\r
+nullterm:\r
+\r
+ *dst = 0;\r
+\r
+ return (orgsrc != src) ? (LPTSTR)src : NULL;\r
+}\r
+\r
+static inline BOOL FileExists(LPCTSTR lpszFileName)\r
+{\r
+ struct _stat st;\r
+ return _tstat(lpszFileName, &st) == 0;\r
+}\r
+\r
+static BOOL FindGitPath()\r
+{\r
+ size_t size;\r
+ _tgetenv_s(&size, NULL, 0, _T("PATH"));\r
+\r
+ if (!size)\r
+ {\r
+ return FALSE;\r
+ }\r
+\r
+ TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));\r
+ _tgetenv_s(&size, env, size, _T("PATH"));\r
+\r
+ TCHAR buf[_MAX_PATH];\r
+\r
+ // search in all paths defined in PATH\r
+ while ((env = nextpath(env, buf, _MAX_PATH-1)) && *buf)\r
+ {\r
+ TCHAR *pfin = buf + _tcslen(buf)-1;\r
+\r
+ // ensure trailing slash\r
+ if (*pfin != _T('/') && *pfin != _T('\\'))\r
+ _tcscpy(++pfin, _T("\\"));\r
+\r
+ const int len = _tcslen(buf);\r
+\r
+ if ((len + 7) < _MAX_PATH)\r
+ _tcscpy(pfin+1, _T("git.exe"));\r
+ else\r
+ break;\r
+\r
+ if ( FileExists(buf) )\r
+ {\r
+ // dir found\r
+ return TRUE;\r
+ }\r
+ }\r
+\r
+ return FALSE;\r
+}\r
+\r
\r
#define MAX_DIRBUFFER 1000\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
+static void InitWinGitDll()\r
+{\r
+ __try\r
+ {\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
\r
CGit::~CGit(void)\r
{\r
SECURITY_ATTRIBUTES sa;\r
HANDLE hRead, hWrite;\r
- HANDLE hStdioFile;\r
+ HANDLE hStdioFile = NULL;\r
\r
sa.nLength = sizeof(SECURITY_ATTRIBUTES);\r
sa.lpSecurityDescriptor=NULL;\r
}\r
//Must use sperate function to convert ANSI str to union code string\r
//Becuase A2W use stack as internal convert buffer. \r
-void CGit::StringAppend(CString *str,char *p)\r
+void CGit::StringAppend(CString *str,BYTE *p,int code,int length)\r
{\r
- USES_CONVERSION;\r
- str->Append(A2W_CP(p,CP_UTF8));\r
+ //USES_CONVERSION;\r
+ //str->Append(A2W_CP((LPCSTR)p,code));\r
+ WCHAR * buf;\r
\r
+ int len ;\r
+ if(length<0)\r
+ len= strlen((const char*)p);\r
+ else\r
+ len=length;\r
+ //if (len==0)\r
+ // return ;\r
+ //buf = new WCHAR[len*4 + 1];\r
+ buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();\r
+ SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));\r
+ MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);\r
+ str->ReleaseBuffer();\r
+ //str->Append(buf);\r
+ //delete buf;\r
} \r
BOOL CGit::IsInitRepos()\r
{\r
CString cmdout;\r
cmdout.Empty();\r
- if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout))\r
+ if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))\r
{\r
// CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);\r
return TRUE;\r
\r
return FALSE;\r
}\r
-int CGit::Run(CString cmd, CString* output)\r
+int CGit::Run(CString cmd,BYTE_VECTOR *vector)\r
{\r
PROCESS_INFORMATION pi;\r
HANDLE hRead;\r
return GIT_ERROR_CREATE_PROCESS;\r
\r
DWORD readnumber;\r
- while(ReadFile(hRead,g_Buffer,1023,&readnumber,NULL))\r
+ BYTE data;\r
+ while(ReadFile(hRead,&data,1,&readnumber,NULL))\r
{\r
- g_Buffer[readnumber]=0;\r
- StringAppend(output,g_Buffer);\r
+ //g_Buffer[readnumber]=0;\r
+ vector->push_back(data);\r
+// StringAppend(output,g_Buffer,codes);\r
}\r
\r
\r
\r
CloseHandle(hRead);\r
return exitcode;\r
+\r
+}\r
+int CGit::Run(CString cmd, CString* output,int code)\r
+{\r
+ BYTE_VECTOR vector;\r
+ int ret;\r
+ ret=Run(cmd,&vector);\r
+\r
+ vector.push_back(0);\r
+ \r
+ StringAppend(output,&(vector[0]),code);\r
+ return ret;\r
}\r
\r
CString CGit::GetUserName(void)\r
{\r
CString UserName;\r
- Run(_T("git.exe config user.name"),&UserName);\r
+ Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
return UserName;\r
}\r
CString CGit::GetUserEmail(void)\r
{\r
CString UserName;\r
- Run(_T("git.exe config user.email"),&UserName);\r
+ Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
return UserName;\r
}\r
\r
CString output;\r
//Run(_T("git.exe branch"),&branch);\r
\r
- int ret=g_Git.Run(_T("git.exe branch"),&output);\r
+ int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);\r
if(!ret)\r
{ \r
int pos=0;\r
int CGit::BuildOutputFormat(CString &format,bool IsFull)\r
{\r
CString log;\r
- log.Format(_T("#<%c>%%n"),LOG_REV_ITEM_BEGIN);\r
+ log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);\r
format += log;\r
if(IsFull)\r
{\r
- log.Format(_T("#<%c>%%an%%n"),LOG_REV_AUTHOR_NAME);\r
+ log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);\r
format += log;\r
- log.Format(_T("#<%c>%%ae%%n"),LOG_REV_AUTHOR_EMAIL);\r
+ log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);\r
format += log;\r
- log.Format(_T("#<%c>%%ai%%n"),LOG_REV_AUTHOR_DATE);\r
+ log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);\r
format += log;\r
- log.Format(_T("#<%c>%%cn%%n"),LOG_REV_COMMIT_NAME);\r
+ log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);\r
format += log;\r
- log.Format(_T("#<%c>%%ce%%n"),LOG_REV_COMMIT_EMAIL);\r
+ log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);\r
format += log;\r
- log.Format(_T("#<%c>%%ci%%n"),LOG_REV_COMMIT_DATE);\r
+ log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
format += log;\r
- log.Format(_T("#<%c>%%s%%n"),LOG_REV_COMMIT_SUBJECT);\r
+ log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
format += log;\r
- log.Format(_T("#<%c>%%b%%n"),LOG_REV_COMMIT_BODY);\r
+ log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
format += log;\r
}\r
- log.Format(_T("#<%c>%%m%%H%%n"),LOG_REV_COMMIT_HASH);\r
+ log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
format += log;\r
- log.Format(_T("#<%c>%%P%%n"),LOG_REV_COMMIT_PARENT);\r
+ log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
format += log;\r
\r
if(IsFull)\r
{\r
- log.Format(_T("#<%c>%%n"),LOG_REV_COMMIT_FILE);\r
+ log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);\r
format += log;\r
}\r
return 0;\r
}\r
\r
-int CGit::GetLog(CString& logOut, CString &hash, CTGitPath *path ,int count,int mask)\r
+int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask)\r
{\r
\r
CString cmd;\r
param += _T(" --full-history ");\r
\r
if(mask& LOG_INFO_BOUNDARY)\r
- param += _T("--left-right --boundary ");\r
+ param += _T(" --left-right --boundary ");\r
+\r
+ if(mask& CGit::LOG_INFO_ALL_BRANCH)\r
+ param += _T(" --all ");\r
+\r
+ if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)\r
+ param += _T(" -C ");\r
+ \r
+ if(mask& CGit::LOG_INFO_DETECT_RENAME )\r
+ param += _T(" -M ");\r
+\r
+ if(mask& CGit::LOG_INFO_FIRST_PARENT )\r
+ param += _T(" --first-parent ");\r
+ \r
+ if(mask& CGit::LOG_INFO_NO_MERGE )\r
+ param += _T(" --no-merges ");\r
+\r
+ if(mask& CGit::LOG_INFO_FOLLOW)\r
+ param += _T(" --follow ");\r
\r
param+=hash;\r
\r
- cmd.Format(_T("git.exe log %s -C --topo-order --parents %s --pretty=format:\""),\r
+ cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
num,param);\r
\r
- BuildOutputFormat(log);\r
+ BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
+\r
cmd += log;\r
cmd += CString(_T("\" "))+hash+file;\r
\r
return Run(cmd,&logOut);\r
}\r
\r
-\r
+#if 0\r
int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)\r
{\r
CString cmd;\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
int CGit::RunLogFile(CString cmd,CString &filename)\r
{\r
- HANDLE hRead, hWrite;\r
-\r
STARTUPINFO si;\r
PROCESS_INFORMATION pi;\r
si.cb=sizeof(STARTUPINFO);\r
CloseHandle(pi.hProcess);\r
CloseHandle(houtfile);\r
return GIT_SUCCESS;\r
- return 0;\r
+// return 0;\r
}\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);\r
+ Run(cmd,&out,CP_UTF8);\r
int pos=out.ReverseFind(_T('\n'));\r
if(pos>0)\r
return out.Left(pos);\r
CString cmd,output;\r
cmd=_T("git.exe tag -l");\r
int i=0;\r
- ret=g_Git.Run(cmd,&output);\r
+ ret=g_Git.Run(cmd,&output,CP_UTF8);\r
if(!ret)\r
{ \r
int pos=0;\r
cmd+=_T(" -r");\r
\r
int i=0;\r
- ret=g_Git.Run(cmd,&output);\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
- i++;\r
one=output.Tokenize(_T("\n"),pos);\r
list.push_back(one.Right(one.GetLength()-2));\r
if(one[0] == _T('*'))\r
if(current)\r
*current=i;\r
+ i++;\r
}\r
}\r
return ret;\r
int ret;\r
CString cmd,output;\r
cmd=_T("git.exe config --get-regexp remote.*.url");\r
- ret=g_Git.Run(cmd,&output);\r
+ ret=g_Git.Run(cmd,&output,CP_UTF8);\r
if(!ret)\r
{\r
int pos=0;\r
int ret;\r
CString cmd,output;\r
cmd=_T("git show-ref -d");\r
- ret=g_Git.Run(cmd,&output);\r
+ ret=g_Git.Run(cmd,&output,CP_UTF8);\r
if(!ret)\r
{\r
int pos=0;\r
\r
BOOL CGit::CheckMsysGitDir()\r
{\r
- CRegString msysdir=CRegString(_T("Software\\TortoiseGit\\MSysGit"),_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
- CString str=msysdir;\r
- if(str.IsEmpty())\r
- {\r
- CRegString msysinstalldir=CRegString(_T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation"),_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
- str=msysinstalldir;\r
- str+="\\bin";\r
- msysdir=str;\r
- msysdir.write();\r
+ static BOOL bInitialized = FALSE;\r
\r
+ if (bInitialized)\r
+ {\r
+ return TRUE;\r
}\r
- //CGit::m_MsysGitPath=str;\r
\r
TCHAR *oldpath,*home;\r
size_t size;\r
\r
- _tdupenv_s(&home,&size,_T("HOME")); \r
- \r
- if(home == NULL)\r
- { \r
+ // set HOME if not set already\r
+ _tgetenv_s(&size, NULL, 0, _T("HOME"));\r
+ if (!size)\r
+ {\r
_tdupenv_s(&home,&size,_T("USERPROFILE")); \r
_tputenv_s(_T("HOME"),home);\r
free(home);\r
}\r
+\r
+ //setup ssh client\r
+ CRegString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
+ CString ssh=sshclient;\r
+\r
+ if(!ssh.IsEmpty())\r
+ {\r
+ _tputenv_s(_T("GIT_SSH"),ssh);\r
+ }else\r
+ {\r
+ _tputenv_s(_T("GIT_SSH"),_T(""));\r
+ }\r
+\r
+ // search PATH if git/bin directory is alredy present\r
+ if ( FindGitPath() )\r
+ {\r
+ bInitialized = TRUE;\r
+ return TRUE;\r
+ }\r
+\r
+ // add git/bin path to PATH\r
+\r
+ CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+ CString str=msysdir;\r
+ if(str.IsEmpty())\r
+ {\r
+ CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
+ str=msysinstalldir;\r
+ if ( !str.IsEmpty() )\r
+ {\r
+ str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";\r
+ msysdir=str;\r
+ msysdir.write();\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+ }\r
+ //CGit::m_MsysGitPath=str;\r
+\r
//set path\r
+\r
_tdupenv_s(&oldpath,&size,_T("PATH")); \r
\r
CString path;\r
- path.Format(_T("%s;"),str);\r
- path+=oldpath;\r
+ path.Format(_T("%s;%s"),oldpath,str);\r
\r
_tputenv_s(_T("PATH"),path);\r
\r
free(oldpath);\r
\r
- CString cmd,out;\r
- cmd=_T("git.exe --version");\r
- if(g_Git.Run(cmd,&out))\r
+\r
+ if( !FindGitPath() )\r
{\r
return false;\r
}\r
else\r
+ {\r
+ bInitialized = TRUE;\r
return true;\r
-\r
-}
\ No newline at end of file
+ }\r
+}\r
OSDN Git Service
