5 #include "registry.h"
\r
6 #include "GitConfig.h"
\r
8 #include "UnicodeUtils.h"
\r
11 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)
\r
15 while (*src == _T(';'))
\r
23 while (*src && *src != _T(';'))
\r
25 if (*src != _T('"'))
\r
37 while (*src && *src != _T('"'))
\r
52 while (*src == _T(';'))
\r
59 return (orgsrc != src) ? (LPTSTR)src : NULL;
\r
62 static inline BOOL FileExists(LPCTSTR lpszFileName)
\r
65 return _tstat(lpszFileName, &st) == 0;
\r
68 static BOOL FindGitPath()
\r
71 _tgetenv_s(&size, NULL, 0, _T("PATH"));
\r
78 TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));
\r
79 _tgetenv_s(&size, env, size, _T("PATH"));
\r
81 TCHAR buf[_MAX_PATH];
\r
83 // search in all paths defined in PATH
\r
84 while ((env = nextpath(env, buf, _MAX_PATH-1)) && *buf)
\r
86 TCHAR *pfin = buf + _tcslen(buf)-1;
\r
88 // ensure trailing slash
\r
89 if (*pfin != _T('/') && *pfin != _T('\\'))
\r
90 _tcscpy(++pfin, _T("\\"));
\r
92 const int len = _tcslen(buf);
\r
94 if ((len + 7) < _MAX_PATH)
\r
95 _tcscpy(pfin+1, _T("git.exe"));
\r
99 if ( FileExists(buf) )
\r
103 CGit::ms_LastMsysGitDir = buf;
\r
112 #define MAX_DIRBUFFER 1000
\r
113 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
\r
115 CString CGit::ms_LastMsysGitDir;
\r
118 // contains system environment that should be used by child processes (RunAsync)
\r
119 // initialized by CheckMsysGitDir
\r
120 static LPTSTR l_processEnv = NULL;
\r
126 GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));
\r
127 m_CurrentDir.ReleaseBuffer();
\r
136 static char g_Buffer[4096];
\r
138 int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CString *StdioFile)
\r
140 SECURITY_ATTRIBUTES sa;
\r
141 HANDLE hRead, hWrite;
\r
142 HANDLE hStdioFile = NULL;
\r
144 sa.nLength = sizeof(SECURITY_ATTRIBUTES);
\r
145 sa.lpSecurityDescriptor=NULL;
\r
146 sa.bInheritHandle=TRUE;
\r
147 if(!CreatePipe(&hRead,&hWrite,&sa,0))
\r
149 return GIT_ERROR_OPEN_PIP;
\r
154 hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
155 &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
159 PROCESS_INFORMATION pi;
\r
160 si.cb=sizeof(STARTUPINFO);
\r
161 GetStartupInfo(&si);
\r
163 si.hStdError=hWrite;
\r
165 si.hStdOutput=hStdioFile;
\r
167 si.hStdOutput=hWrite;
\r
169 si.wShowWindow=SW_HIDE;
\r
170 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
172 LPTSTR pEnv = l_processEnv;
\r
173 DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;
\r
175 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
178 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
179 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
182 return GIT_ERROR_CREATE_PROCESS;
\r
185 CloseHandle(hWrite);
\r
194 //Must use sperate function to convert ANSI str to union code string
\r
195 //Becuase A2W use stack as internal convert buffer.
\r
196 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)
\r
199 //str->Append(A2W_CP((LPCSTR)p,code));
\r
207 len= strlen((const char*)p);
\r
212 //buf = new WCHAR[len*4 + 1];
\r
213 buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();
\r
214 SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));
\r
215 MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);
\r
216 str->ReleaseBuffer();
\r
217 //str->Append(buf);
\r
220 BOOL CGit::IsInitRepos()
\r
224 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))
\r
226 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
229 if(cmdout.IsEmpty())
\r
234 int CGit::Run(CGitCall* pcall)
\r
236 PROCESS_INFORMATION pi;
\r
238 if(RunAsync(pcall->GetCmd(),&pi,&hRead))
\r
239 return GIT_ERROR_CREATE_PROCESS;
\r
242 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
\r
243 bool bAborted=false;
\r
244 while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
\r
246 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
\r
247 if(!bAborted)//For now, flush output when command aborted.
\r
248 if(pcall->OnOutputData(data,readnumber))
\r
255 CloseHandle(pi.hThread);
\r
257 WaitForSingleObject(pi.hProcess, INFINITE);
\r
260 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
\r
262 return GIT_ERROR_GET_EXIT_CODE;
\r
265 CloseHandle(pi.hProcess);
\r
267 CloseHandle(hRead);
\r
270 class CGitCall_ByteVector : public CGitCall
\r
273 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}
\r
274 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
276 size_t oldsize=m_pvector->size();
\r
277 m_pvector->resize(m_pvector->size()+size);
\r
278 memcpy(&*(m_pvector->begin()+oldsize),data,size);
\r
281 BYTE_VECTOR* m_pvector;
\r
284 int CGit::Run(CString cmd,BYTE_VECTOR *vector)
\r
286 CGitCall_ByteVector call(cmd,vector);
\r
289 int CGit::Run(CString cmd, CString* output,int code)
\r
291 BYTE_VECTOR vector;
\r
293 ret=Run(cmd,&vector);
\r
295 vector.push_back(0);
\r
297 StringAppend(output,&(vector[0]),code);
\r
301 CString CGit::GetUserName(void)
\r
304 Run(_T("git.exe config user.name"),&UserName,CP_UTF8);
\r
307 CString CGit::GetUserEmail(void)
\r
310 Run(_T("git.exe config user.email"),&UserName,CP_UTF8);
\r
314 CString CGit::GetCurrentBranch(void)
\r
317 //Run(_T("git.exe branch"),&branch);
\r
319 int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);
\r
327 one=output.Tokenize(_T("\n"),pos);
\r
328 //list.push_back(one.Right(one.GetLength()-2));
\r
329 if(one[0] == _T('*'))
\r
330 return one.Right(one.GetLength()-2);
\r
333 return CString("");
\r
336 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)
\r
338 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
\r
340 if ( sProjectRoot.IsEmpty() )
\r
343 CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");
\r
346 _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));
\r
354 fgets(s, sizeof(s), pFile);
\r
358 const char *pfx = "ref: refs/heads/";
\r
359 const int len = 16;//strlen(pfx)
\r
361 if ( !strncmp(s, pfx, len) )
\r
363 //# We're on a branch. It might not exist. But
\r
364 //# HEAD looks good enough to be a branch.
\r
365 sBranchOut = s + len;
\r
366 sBranchOut.TrimRight(_T(" \r\n\t"));
\r
368 if ( sBranchOut.IsEmpty() )
\r
373 //# Assume this is a detached head.
\r
374 sBranchOut = "HEAD";
\r
382 int CGit::BuildOutputFormat(CString &format,bool IsFull)
\r
385 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
\r
389 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
\r
391 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
\r
393 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
\r
395 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
\r
397 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
\r
399 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
\r
401 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
\r
403 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
\r
406 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
\r
408 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
\r
413 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
\r
419 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask,CString *from,CString *to)
\r
421 CGitCall_ByteVector gitCall(CString(),&logOut);
\r
422 return GetLog(&gitCall,hash,path,count,mask,from,to);
\r
425 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
\r
426 int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
\r
437 file.Format(_T(" -- \"%s\""),path->GetGitPathString());
\r
440 num.Format(_T("-n%d"),count);
\r
444 if(mask& LOG_INFO_STAT )
\r
445 param += _T(" --numstat ");
\r
446 if(mask& LOG_INFO_FILESTATE)
\r
447 param += _T(" --raw ");
\r
449 if(mask& LOG_INFO_FULLHISTORY)
\r
450 param += _T(" --full-history ");
\r
452 if(mask& LOG_INFO_BOUNDARY)
\r
453 param += _T(" --left-right --boundary ");
\r
455 if(mask& CGit::LOG_INFO_ALL_BRANCH)
\r
456 param += _T(" --all ");
\r
458 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
\r
459 param += _T(" -C ");
\r
461 if(mask& CGit::LOG_INFO_DETECT_RENAME )
\r
462 param += _T(" -M ");
\r
464 if(mask& CGit::LOG_INFO_FIRST_PARENT )
\r
465 param += _T(" --first-parent ");
\r
467 if(mask& CGit::LOG_INFO_NO_MERGE )
\r
468 param += _T(" --no-merges ");
\r
470 if(mask& CGit::LOG_INFO_FOLLOW)
\r
471 param += _T(" --follow ");
\r
473 if(from != NULL && to != NULL)
\r
476 range.Format(_T(" %s..%s "),*from,*to);
\r
481 cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
\r
484 BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
\r
487 cmd += CString(_T("\" "))+hash+file;
\r
489 pgitCall->SetCmd(cmd);
\r
491 return Run(pgitCall);
\r
492 // return Run(cmd,&logOut);
\r
496 int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)
\r
505 cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);
\r
506 BuildOutputFormat(log,false);
\r
507 cmd += log+_T("\"");
\r
509 cmd+= _T(" -- \"")+path->GetGitPathString()+_T("\"");
\r
510 //cmd += CString(_T("\" HEAD~40..HEAD"));
\r
511 return Run(cmd,&logOut);
\r
515 #define BUFSIZE 512
\r
516 void GetTempPath(CString &path)
\r
518 TCHAR lpPathBuffer[BUFSIZE];
\r
520 DWORD dwBufSize=BUFSIZE;
\r
521 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
522 lpPathBuffer); // buffer for path
\r
523 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
527 path.Format(_T("%s"),lpPathBuffer);
\r
529 CString GetTempFile()
\r
531 TCHAR lpPathBuffer[BUFSIZE];
\r
533 DWORD dwBufSize=BUFSIZE;
\r
534 TCHAR szTempName[BUFSIZE];
\r
537 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
538 lpPathBuffer); // buffer for path
\r
539 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
543 // Create a temporary file.
\r
544 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
\r
545 TEXT("Patch"), // temp file name prefix
\r
546 0, // create unique name
\r
547 szTempName); // buffer for name
\r
555 return CString(szTempName);
\r
559 int CGit::RunLogFile(CString cmd,CString &filename)
\r
562 PROCESS_INFORMATION pi;
\r
563 si.cb=sizeof(STARTUPINFO);
\r
564 GetStartupInfo(&si);
\r
566 SECURITY_ATTRIBUTES psa={sizeof(psa),NULL,TRUE};;
\r
567 psa.bInheritHandle=TRUE;
\r
569 HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
570 &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
573 si.wShowWindow=SW_HIDE;
\r
574 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
575 si.hStdOutput = houtfile;
\r
577 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
580 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
581 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
584 return GIT_ERROR_CREATE_PROCESS;
\r
587 WaitForSingleObject(pi.hProcess,INFINITE);
\r
589 CloseHandle(pi.hThread);
\r
590 CloseHandle(pi.hProcess);
\r
591 CloseHandle(houtfile);
\r
592 return GIT_SUCCESS;
\r
596 git_revnum_t CGit::GetHash(CString &friendname)
\r
600 cmd.Format(_T("git.exe rev-parse %s" ),friendname);
\r
601 Run(cmd,&out,CP_UTF8);
\r
602 // int pos=out.ReverseFind(_T('\n'));
\r
603 int pos=out.FindOneOf(_T("\r\n"));
\r
605 return out.Left(pos);
\r
609 int CGit::GetTagList(STRING_VECTOR &list)
\r
612 CString cmd,output;
\r
613 cmd=_T("git.exe tag -l");
\r
615 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
623 one=output.Tokenize(_T("\n"),pos);
\r
624 list.push_back(one);
\r
630 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
\r
633 CString cmd,output;
\r
634 cmd=_T("git.exe branch");
\r
636 if(type==(BRANCH_LOCAL|BRANCH_REMOTE))
\r
638 else if(type==BRANCH_REMOTE)
\r
642 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
649 one=output.Tokenize(_T("\n"),pos);
\r
650 list.push_back(one.Right(one.GetLength()-2));
\r
651 if(one[0] == _T('*'))
\r
660 int CGit::GetRemoteList(STRING_VECTOR &list)
\r
663 CString cmd,output;
\r
664 cmd=_T("git.exe config --get-regexp remote.*.url");
\r
665 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
672 one=output.Tokenize(_T("\n"),pos);
\r
673 int start=one.Find(_T("."),0);
\r
677 url=one.Right(one.GetLength()-start-1);
\r
679 one=one.Left(one.Find(_T("."),0));
\r
680 list.push_back(one);
\r
687 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
\r
690 CString cmd,output;
\r
691 cmd=_T("git show-ref -d");
\r
692 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
699 one=output.Tokenize(_T("\n"),pos);
\r
700 int start=one.Find(_T(" "),0);
\r
704 name=one.Right(one.GetLength()-start-1);
\r
707 hash=one.Left(start);
\r
709 map[hash].push_back(name);
\r
716 BOOL CGit::CheckMsysGitDir()
\r
718 static BOOL bInitialized = FALSE;
\r
725 TCHAR *oldpath,*home;
\r
728 // set HOME if not set already
\r
729 _tgetenv_s(&size, NULL, 0, _T("HOME"));
\r
732 _tdupenv_s(&home,&size,_T("USERPROFILE"));
\r
733 _tputenv_s(_T("HOME"),home);
\r
738 CRegString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
739 CString ssh=sshclient;
\r
743 _tputenv_s(_T("GIT_SSH"),ssh);
\r
746 _tputenv_s(_T("GIT_SSH"),_T(""));
\r
749 // search PATH if git/bin directory is alredy present
\r
750 if ( FindGitPath() )
\r
752 bInitialized = TRUE;
\r
756 // add git/bin path to PATH
\r
758 CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
759 CString str=msysdir;
\r
762 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
763 str=msysinstalldir;
\r
764 if ( !str.IsEmpty() )
\r
766 str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";
\r
775 //CGit::m_MsysGitPath=str;
\r
779 _tdupenv_s(&oldpath,&size,_T("PATH"));
\r
782 path.Format(_T("%s;%s"),oldpath,str);
\r
784 _tputenv_s(_T("PATH"),path);
\r
786 CString sOldPath = oldpath;
\r
790 if( !FindGitPath() )
\r
796 #ifdef _TORTOISESHELL
\r
797 l_processEnv = GetEnvironmentStrings();
\r
798 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
\r
799 _tputenv_s(_T("PATH"),sOldPath);
\r
802 bInitialized = TRUE;
\r
808 class CGitCall_EnumFiles : public CGitCall
\r
811 CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
812 : m_pszProjectPath(pszProjectPath),
\r
813 m_pszSubPath(pszSubPath),
\r
815 m_pEnumCb(pEnumCb),
\r
816 m_pUserData(pUserData)
\r
820 typedef std::map<CStringA,char> TStrCharMap;
\r
822 const TCHAR * m_pszProjectPath;
\r
823 const TCHAR * m_pszSubPath;
\r
824 unsigned int m_nFlags;
\r
825 WGENUMFILECB * m_pEnumCb;
\r
826 void * m_pUserData;
\r
828 BYTE_VECTOR m_DataCollector;
\r
830 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
832 m_DataCollector.append(data,size);
\r
835 // lines from igit.exe are 0 terminated
\r
836 int found=m_DataCollector.findData((const BYTE*)"",1);
\r
839 OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );
\r
840 m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);
\r
842 return false;//Should never reach this
\r
844 virtual void OnEnd()
\r
848 UINT HexChar(char ch)
\r
850 if (ch >= '0' && ch <= '9')
\r
851 return (UINT)(ch - '0');
\r
852 else if (ch >= 'A' && ch <= 'F')
\r
853 return (UINT)(ch - 'A') + 10;
\r
854 else if (ch >= 'a' && ch <= 'f')
\r
855 return (UINT)(ch - 'a') + 10;
\r
860 bool OnSingleLine(LPCSTR line)
\r
862 //Parse single line
\r
864 wgFile_s fileStatus;
\r
868 fileStatus.nFlags = 0;
\r
870 fileStatus.nFlags |= WGFF_Directory;
\r
871 else if (*line != 'F')
\r
878 fileStatus.nStatus = WGFS_Unknown;
\r
881 case 'N': fileStatus.nStatus = WGFS_Normal; break;
\r
882 case 'M': fileStatus.nStatus = WGFS_Modified; break;
\r
883 case 'S': fileStatus.nStatus = WGFS_Staged; break;
\r
884 case 'A': fileStatus.nStatus = WGFS_Added; break;
\r
885 case 'C': fileStatus.nStatus = WGFS_Conflicted; break;
\r
886 case 'D': fileStatus.nStatus = WGFS_Deleted; break;
\r
887 case 'I': fileStatus.nStatus = WGFS_Ignored; break;
\r
888 case 'U': fileStatus.nStatus = WGFS_Unversioned; break;
\r
889 case 'E': fileStatus.nStatus = WGFS_Empty; break;
\r
890 case '?': fileStatus.nStatus = WGFS_Unknown; break;
\r
900 fileStatus.sha1 = NULL;
\r
901 if ( !(fileStatus.nFlags & WGFF_Directory) )
\r
903 for (int i=0; i<20; i++)
\r
905 sha1[i] = (BYTE)((HexChar(line[0]) << 8) | HexChar(line[1]));
\r
913 int len = strlen(line);
\r
914 if (len && len < 2048)
\r
916 WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));
\r
918 MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);
\r
919 fileStatus.sFileName = buf;
\r
921 if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))
\r
929 BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
931 if(!pszProjectPath || *pszProjectPath=='\0')
\r
934 CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);
\r
937 /* char W_szToDir[MAX_PATH];
\r
938 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
\r
939 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
\r
940 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
\r
942 SetCurrentDirectoryA(W_szToDir);
\r
943 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
\r
945 SetCurrentDir(pszProjectPath);
\r
950 if (nFlags & WGEFF_NoRecurse) sMode += _T("r");
\r
951 if (nFlags & WGEFF_FullPath) sMode += _T("f");
\r
952 if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");
\r
953 if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");
\r
954 if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");
\r
955 if (nFlags & WGEFF_SingleFile) sMode += _T("s");
\r
963 cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath, sMode, pszSubPath);
\r
965 cmd.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath, sMode);
\r
967 W_GitCall.SetCmd(cmd);
\r
968 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
\r
969 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
\r
971 if ( Run(&W_GitCall) )
\r
977 BOOL CGit::CheckCleanWorkTree()
\r
981 cmd=_T("git.exe rev-parse --verify HEAD");
\r
983 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
986 cmd=_T("git.exe update-index --ignore-submodules --refresh");
\r
987 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
990 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
\r
991 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
994 cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
\r
995 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1000 int CGit::Revert(CTGitPathList &list,bool keep)
\r
1003 for(int i=0;i<list.GetCount();i++)
\r
1005 ret = Revert((CTGitPath&)list[i],keep);
\r
1011 int CGit::Revert(CTGitPath &path,bool keep)
\r
1014 if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
1015 { //To init git repository, there are not HEAD, so we can use git reset command
\r
1016 cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());
\r
1017 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1020 else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )
\r
1022 cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
\r
1023 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1026 cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitOldPathString());
\r
1027 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1032 cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitPathString());
\r
1033 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1039 int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
\r
1041 BYTE_VECTOR vector;
\r
1045 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
\r
1047 cmd=_T("git.exe ls-files -u -t -z");
\r
1049 if(g_Git.Run(cmd,&vector))
\r
1054 list.ParserFromLsFile(vector);
\r