#include "Git.h"\r
#include "atlconv.h"\r
#include "GitRev.h"\r
+#include "registry.h"\r
+#include "GitConfig.h"\r
\r
#define MAX_DIRBUFFER 1000\r
CGit g_Git;\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)\r
{\r
- USES_CONVERSION;\r
- str->Append(A2W(p));\r
+ //USES_CONVERSION;\r
+ //str->Append(A2W_CP((LPCSTR)p,code));\r
+ WCHAR * buf;\r
+ int len = strlen((const char*)p);\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, -1, 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,CP_UTF8))\r
+ {\r
+ // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);\r
+ return TRUE;\r
+ }\r
+ if(cmdout.IsEmpty())\r
+ return TRUE;\r
\r
+ return FALSE;\r
}\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
+ if(ret)\r
+ return ret;\r
+ \r
+ vector.push_back(0);\r
+ \r
+ StringAppend(output,&(vector[0]),code);\r
+ return 0;\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 CGit::GetCurrentBranch(void)\r
{\r
- CString branch;\r
- Run(_T("git.exe branch"),&branch);\r
- if(branch.GetLength()>0)\r
- {\r
- branch.Replace(_T('*'),_T(' '));\r
- branch.TrimLeft();\r
- return branch;\r
+ CString output;\r
+ //Run(_T("git.exe branch"),&branch);\r
+\r
+ int ret=g_Git.Run(_T("git.exe branch"),&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
+ return one.Right(one.GetLength()-2);\r
+ }\r
}\r
return CString("");\r
}\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>%%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, int count)\r
+int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask)\r
{\r
\r
CString cmd;\r
CString log;\r
CString num;\r
CString since;\r
+\r
+ CString file;\r
+\r
+ if(path)\r
+ file.Format(_T(" -- \"%s\""),path->GetGitPathString());\r
+ \r
if(count>0)\r
num.Format(_T("-n%d"),count);\r
\r
- cmd.Format(_T("git.exe log %s -C --numstat --raw --pretty=format:\""),\r
- num);\r
- BuildOutputFormat(log);\r
+ CString param;\r
+\r
+ if(mask& LOG_INFO_STAT )\r
+ param += _T(" --numstat ");\r
+ if(mask& LOG_INFO_FILESTATE)\r
+ param += _T(" --raw ");\r
+\r
+ if(mask& LOG_INFO_FULLHISTORY)\r
+ param += _T(" --full-history ");\r
+\r
+ if(mask& LOG_INFO_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
+ param+=hash;\r
+\r
+ cmd.Format(_T("git.exe log %s -z --topo-order --parents %s --pretty=format:\""),\r
+ num,param);\r
+\r
+ BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
+\r
cmd += log;\r
- cmd += CString(_T("\" "))+hash;\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
n=100;\r
else\r
n=count;\r
- cmd.Format(_T("git.exe log --topo-order -n%d --pretty=format:\""),n);\r
+ cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);\r
BuildOutputFormat(log,false);\r
cmd += log+_T("\"");\r
if (path)\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
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
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
{\r
int ret;\r
CString cmd,output;\r
- cmd=_T("git show-ref");\r
- ret=g_Git.Run(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
}\r
}\r
return ret;\r
+}\r
+\r
+BOOL CGit::CheckMsysGitDir()\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
+ str+="\\bin";\r
+ msysdir=str;\r
+ msysdir.write();\r
+\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
+ _tdupenv_s(&home,&size,_T("USERPROFILE")); \r
+ _tputenv_s(_T("HOME"),home);\r
+ free(home);\r
+ }\r
+ //set path\r
+ _tdupenv_s(&oldpath,&size,_T("PATH")); \r
+\r
+ CString path;\r
+ path.Format(_T("%s;"),str);\r
+ path+=oldpath;\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,CP_UTF8))\r
+ {\r
+ return false;\r
+ }\r
+ else\r
+ return true;\r
+\r
}
\ No newline at end of file
OSDN Git Service
