5 #include "registry.h"
\r
6 #include "GitConfig.h"
\r
8 #include "UnicodeUtils.h"
\r
10 int CGit::m_LogEncode=CP_UTF8;
\r
12 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)
\r
16 while (*src == _T(';'))
\r
24 while (*src && *src != _T(';'))
\r
26 if (*src != _T('"'))
\r
38 while (*src && *src != _T('"'))
\r
53 while (*src == _T(';'))
\r
60 return (orgsrc != src) ? (LPTSTR)src : NULL;
\r
63 static inline BOOL FileExists(LPCTSTR lpszFileName)
\r
66 return _tstat(lpszFileName, &st) == 0;
\r
69 static BOOL FindGitPath()
\r
72 _tgetenv_s(&size, NULL, 0, _T("PATH"));
\r
79 TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));
\r
80 _tgetenv_s(&size, env, size, _T("PATH"));
\r
82 TCHAR buf[_MAX_PATH];
\r
84 // search in all paths defined in PATH
\r
85 while ((env = nextpath(env, buf, _MAX_PATH-1)) && *buf)
\r
87 TCHAR *pfin = buf + _tcslen(buf)-1;
\r
89 // ensure trailing slash
\r
90 if (*pfin != _T('/') && *pfin != _T('\\'))
\r
91 _tcscpy(++pfin, _T("\\"));
\r
93 const int len = _tcslen(buf);
\r
95 if ((len + 7) < _MAX_PATH)
\r
96 _tcscpy(pfin+1, _T("git.exe"));
\r
100 if ( FileExists(buf) )
\r
104 CGit::ms_LastMsysGitDir = buf;
\r
113 #define MAX_DIRBUFFER 1000
\r
114 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
\r
116 CString CGit::ms_LastMsysGitDir;
\r
119 // contains system environment that should be used by child processes (RunAsync)
\r
120 // initialized by CheckMsysGitDir
\r
121 static LPTSTR l_processEnv = NULL;
\r
127 GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));
\r
128 m_CurrentDir.ReleaseBuffer();
\r
137 static char g_Buffer[4096];
\r
139 int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CString *StdioFile)
\r
141 SECURITY_ATTRIBUTES sa;
\r
142 HANDLE hRead, hWrite;
\r
143 HANDLE hStdioFile = NULL;
\r
145 sa.nLength = sizeof(SECURITY_ATTRIBUTES);
\r
146 sa.lpSecurityDescriptor=NULL;
\r
147 sa.bInheritHandle=TRUE;
\r
148 if(!CreatePipe(&hRead,&hWrite,&sa,0))
\r
150 return GIT_ERROR_OPEN_PIP;
\r
155 hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
156 &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
160 PROCESS_INFORMATION pi;
\r
161 si.cb=sizeof(STARTUPINFO);
\r
162 GetStartupInfo(&si);
\r
164 si.hStdError=hWrite;
\r
166 si.hStdOutput=hStdioFile;
\r
168 si.hStdOutput=hWrite;
\r
170 si.wShowWindow=SW_HIDE;
\r
171 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
173 LPTSTR pEnv = l_processEnv;
\r
174 DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;
\r
176 //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
\r
177 dwFlags |= DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP;
\r
179 memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));
\r
181 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
184 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
185 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
188 return GIT_ERROR_CREATE_PROCESS;
\r
191 m_CurrentGitPi = pi;
\r
193 CloseHandle(hWrite);
\r
202 //Must use sperate function to convert ANSI str to union code string
\r
203 //Becuase A2W use stack as internal convert buffer.
\r
204 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)
\r
207 //str->Append(A2W_CP((LPCSTR)p,code));
\r
215 len= strlen((const char*)p);
\r
220 //buf = new WCHAR[len*4 + 1];
\r
221 buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();
\r
222 SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));
\r
223 MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);
\r
224 str->ReleaseBuffer();
\r
225 //str->Append(buf);
\r
228 BOOL CGit::IsInitRepos()
\r
232 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))
\r
234 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
237 if(cmdout.IsEmpty())
\r
242 int CGit::Run(CGitCall* pcall)
\r
244 PROCESS_INFORMATION pi;
\r
246 if(RunAsync(pcall->GetCmd(),&pi,&hRead))
\r
247 return GIT_ERROR_CREATE_PROCESS;
\r
250 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
\r
251 bool bAborted=false;
\r
252 while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
\r
254 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
\r
255 if(!bAborted)//For now, flush output when command aborted.
\r
256 if(pcall->OnOutputData(data,readnumber))
\r
263 CloseHandle(pi.hThread);
\r
265 WaitForSingleObject(pi.hProcess, INFINITE);
\r
268 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
\r
270 return GIT_ERROR_GET_EXIT_CODE;
\r
273 CloseHandle(pi.hProcess);
\r
275 CloseHandle(hRead);
\r
278 class CGitCall_ByteVector : public CGitCall
\r
281 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}
\r
282 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
284 size_t oldsize=m_pvector->size();
\r
285 m_pvector->resize(m_pvector->size()+size);
\r
286 memcpy(&*(m_pvector->begin()+oldsize),data,size);
\r
289 BYTE_VECTOR* m_pvector;
\r
292 int CGit::Run(CString cmd,BYTE_VECTOR *vector)
\r
294 CGitCall_ByteVector call(cmd,vector);
\r
297 int CGit::Run(CString cmd, CString* output,int code)
\r
299 BYTE_VECTOR vector;
\r
301 ret=Run(cmd,&vector);
\r
303 vector.push_back(0);
\r
305 StringAppend(output,&(vector[0]),code);
\r
309 CString CGit::GetUserName(void)
\r
311 return GetConfigValue(L"user.name");
\r
313 CString CGit::GetUserEmail(void)
\r
315 return GetConfigValue(L"user.email");
\r
318 CString CGit::GetConfigValue(CString name)
\r
320 CString configValue;
\r
322 cmd.Format(L"git.exe config %s", name);
\r
323 Run(cmd,&configValue,CP_UTF8);
\r
325 return configValue.Tokenize(_T("\n"),start);
\r
329 CString CGit::GetCurrentBranch(void)
\r
332 //Run(_T("git.exe branch"),&branch);
\r
334 int ret=g_Git.Run(_T("git.exe branch --no-color"),&output,CP_UTF8);
\r
342 one=output.Tokenize(_T("\n"),pos);
\r
343 //list.push_back(one.Right(one.GetLength()-2));
\r
344 if(one[0] == _T('*'))
\r
345 return one.Right(one.GetLength()-2);
\r
348 return CString("");
\r
351 CString CGit::GetSymbolicRef(const wchar_t* symbolicRefName, bool bStripRefsHeads)
\r
355 cmd.Format(L"git symbolic-ref %s", symbolicRefName);
\r
356 if(Run(cmd, &refName, CP_UTF8) != 0)
\r
357 return CString();//Error
\r
359 refName = refName.Tokenize(L"\n", iStart);
\r
360 if(bStripRefsHeads)
\r
361 refName = StripRefName(refName);
\r
365 CString CGit::GetFullRefName(CString shortRefName)
\r
369 cmd.Format(L"git rev-parse --symbolic-full-name %s", shortRefName);
\r
370 if(Run(cmd, &refName, CP_UTF8) != 0)
\r
371 return CString();//Error
\r
373 return refName.Tokenize(L"\n", iStart);
\r
376 CString CGit::StripRefName(CString refName)
\r
378 if(wcsncmp(refName, L"refs/heads/", 11) == 0)
\r
379 refName = refName.Mid(11);
\r
380 else if(wcsncmp(refName, L"refs/", 5) == 0)
\r
381 refName = refName.Mid(5);
\r
385 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)
\r
387 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
\r
389 if ( sProjectRoot.IsEmpty() )
\r
392 CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");
\r
395 _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));
\r
403 fgets(s, sizeof(s), pFile);
\r
407 const char *pfx = "ref: refs/heads/";
\r
408 const int len = 16;//strlen(pfx)
\r
410 if ( !strncmp(s, pfx, len) )
\r
412 //# We're on a branch. It might not exist. But
\r
413 //# HEAD looks good enough to be a branch.
\r
414 sBranchOut = s + len;
\r
415 sBranchOut.TrimRight(_T(" \r\n\t"));
\r
417 if ( sBranchOut.IsEmpty() )
\r
422 //# Assume this is a detached head.
\r
423 sBranchOut = "HEAD";
\r
431 int CGit::BuildOutputFormat(CString &format,bool IsFull)
\r
434 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
\r
438 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
\r
440 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
\r
442 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
\r
444 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
\r
446 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
\r
448 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
\r
450 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
\r
454 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
\r
456 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
\r
458 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
\r
463 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
\r
469 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask,CString *from,CString *to)
\r
471 CGitCall_ByteVector gitCall(CString(),&logOut);
\r
472 return GetLog(&gitCall,hash,path,count,mask,from,to);
\r
475 CString CGit::GetLogCmd( CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
\r
485 file.Format(_T(" -- \"%s\""),path->GetGitPathString());
\r
488 num.Format(_T("-n%d"),count);
\r
492 if(mask& LOG_INFO_STAT )
\r
493 param += _T(" --numstat ");
\r
494 if(mask& LOG_INFO_FILESTATE)
\r
495 param += _T(" --raw ");
\r
497 if(mask& LOG_INFO_FULLHISTORY)
\r
498 param += _T(" --full-history ");
\r
500 if(mask& LOG_INFO_BOUNDARY)
\r
501 param += _T(" --left-right --boundary ");
\r
503 if(mask& CGit::LOG_INFO_ALL_BRANCH)
\r
504 param += _T(" --all ");
\r
506 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
\r
507 param += _T(" -C ");
\r
509 if(mask& CGit::LOG_INFO_DETECT_RENAME )
\r
510 param += _T(" -M ");
\r
512 if(mask& CGit::LOG_INFO_FIRST_PARENT )
\r
513 param += _T(" --first-parent ");
\r
515 if(mask& CGit::LOG_INFO_NO_MERGE )
\r
516 param += _T(" --no-merges ");
\r
518 if(mask& CGit::LOG_INFO_FOLLOW)
\r
519 param += _T(" --follow ");
\r
521 if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
\r
522 param += _T(" -c ");
\r
524 if(mask& CGit::LOG_INFO_FULL_DIFF)
\r
525 param += _T(" --full-diff ");
\r
527 if(from != NULL && to != NULL)
\r
530 range.Format(_T(" %s..%s "),*from,*to);
\r
535 cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
\r
538 BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
\r
541 cmd += CString(_T("\" "))+hash+file;
\r
545 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
\r
546 int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
\r
548 pgitCall->SetCmd( GetLogCmd(hash,path,count,mask,from,to) );
\r
550 return Run(pgitCall);
\r
551 // return Run(cmd,&logOut);
\r
554 #define BUFSIZE 512
\r
555 void GetTempPath(CString &path)
\r
557 TCHAR lpPathBuffer[BUFSIZE];
\r
559 DWORD dwBufSize=BUFSIZE;
\r
560 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
561 lpPathBuffer); // buffer for path
\r
562 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
566 path.Format(_T("%s"),lpPathBuffer);
\r
568 CString GetTempFile()
\r
570 TCHAR lpPathBuffer[BUFSIZE];
\r
572 DWORD dwBufSize=BUFSIZE;
\r
573 TCHAR szTempName[BUFSIZE];
\r
576 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
577 lpPathBuffer); // buffer for path
\r
578 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
582 // Create a temporary file.
\r
583 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
\r
584 TEXT("Patch"), // temp file name prefix
\r
585 0, // create unique name
\r
586 szTempName); // buffer for name
\r
594 return CString(szTempName);
\r
598 int CGit::RunLogFile(CString cmd,CString &filename)
\r
601 PROCESS_INFORMATION pi;
\r
602 si.cb=sizeof(STARTUPINFO);
\r
603 GetStartupInfo(&si);
\r
605 SECURITY_ATTRIBUTES psa={sizeof(psa),NULL,TRUE};;
\r
606 psa.bInheritHandle=TRUE;
\r
608 HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
609 &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
612 si.wShowWindow=SW_HIDE;
\r
613 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
614 si.hStdOutput = houtfile;
\r
616 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
619 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
620 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
623 return GIT_ERROR_CREATE_PROCESS;
\r
626 WaitForSingleObject(pi.hProcess,INFINITE);
\r
628 CloseHandle(pi.hThread);
\r
629 CloseHandle(pi.hProcess);
\r
630 CloseHandle(houtfile);
\r
631 return GIT_SUCCESS;
\r
635 git_revnum_t CGit::GetHash(const CString &friendname)
\r
639 cmd.Format(_T("git.exe rev-parse %s" ),friendname);
\r
640 Run(cmd,&out,CP_UTF8);
\r
641 // int pos=out.ReverseFind(_T('\n'));
\r
642 int pos=out.FindOneOf(_T("\r\n"));
\r
644 return out.Left(pos);
\r
648 int CGit::GetCommitDiffList(CString &rev1,CString &rev2,CTGitPathList &outputlist)
\r
652 if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
\r
655 if(rev1 == GIT_REV_ZERO)
\r
656 cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2);
\r
658 cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1);
\r
661 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2,rev1);
\r
665 if(g_Git.Run(cmd,&out))
\r
668 outputlist.ParserFromLog(out);
\r
672 int CGit::GetTagList(STRING_VECTOR &list)
\r
675 CString cmd,output;
\r
676 cmd=_T("git.exe tag -l");
\r
678 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
686 one=output.Tokenize(_T("\n"),pos);
\r
687 list.push_back(one);
\r
693 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
\r
696 CString cmd,output;
\r
697 cmd=_T("git.exe branch --no-color");
\r
699 if(type==(BRANCH_LOCAL|BRANCH_REMOTE))
\r
701 else if(type==BRANCH_REMOTE)
\r
705 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
712 one=output.Tokenize(_T("\n"),pos);
\r
713 one.Trim(L" \r\n\t");
\r
714 if(one.Find(L" -> ") >= 0 || one.IsEmpty())
\r
715 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
\r
716 if(one[0] == _T('*'))
\r
722 list.push_back(one);
\r
729 int CGit::GetRemoteList(STRING_VECTOR &list)
\r
732 CString cmd,output;
\r
733 cmd=_T("git.exe config --get-regexp \"^^remote[.].*[.]url\"");
\r
734 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
741 one=output.Tokenize(_T("\n"),pos);
\r
742 int start=one.Find(_T("."),0);
\r
746 url=one.Right(one.GetLength()-start-1);
\r
748 one=one.Left(one.Find(_T("."),0));
\r
749 list.push_back(one);
\r
756 int CGit::GetRefList(STRING_VECTOR &list)
\r
759 CString cmd,output;
\r
760 cmd=_T("git show-ref -d");
\r
761 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
768 one=output.Tokenize(_T("\n"),pos);
\r
769 int start=one.Find(_T(" "),0);
\r
773 name=one.Right(one.GetLength()-start-1);
\r
774 list.push_back(name);
\r
780 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
\r
783 CString cmd,output;
\r
784 cmd=_T("git show-ref -d");
\r
785 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
792 one=output.Tokenize(_T("\n"),pos);
\r
793 int start=one.Find(_T(" "),0);
\r
797 name=one.Right(one.GetLength()-start-1);
\r
800 hash=one.Left(start);
\r
802 map[hash].push_back(name);
\r
809 BOOL CGit::CheckMsysGitDir()
\r
811 static BOOL bInitialized = FALSE;
\r
818 TCHAR *oldpath,*home;
\r
819 size_t homesize,size,httpsize;
\r
821 // set HOME if not set already
\r
822 _tgetenv_s(&homesize, NULL, 0, _T("HOME"));
\r
825 _tdupenv_s(&home,&size,_T("USERPROFILE"));
\r
826 _tputenv_s(_T("HOME"),home);
\r
831 #ifndef _TORTOISESHELL
\r
833 _tgetenv_s(&httpsize, NULL, 0, _T("http_proxy"));
\r
836 CString regServeraddress_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-host"), _T(""));
\r
837 CString regServerport_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-port"), _T(""));
\r
838 CString regUsername_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-username"), _T(""));
\r
839 CString regPassword_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-password"), _T(""));
\r
840 CString regTimeout_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-timeout"), _T(""));
\r
841 CString regExceptions_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-exceptions"), _T(""));
\r
843 CString http_proxy;
\r
844 if(!regServeraddress_copy.IsEmpty())
\r
846 if(regServeraddress_copy.Left(4) != _T("http"))
\r
847 http_proxy=_T("http://");
\r
849 if(!regUsername_copy.IsEmpty())
\r
851 http_proxy += regUsername_copy;
\r
852 http_proxy += _T(":")+regPassword_copy;
\r
853 http_proxy += _T("@");
\r
855 http_proxy+=regServeraddress_copy;
\r
856 if(!regServerport_copy.IsEmpty())
\r
858 http_proxy +=_T(":")+regServerport_copy;
\r
860 _tputenv_s(_T("http_proxy"),http_proxy);
\r
864 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
866 if(!sshclient.IsEmpty())
\r
868 _tputenv_s(_T("GIT_SSH"),sshclient);
\r
871 CString ssh=sshclient;
\r
872 ssh.Replace(_T("/"),_T("\\"));
\r
873 ssh.Replace(_T("\\"),_T("\\\\"));
\r
874 ssh=CString(_T("\""))+ssh+_T('\"');
\r
875 _tputenv_s(_T("SVN_SSH"),ssh);
\r
879 TCHAR sPlink[MAX_PATH];
\r
880 GetModuleFileName(NULL, sPlink, _countof(sPlink));
\r
881 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
\r
883 _tcscpy(ptr + 1, _T("TortoisePlink.exe"));
\r
884 _tputenv_s(_T("GIT_SSH"), sPlink);
\r
887 CString ssh=sPlink;
\r
888 ssh.Replace(_T("/"),_T("\\"));
\r
889 ssh.Replace(_T("\\"),_T("\\\\"));
\r
890 ssh=CString(_T("\""))+ssh+_T('\"');
\r
891 _tputenv_s(_T("SVN_SSH"),ssh);
\r
896 TCHAR sAskPass[MAX_PATH];
\r
897 GetModuleFileName(NULL, sAskPass, _countof(sAskPass));
\r
898 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
\r
901 _tcscpy(ptr + 1, _T("SshAskPass.exe"));
\r
902 _tputenv_s(_T("DISPLAY"),_T(":9999"));
\r
903 _tputenv_s(_T("SSH_ASKPASS"),sAskPass);
\r
906 // search PATH if git/bin directory is alredy present
\r
907 if ( FindGitPath() )
\r
909 bInitialized = TRUE;
\r
913 // add git/bin path to PATH
\r
915 CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);
\r
919 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
920 str=msysinstalldir;
\r
921 if ( !str.IsEmpty() )
\r
923 str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";
\r
933 //CGit::m_MsysGitPath=str;
\r
937 _tdupenv_s(&oldpath,&size,_T("PATH"));
\r
940 path.Format(_T("%s;%s"),oldpath,str);
\r
942 _tputenv_s(_T("PATH"),path);
\r
944 CString sOldPath = oldpath;
\r
948 if( !FindGitPath() )
\r
952 _tputenv_s(_T("HOME"),_T(""));
\r
958 #ifdef _TORTOISESHELL
\r
959 l_processEnv = GetEnvironmentStrings();
\r
960 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
\r
961 _tputenv_s(_T("PATH"),sOldPath);
\r
964 _tputenv_s(_T("HOME"),_T(""));
\r
968 bInitialized = TRUE;
\r
974 class CGitCall_EnumFiles : public CGitCall
\r
977 CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
978 : m_pszProjectPath(pszProjectPath),
\r
979 m_pszSubPath(pszSubPath),
\r
981 m_pEnumCb(pEnumCb),
\r
982 m_pUserData(pUserData)
\r
986 typedef std::map<CStringA,char> TStrCharMap;
\r
988 const TCHAR * m_pszProjectPath;
\r
989 const TCHAR * m_pszSubPath;
\r
990 unsigned int m_nFlags;
\r
991 WGENUMFILECB * m_pEnumCb;
\r
992 void * m_pUserData;
\r
994 BYTE_VECTOR m_DataCollector;
\r
996 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
998 m_DataCollector.append(data,size);
\r
1001 // lines from igit.exe are 0 terminated
\r
1002 int found=m_DataCollector.findData((const BYTE*)"",1);
\r
1005 OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );
\r
1006 m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);
\r
1008 return false;//Should never reach this
\r
1010 virtual void OnEnd()
\r
1014 BYTE HexChar(char ch)
\r
1016 if (ch >= '0' && ch <= '9')
\r
1017 return (UINT)(ch - '0');
\r
1018 else if (ch >= 'A' && ch <= 'F')
\r
1019 return (UINT)(ch - 'A') + 10;
\r
1020 else if (ch >= 'a' && ch <= 'f')
\r
1021 return (UINT)(ch - 'a') + 10;
\r
1026 bool OnSingleLine(LPCSTR line)
\r
1028 //Parse single line
\r
1030 wgFile_s fileStatus;
\r
1034 fileStatus.nFlags = 0;
\r
1036 fileStatus.nFlags |= WGFF_Directory;
\r
1037 else if (*line != 'F')
\r
1044 fileStatus.nStatus = WGFS_Unknown;
\r
1047 case 'N': fileStatus.nStatus = WGFS_Normal; break;
\r
1048 case 'M': fileStatus.nStatus = WGFS_Modified; break;
\r
1049 case 'S': fileStatus.nStatus = WGFS_Staged; break;
\r
1050 case 'A': fileStatus.nStatus = WGFS_Added; break;
\r
1051 case 'C': fileStatus.nStatus = WGFS_Conflicted; break;
\r
1052 case 'D': fileStatus.nStatus = WGFS_Deleted; break;
\r
1053 case 'I': fileStatus.nStatus = WGFS_Ignored; break;
\r
1054 case 'U': fileStatus.nStatus = WGFS_Unversioned; break;
\r
1055 case 'E': fileStatus.nStatus = WGFS_Empty; break;
\r
1056 case '?': fileStatus.nStatus = WGFS_Unknown; break;
\r
1066 fileStatus.sha1 = NULL;
\r
1067 if ( !(fileStatus.nFlags & WGFF_Directory) )
\r
1069 for (int i=0; i<20; i++)
\r
1071 sha1[i] = (HexChar(line[0])<<4)&0xF0;
\r
1072 sha1[i] |= HexChar(line[1])&0xF;
\r
1081 int len = strlen(line);
\r
1082 if (len && len < 2048)
\r
1084 WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));
\r
1086 MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);
\r
1087 fileStatus.sFileName = buf;
\r
1089 if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))
\r
1097 BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
1099 if(!pszProjectPath || *pszProjectPath=='\0')
\r
1102 CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);
\r
1105 /* char W_szToDir[MAX_PATH];
\r
1106 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
\r
1107 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
\r
1108 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
\r
1110 SetCurrentDirectoryA(W_szToDir);
\r
1111 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
\r
1113 SetCurrentDir(pszProjectPath);
\r
1118 if (nFlags & WGEFF_NoRecurse) sMode += _T("r");
\r
1119 if (nFlags & WGEFF_FullPath) sMode += _T("f");
\r
1120 if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");
\r
1121 if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");
\r
1122 if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");
\r
1123 if (nFlags & WGEFF_SingleFile) sMode += _T("s");
\r
1130 // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least
\r
1131 // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with
\r
1132 // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just
\r
1133 // use forward slashes for supplied project and sub paths
\r
1135 CString sProjectPath = pszProjectPath;
\r
1136 sProjectPath.Replace(_T('\\'), _T('/'));
\r
1140 CString sSubPath = pszSubPath;
\r
1141 sSubPath.Replace(_T('\\'), _T('/'));
\r
1143 cmd.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);
\r
1147 cmd.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath, sMode);
\r
1150 //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");
\r
1152 W_GitCall.SetCmd(cmd);
\r
1153 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
\r
1154 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
\r
1156 if ( Run(&W_GitCall) )
\r
1162 BOOL CGit::CheckCleanWorkTree()
\r
1166 cmd=_T("git.exe rev-parse --verify HEAD");
\r
1168 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1171 cmd=_T("git.exe update-index --ignore-submodules --refresh");
\r
1172 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1175 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
\r
1176 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1179 cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
\r
1180 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1185 int CGit::Revert(CTGitPathList &list,bool keep)
\r
1188 for(int i=0;i<list.GetCount();i++)
\r
1190 ret = Revert((CTGitPath&)list[i],keep);
\r
1196 int CGit::Revert(CTGitPath &path,bool keep)
\r
1199 if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
1200 { //To init git repository, there are not HEAD, so we can use git reset command
\r
1201 cmd.Format(_T("git.exe rm --cached -- \"%s\""),path.GetGitPathString());
\r
1203 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1206 else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )
\r
1208 cmd.Format(_T("git.exe mv -- \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
\r
1209 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1212 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());
\r
1213 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1218 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());
\r
1219 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1225 int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
\r
1227 BYTE_VECTOR vector;
\r
1231 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
\r
1233 cmd=_T("git.exe ls-files -u -t -z");
\r
1235 if(g_Git.Run(cmd,&vector))
\r
1240 list.ParserFromLsFile(vector);
\r
1245 bool CGit::IsFastForward(CString &from, CString &to)
\r
1247 CString base,hash;
\r
1249 cmd.Format(_T("git.exe merge-base %s %s"), to,from);
\r
1251 if(g_Git.Run(cmd,&base,CP_ACP))
\r
1253 //CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
1256 base=base.Left(40);
\r
1258 hash=g_Git.GetHash(from);
\r
1260 hash=hash.Left(40);
\r
1262 return hash == base;
\r
1265 unsigned int CGit::Hash2int(CString &hash)
\r
1268 for(int i=0;i<8;i++)
\r
1271 if(hash[i]>=_T('a'))
\r
1272 ret |= (hash[i]-_T('a')+10)&0xFF;
\r
1273 else if(hash[i]>=_T('A'))
\r
1274 ret |= (hash[i]-_T('A')+10)&0xFF;
\r
1276 ret |= (hash[i]-_T('0'))&0xFF;
\r
1282 int CGit::RefreshGitIndex()
\r
1284 CString cmd,output;
\r
1285 cmd=_T("git.exe update-index --refresh");
\r
1286 return Run(cmd,&output,CP_ACP);
\r