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;
\r
179 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
182 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
183 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
186 return GIT_ERROR_CREATE_PROCESS;
\r
189 CloseHandle(hWrite);
\r
198 //Must use sperate function to convert ANSI str to union code string
\r
199 //Becuase A2W use stack as internal convert buffer.
\r
200 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)
\r
203 //str->Append(A2W_CP((LPCSTR)p,code));
\r
211 len= strlen((const char*)p);
\r
216 //buf = new WCHAR[len*4 + 1];
\r
217 buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();
\r
218 SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));
\r
219 MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);
\r
220 str->ReleaseBuffer();
\r
221 //str->Append(buf);
\r
224 BOOL CGit::IsInitRepos()
\r
228 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))
\r
230 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
233 if(cmdout.IsEmpty())
\r
238 int CGit::Run(CGitCall* pcall)
\r
240 PROCESS_INFORMATION pi;
\r
242 if(RunAsync(pcall->GetCmd(),&pi,&hRead))
\r
243 return GIT_ERROR_CREATE_PROCESS;
\r
246 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
\r
247 bool bAborted=false;
\r
248 while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
\r
250 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
\r
251 if(!bAborted)//For now, flush output when command aborted.
\r
252 if(pcall->OnOutputData(data,readnumber))
\r
259 CloseHandle(pi.hThread);
\r
261 WaitForSingleObject(pi.hProcess, INFINITE);
\r
264 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
\r
266 return GIT_ERROR_GET_EXIT_CODE;
\r
269 CloseHandle(pi.hProcess);
\r
271 CloseHandle(hRead);
\r
274 class CGitCall_ByteVector : public CGitCall
\r
277 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}
\r
278 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
280 size_t oldsize=m_pvector->size();
\r
281 m_pvector->resize(m_pvector->size()+size);
\r
282 memcpy(&*(m_pvector->begin()+oldsize),data,size);
\r
285 BYTE_VECTOR* m_pvector;
\r
288 int CGit::Run(CString cmd,BYTE_VECTOR *vector)
\r
290 CGitCall_ByteVector call(cmd,vector);
\r
293 int CGit::Run(CString cmd, CString* output,int code)
\r
295 BYTE_VECTOR vector;
\r
297 ret=Run(cmd,&vector);
\r
299 vector.push_back(0);
\r
301 StringAppend(output,&(vector[0]),code);
\r
305 CString CGit::GetUserName(void)
\r
307 return GetConfigValue(L"user.name");
\r
309 CString CGit::GetUserEmail(void)
\r
311 return GetConfigValue(L"user.email");
\r
314 CString CGit::GetConfigValue(CString name)
\r
316 CString configValue;
\r
318 cmd.Format(L"git.exe config %s", name);
\r
319 Run(cmd,&configValue,CP_UTF8);
\r
321 return configValue.Tokenize(_T("\n"),start);
\r
325 CString CGit::GetCurrentBranch(void)
\r
328 //Run(_T("git.exe branch"),&branch);
\r
330 int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);
\r
338 one=output.Tokenize(_T("\n"),pos);
\r
339 //list.push_back(one.Right(one.GetLength()-2));
\r
340 if(one[0] == _T('*'))
\r
341 return one.Right(one.GetLength()-2);
\r
344 return CString("");
\r
347 CString CGit::GetSymbolicRef(const wchar_t* symbolicRefName, bool bStripRefsHeads)
\r
351 cmd.Format(L"git symbolic-ref %s", symbolicRefName);
\r
352 if(Run(cmd, &refName, CP_UTF8) != 0)
\r
353 return CString();//Error
\r
355 refName = refName.Tokenize(L"\n", iStart);
\r
356 if(bStripRefsHeads)
\r
357 refName = StripRefName(refName);
\r
361 CString CGit::GetFullRefName(CString shortRefName)
\r
365 cmd.Format(L"git rev-parse --symbolic-full-name %s", shortRefName);
\r
366 if(Run(cmd, &refName, CP_UTF8) != 0)
\r
367 return CString();//Error
\r
369 return refName.Tokenize(L"\n", iStart);
\r
372 CString CGit::StripRefName(CString refName)
\r
374 if(wcsncmp(refName, L"refs/heads/", 11) == 0)
\r
375 refName = refName.Mid(11);
\r
376 else if(wcsncmp(refName, L"refs/", 5) == 0)
\r
377 refName = refName.Mid(5);
\r
381 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)
\r
383 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
\r
385 if ( sProjectRoot.IsEmpty() )
\r
388 CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");
\r
391 _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));
\r
399 fgets(s, sizeof(s), pFile);
\r
403 const char *pfx = "ref: refs/heads/";
\r
404 const int len = 16;//strlen(pfx)
\r
406 if ( !strncmp(s, pfx, len) )
\r
408 //# We're on a branch. It might not exist. But
\r
409 //# HEAD looks good enough to be a branch.
\r
410 sBranchOut = s + len;
\r
411 sBranchOut.TrimRight(_T(" \r\n\t"));
\r
413 if ( sBranchOut.IsEmpty() )
\r
418 //# Assume this is a detached head.
\r
419 sBranchOut = "HEAD";
\r
427 int CGit::BuildOutputFormat(CString &format,bool IsFull)
\r
430 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
\r
434 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
\r
436 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
\r
438 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
\r
440 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
\r
442 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
\r
444 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
\r
446 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
\r
450 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
\r
452 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
\r
454 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
\r
459 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
\r
465 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask,CString *from,CString *to)
\r
467 CGitCall_ByteVector gitCall(CString(),&logOut);
\r
468 return GetLog(&gitCall,hash,path,count,mask,from,to);
\r
471 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
\r
472 int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
\r
483 file.Format(_T(" -- \"%s\""),path->GetGitPathString());
\r
486 num.Format(_T("-n%d"),count);
\r
490 if(mask& LOG_INFO_STAT )
\r
491 param += _T(" --numstat ");
\r
492 if(mask& LOG_INFO_FILESTATE)
\r
493 param += _T(" --raw ");
\r
495 if(mask& LOG_INFO_FULLHISTORY)
\r
496 param += _T(" --full-history ");
\r
498 if(mask& LOG_INFO_BOUNDARY)
\r
499 param += _T(" --left-right --boundary ");
\r
501 if(mask& CGit::LOG_INFO_ALL_BRANCH)
\r
502 param += _T(" --all ");
\r
504 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
\r
505 param += _T(" -C ");
\r
507 if(mask& CGit::LOG_INFO_DETECT_RENAME )
\r
508 param += _T(" -M ");
\r
510 if(mask& CGit::LOG_INFO_FIRST_PARENT )
\r
511 param += _T(" --first-parent ");
\r
513 if(mask& CGit::LOG_INFO_NO_MERGE )
\r
514 param += _T(" --no-merges ");
\r
516 if(mask& CGit::LOG_INFO_FOLLOW)
\r
517 param += _T(" --follow ");
\r
519 if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
\r
520 param += _T(" -c ");
\r
522 if(from != NULL && to != NULL)
\r
525 range.Format(_T(" %s..%s "),*from,*to);
\r
530 cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
\r
533 BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
\r
536 cmd += CString(_T("\" "))+hash+file;
\r
538 pgitCall->SetCmd(cmd);
\r
540 return Run(pgitCall);
\r
541 // return Run(cmd,&logOut);
\r
545 int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)
\r
554 cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);
\r
555 BuildOutputFormat(log,false);
\r
556 cmd += log+_T("\"");
\r
558 cmd+= _T(" -- \"")+path->GetGitPathString()+_T("\"");
\r
559 //cmd += CString(_T("\" HEAD~40..HEAD"));
\r
560 return Run(cmd,&logOut);
\r
564 #define BUFSIZE 512
\r
565 void GetTempPath(CString &path)
\r
567 TCHAR lpPathBuffer[BUFSIZE];
\r
569 DWORD dwBufSize=BUFSIZE;
\r
570 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
571 lpPathBuffer); // buffer for path
\r
572 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
576 path.Format(_T("%s"),lpPathBuffer);
\r
578 CString GetTempFile()
\r
580 TCHAR lpPathBuffer[BUFSIZE];
\r
582 DWORD dwBufSize=BUFSIZE;
\r
583 TCHAR szTempName[BUFSIZE];
\r
586 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
587 lpPathBuffer); // buffer for path
\r
588 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
592 // Create a temporary file.
\r
593 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
\r
594 TEXT("Patch"), // temp file name prefix
\r
595 0, // create unique name
\r
596 szTempName); // buffer for name
\r
604 return CString(szTempName);
\r
608 int CGit::RunLogFile(CString cmd,CString &filename)
\r
611 PROCESS_INFORMATION pi;
\r
612 si.cb=sizeof(STARTUPINFO);
\r
613 GetStartupInfo(&si);
\r
615 SECURITY_ATTRIBUTES psa={sizeof(psa),NULL,TRUE};;
\r
616 psa.bInheritHandle=TRUE;
\r
618 HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
619 &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
622 si.wShowWindow=SW_HIDE;
\r
623 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
624 si.hStdOutput = houtfile;
\r
626 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
629 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
630 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
633 return GIT_ERROR_CREATE_PROCESS;
\r
636 WaitForSingleObject(pi.hProcess,INFINITE);
\r
638 CloseHandle(pi.hThread);
\r
639 CloseHandle(pi.hProcess);
\r
640 CloseHandle(houtfile);
\r
641 return GIT_SUCCESS;
\r
645 git_revnum_t CGit::GetHash(const CString &friendname)
\r
649 cmd.Format(_T("git.exe rev-parse %s" ),friendname);
\r
650 Run(cmd,&out,CP_UTF8);
\r
651 // int pos=out.ReverseFind(_T('\n'));
\r
652 int pos=out.FindOneOf(_T("\r\n"));
\r
654 return out.Left(pos);
\r
658 int CGit::GetCommitDiffList(CString &rev1,CString &rev2,CTGitPathList &outputlist)
\r
662 if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
\r
665 if(rev1 == GIT_REV_ZERO)
\r
666 cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2);
\r
668 cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1);
\r
671 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2,rev1);
\r
675 if(g_Git.Run(cmd,&out))
\r
678 outputlist.ParserFromLog(out);
\r
682 int CGit::GetTagList(STRING_VECTOR &list)
\r
685 CString cmd,output;
\r
686 cmd=_T("git.exe tag -l");
\r
688 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
696 one=output.Tokenize(_T("\n"),pos);
\r
697 list.push_back(one);
\r
703 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
\r
706 CString cmd,output;
\r
707 cmd=_T("git.exe branch");
\r
709 if(type==(BRANCH_LOCAL|BRANCH_REMOTE))
\r
711 else if(type==BRANCH_REMOTE)
\r
715 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
722 one=output.Tokenize(_T("\n"),pos);
\r
723 one.Trim(L" \r\n\t");
\r
724 if(one.Find(L" -> ") >= 0 || one.IsEmpty())
\r
725 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
\r
726 if(one[0] == _T('*'))
\r
732 list.push_back(one);
\r
739 int CGit::GetRemoteList(STRING_VECTOR &list)
\r
742 CString cmd,output;
\r
743 cmd=_T("git.exe config --get-regexp remote.*.url");
\r
744 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
751 one=output.Tokenize(_T("\n"),pos);
\r
752 int start=one.Find(_T("."),0);
\r
756 url=one.Right(one.GetLength()-start-1);
\r
758 one=one.Left(one.Find(_T("."),0));
\r
759 list.push_back(one);
\r
766 int CGit::GetRefList(STRING_VECTOR &list)
\r
769 CString cmd,output;
\r
770 cmd=_T("git show-ref -d");
\r
771 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
778 one=output.Tokenize(_T("\n"),pos);
\r
779 int start=one.Find(_T(" "),0);
\r
783 name=one.Right(one.GetLength()-start-1);
\r
784 list.push_back(name);
\r
790 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
\r
793 CString cmd,output;
\r
794 cmd=_T("git show-ref -d");
\r
795 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
802 one=output.Tokenize(_T("\n"),pos);
\r
803 int start=one.Find(_T(" "),0);
\r
807 name=one.Right(one.GetLength()-start-1);
\r
810 hash=one.Left(start);
\r
812 map[hash].push_back(name);
\r
819 BOOL CGit::CheckMsysGitDir()
\r
821 static BOOL bInitialized = FALSE;
\r
828 TCHAR *oldpath,*home;
\r
829 size_t homesize,size;
\r
831 // set HOME if not set already
\r
832 _tgetenv_s(&homesize, NULL, 0, _T("HOME"));
\r
835 _tdupenv_s(&home,&size,_T("USERPROFILE"));
\r
836 _tputenv_s(_T("HOME"),home);
\r
841 #ifndef _TORTOISESHELL
\r
843 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
845 if(!sshclient.IsEmpty())
\r
847 _tputenv_s(_T("GIT_SSH"),sshclient);
\r
850 TCHAR sPlink[MAX_PATH];
\r
851 GetModuleFileName(NULL, sPlink, _countof(sPlink));
\r
852 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
\r
854 _tcscpy(ptr + 1, _T("TortoisePlink.exe"));
\r
855 _tputenv_s(_T("GIT_SSH"), sPlink);
\r
860 TCHAR sAskPass[MAX_PATH];
\r
861 GetModuleFileName(NULL, sAskPass, _countof(sAskPass));
\r
862 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
\r
865 _tcscpy(ptr + 1, _T("SshAskPass.exe"));
\r
866 _tputenv_s(_T("DISPLAY"),_T(":9999"));
\r
867 _tputenv_s(_T("SSH_ASKPASS"),sAskPass);
\r
870 // search PATH if git/bin directory is alredy present
\r
871 if ( FindGitPath() )
\r
873 bInitialized = TRUE;
\r
877 // add git/bin path to PATH
\r
879 CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);
\r
883 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
884 str=msysinstalldir;
\r
885 if ( !str.IsEmpty() )
\r
887 str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";
\r
897 //CGit::m_MsysGitPath=str;
\r
901 _tdupenv_s(&oldpath,&size,_T("PATH"));
\r
904 path.Format(_T("%s;%s"),oldpath,str);
\r
906 _tputenv_s(_T("PATH"),path);
\r
908 CString sOldPath = oldpath;
\r
912 if( !FindGitPath() )
\r
918 #ifdef _TORTOISESHELL
\r
919 l_processEnv = GetEnvironmentStrings();
\r
920 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
\r
921 _tputenv_s(_T("PATH"),sOldPath);
\r
924 _tputenv_s(_T("HOME"),_T(""));
\r
928 bInitialized = TRUE;
\r
934 class CGitCall_EnumFiles : public CGitCall
\r
937 CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
938 : m_pszProjectPath(pszProjectPath),
\r
939 m_pszSubPath(pszSubPath),
\r
941 m_pEnumCb(pEnumCb),
\r
942 m_pUserData(pUserData)
\r
946 typedef std::map<CStringA,char> TStrCharMap;
\r
948 const TCHAR * m_pszProjectPath;
\r
949 const TCHAR * m_pszSubPath;
\r
950 unsigned int m_nFlags;
\r
951 WGENUMFILECB * m_pEnumCb;
\r
952 void * m_pUserData;
\r
954 BYTE_VECTOR m_DataCollector;
\r
956 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
958 m_DataCollector.append(data,size);
\r
961 // lines from igit.exe are 0 terminated
\r
962 int found=m_DataCollector.findData((const BYTE*)"",1);
\r
965 OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );
\r
966 m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);
\r
968 return false;//Should never reach this
\r
970 virtual void OnEnd()
\r
974 BYTE HexChar(char ch)
\r
976 if (ch >= '0' && ch <= '9')
\r
977 return (UINT)(ch - '0');
\r
978 else if (ch >= 'A' && ch <= 'F')
\r
979 return (UINT)(ch - 'A') + 10;
\r
980 else if (ch >= 'a' && ch <= 'f')
\r
981 return (UINT)(ch - 'a') + 10;
\r
986 bool OnSingleLine(LPCSTR line)
\r
988 //Parse single line
\r
990 wgFile_s fileStatus;
\r
994 fileStatus.nFlags = 0;
\r
996 fileStatus.nFlags |= WGFF_Directory;
\r
997 else if (*line != 'F')
\r
1004 fileStatus.nStatus = WGFS_Unknown;
\r
1007 case 'N': fileStatus.nStatus = WGFS_Normal; break;
\r
1008 case 'M': fileStatus.nStatus = WGFS_Modified; break;
\r
1009 case 'S': fileStatus.nStatus = WGFS_Staged; break;
\r
1010 case 'A': fileStatus.nStatus = WGFS_Added; break;
\r
1011 case 'C': fileStatus.nStatus = WGFS_Conflicted; break;
\r
1012 case 'D': fileStatus.nStatus = WGFS_Deleted; break;
\r
1013 case 'I': fileStatus.nStatus = WGFS_Ignored; break;
\r
1014 case 'U': fileStatus.nStatus = WGFS_Unversioned; break;
\r
1015 case 'E': fileStatus.nStatus = WGFS_Empty; break;
\r
1016 case '?': fileStatus.nStatus = WGFS_Unknown; break;
\r
1026 fileStatus.sha1 = NULL;
\r
1027 if ( !(fileStatus.nFlags & WGFF_Directory) )
\r
1029 for (int i=0; i<20; i++)
\r
1031 sha1[i] = (HexChar(line[0])<<4)&0xF0;
\r
1032 sha1[i] |= HexChar(line[1])&0xF;
\r
1041 int len = strlen(line);
\r
1042 if (len && len < 2048)
\r
1044 WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));
\r
1046 MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);
\r
1047 fileStatus.sFileName = buf;
\r
1049 if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))
\r
1057 BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
1059 if(!pszProjectPath || *pszProjectPath=='\0')
\r
1062 CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);
\r
1065 /* char W_szToDir[MAX_PATH];
\r
1066 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
\r
1067 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
\r
1068 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
\r
1070 SetCurrentDirectoryA(W_szToDir);
\r
1071 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
\r
1073 SetCurrentDir(pszProjectPath);
\r
1078 if (nFlags & WGEFF_NoRecurse) sMode += _T("r");
\r
1079 if (nFlags & WGEFF_FullPath) sMode += _T("f");
\r
1080 if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");
\r
1081 if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");
\r
1082 if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");
\r
1083 if (nFlags & WGEFF_SingleFile) sMode += _T("s");
\r
1090 // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least
\r
1091 // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with
\r
1092 // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just
\r
1093 // use forward slashes for supplied project and sub paths
\r
1095 CString sProjectPath = pszProjectPath;
\r
1096 sProjectPath.Replace(_T('\\'), _T('/'));
\r
1100 CString sSubPath = pszSubPath;
\r
1101 sSubPath.Replace(_T('\\'), _T('/'));
\r
1103 cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);
\r
1107 cmd.Format(_T("igit.exe \"%s\" status %s"), sProjectPath, sMode);
\r
1110 //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");
\r
1112 W_GitCall.SetCmd(cmd);
\r
1113 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
\r
1114 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
\r
1116 if ( Run(&W_GitCall) )
\r
1122 BOOL CGit::CheckCleanWorkTree()
\r
1126 cmd=_T("git.exe rev-parse --verify HEAD");
\r
1128 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1131 cmd=_T("git.exe update-index --ignore-submodules --refresh");
\r
1132 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1135 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
\r
1136 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1139 cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
\r
1140 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1145 int CGit::Revert(CTGitPathList &list,bool keep)
\r
1148 for(int i=0;i<list.GetCount();i++)
\r
1150 ret = Revert((CTGitPath&)list[i],keep);
\r
1156 int CGit::Revert(CTGitPath &path,bool keep)
\r
1159 if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
1160 { //To init git repository, there are not HEAD, so we can use git reset command
\r
1161 cmd.Format(_T("git.exe rm --cached -- \"%s\""),path.GetGitPathString());
\r
1163 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1166 else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )
\r
1168 cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
\r
1169 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1172 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());
\r
1173 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1178 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());
\r
1179 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1185 int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
\r
1187 BYTE_VECTOR vector;
\r
1191 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
\r
1193 cmd=_T("git.exe ls-files -u -t -z");
\r
1195 if(g_Git.Run(cmd,&vector))
\r
1200 list.ParserFromLsFile(vector);
\r