#include "Git.h"\r
#include "atlconv.h"\r
#include "GitRev.h"\r
+#include "registry.h"\r
\r
#define MAX_DIRBUFFER 1000\r
CGit g_Git;\r
{\r
}\r
\r
-char buffer[4096];\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
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
+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
+ {\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
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
\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);\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
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
+ log.Format(_T("#<%c>%%m%%H%%n"),LOG_REV_COMMIT_HASH);\r
format += log;\r
log.Format(_T("#<%c>%%P%%n"),LOG_REV_COMMIT_PARENT);\r
format += log;\r
return 0;\r
}\r
\r
-int CGit::GetLog(CString& logOut, CString &hash, int count)\r
+int CGit::GetLog(CString& 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
+ 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
+ cmd.Format(_T("git.exe log %s -C --left-right --boundary --topo-order --parents %s --pretty=format:\""),\r
+ num,param);\r
+\r
BuildOutputFormat(log);\r
cmd += log;\r
- cmd += CString(_T("\" "))+hash;\r
+ cmd += CString(_T("\" "))+hash+file;\r
+\r
return Run(cmd,&logOut);\r
}\r
\r
\r
-int CGit::GetShortLog(CString &logOut)\r
+int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)\r
{\r
CString cmd;\r
CString log;\r
- cmd=("git.exe log --topo-order -n100 --pretty=format:\"");\r
+ int n;\r
+ if(count<0)\r
+ n=100;\r
+ else\r
+ n=count;\r
+ cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);\r
BuildOutputFormat(log,false);\r
- cmd += log;\r
- cmd += CString(_T("\" HEAD~40..HEAD"));\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
{\r
int ret;\r
CString cmd,output;\r
- cmd=_T("git show-ref");\r
+ cmd=_T("git show-ref -d");\r
ret=g_Git.Run(cmd,&output);\r
if(!ret)\r
{\r
}\r
}\r
return ret;\r
+}\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
+\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))\r
+ {\r
+ return false;\r
+ }\r
+ else\r
+ return true;\r
+\r
}
\ No newline at end of file