{\r
}\r
\r
-char buffer[4096];\r
-int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut)\r
+static char g_Buffer[4096];\r
+\r
+int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CString *StdioFile)\r
{\r
SECURITY_ATTRIBUTES sa;\r
HANDLE hRead, hWrite;\r
+ HANDLE hStdioFile;\r
\r
sa.nLength = sizeof(SECURITY_ATTRIBUTES);\r
sa.lpSecurityDescriptor=NULL;\r
return GIT_ERROR_OPEN_PIP;\r
}\r
\r
+ if(StdioFile)\r
+ {\r
+ hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE, \r
+ &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL); \r
+ }\r
+\r
STARTUPINFO si;\r
PROCESS_INFORMATION pi;\r
si.cb=sizeof(STARTUPINFO);\r
GetStartupInfo(&si);\r
\r
si.hStdError=hWrite;\r
- si.hStdOutput=hWrite;\r
+ if(StdioFile)\r
+ si.hStdOutput=hStdioFile;\r
+ else\r
+ si.hStdOutput=hWrite;\r
+\r
si.wShowWindow=SW_HIDE;\r
si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
\r
return 0;\r
\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
+{\r
+ USES_CONVERSION;\r
+ str->Append(A2W(p));\r
+\r
+} \r
+\r
int CGit::Run(CString cmd, CString* output)\r
{\r
PROCESS_INFORMATION pi;\r
return GIT_ERROR_CREATE_PROCESS;\r
\r
DWORD readnumber;\r
- while(ReadFile(hRead,buffer,4090,&readnumber,NULL))\r
+ while(ReadFile(hRead,g_Buffer,1023,&readnumber,NULL))\r
{\r
- buffer[readnumber]=0;\r
- USES_CONVERSION;\r
- output->Append(A2W(buffer));\r
+ g_Buffer[readnumber]=0;\r
+ StringAppend(output,g_Buffer);\r
}\r
\r
\r
CString CGit::GetUserName(void)\r
{\r
CString UserName;\r
- Run(_T("git.cmd config user.name"),&UserName);\r
+ Run(_T("git.exe config user.name"),&UserName);\r
return UserName;\r
}\r
CString CGit::GetUserEmail(void)\r
{\r
CString UserName;\r
- Run(_T("git.cmd config user.email"),&UserName);\r
+ Run(_T("git.exe config user.email"),&UserName);\r
return UserName;\r
}\r
\r
CString CGit::GetCurrentBranch(void)\r
{\r
CString branch;\r
- Run(_T("git.cmd branch"),&branch);\r
+ Run(_T("git.exe branch"),&branch);\r
if(branch.GetLength()>0)\r
{\r
branch.Replace(_T('*'),_T(' '));\r
return CString("");\r
}\r
\r
-int CGit::GetLog(CString& logOut)\r
+int CGit::BuildOutputFormat(CString &format,bool IsFull)\r
{\r
-\r
- CString cmd;\r
CString log;\r
- cmd=("git.cmd log -C --numstat --raw --pretty=format:\"");\r
log.Format(_T("#<%c>%%n"),LOG_REV_ITEM_BEGIN);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%an%%n"),LOG_REV_AUTHOR_NAME);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%ae%%n"),LOG_REV_AUTHOR_EMAIL);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%ai%%n"),LOG_REV_AUTHOR_DATE);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%cn%%n"),LOG_REV_COMMIT_NAME);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%ce%%n"),LOG_REV_COMMIT_EMAIL);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%ci%%n"),LOG_REV_COMMIT_DATE);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%s%%n"),LOG_REV_COMMIT_SUBJECT);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%b%%n"),LOG_REV_COMMIT_BODY);\r
- cmd += log;\r
+ format += log;\r
+ if(IsFull)\r
+ {\r
+ log.Format(_T("#<%c>%%an%%n"),LOG_REV_AUTHOR_NAME);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%ae%%n"),LOG_REV_AUTHOR_EMAIL);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%ai%%n"),LOG_REV_AUTHOR_DATE);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%cn%%n"),LOG_REV_COMMIT_NAME);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%ce%%n"),LOG_REV_COMMIT_EMAIL);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%ci%%n"),LOG_REV_COMMIT_DATE);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%s%%n"),LOG_REV_COMMIT_SUBJECT);\r
+ format += log;\r
+ log.Format(_T("#<%c>%%b%%n"),LOG_REV_COMMIT_BODY);\r
+ format += log;\r
+ }\r
log.Format(_T("#<%c>%%H%%n"),LOG_REV_COMMIT_HASH);\r
- cmd += log;\r
+ format += log;\r
log.Format(_T("#<%c>%%P%%n"),LOG_REV_COMMIT_PARENT);\r
- cmd += log;\r
- log.Format(_T("#<%c>%%n"),LOG_REV_COMMIT_FILE);\r
- cmd += log;\r
- cmd += CString(_T("\" HEAD~4..HEAD"));\r
- Run(cmd,&logOut);\r
+ format += log;\r
+\r
+ if(IsFull)\r
+ {\r
+ log.Format(_T("#<%c>%%n"),LOG_REV_COMMIT_FILE);\r
+ format += log;\r
+ }\r
return 0;\r
}\r
\r
+int CGit::GetLog(CString& logOut, CString &hash, int count)\r
+{\r
+\r
+ CString cmd;\r
+ CString log;\r
+ CString num;\r
+ CString since;\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
+ cmd += log;\r
+ cmd += CString(_T("\" "))+hash;\r
+ return Run(cmd,&logOut);\r
+}\r
+\r
+\r
+int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)\r
+{\r
+ CString cmd;\r
+ CString log;\r
+ int n;\r
+ if(count<0)\r
+ n=100;\r
+ else\r
+ n=count;\r
+ cmd.Format(_T("git.exe log --topo-order -n%d --pretty=format:\""),n);\r
+ BuildOutputFormat(log,false);\r
+ cmd += log+_T("\"");\r
+ if (path)\r
+ cmd+= _T(" -- \"")+path->GetGitPathString()+_T("\"");\r
+ //cmd += CString(_T("\" HEAD~40..HEAD"));\r
+ return Run(cmd,&logOut);\r
+}\r
+\r
#define BUFSIZE 512\r
void GetTempPath(CString &path)\r
{\r
{\r
CString cmd;\r
CString out;\r
- cmd.Format(_T("git.cmd rev-parse %s" ),friendname);\r
+ cmd.Format(_T("git.exe rev-parse %s" ),friendname);\r
Run(cmd,&out);\r
int pos=out.ReverseFind(_T('\n'));\r
if(pos>0)\r
return out;\r
}\r
\r
-int CGit::GetTagList(CStringList &list)\r
+int CGit::GetTagList(STRING_VECTOR &list)\r
{\r
int ret;\r
CString cmd,output;\r
{\r
i++;\r
one=output.Tokenize(_T("\n"),pos);\r
- list.AddTail(one);\r
+ list.push_back(one);\r
}\r
}\r
return ret;\r
}\r
\r
-int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)\r
+int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)\r
{\r
int ret;\r
CString cmd,output;\r
{\r
i++;\r
one=output.Tokenize(_T("\n"),pos);\r
- list.AddTail(one.Right(one.GetLength()-2));\r
+ list.push_back(one.Right(one.GetLength()-2));\r
if(one[0] == _T('*'))\r
if(current)\r
*current=i;\r
return ret;\r
}\r
\r
-int CGit::GetRemoteList(CStringList &list)\r
+int CGit::GetRemoteList(STRING_VECTOR &list)\r
{\r
int ret;\r
CString cmd,output;\r
url=one.Right(one.GetLength()-start-1);\r
one=url;\r
one=one.Left(one.Find(_T("."),0));\r
- list.AddTail(one);\r
+ list.push_back(one);\r
}\r
}\r
}\r