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 //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
\r
176 dwFlags |= DETACHED_PROCESS;
\r
178 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
181 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
182 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
185 return GIT_ERROR_CREATE_PROCESS;
\r
188 CloseHandle(hWrite);
\r
197 //Must use sperate function to convert ANSI str to union code string
\r
198 //Becuase A2W use stack as internal convert buffer.
\r
199 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)
\r
202 //str->Append(A2W_CP((LPCSTR)p,code));
\r
210 len= strlen((const char*)p);
\r
215 //buf = new WCHAR[len*4 + 1];
\r
216 buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();
\r
217 SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));
\r
218 MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);
\r
219 str->ReleaseBuffer();
\r
220 //str->Append(buf);
\r
223 BOOL CGit::IsInitRepos()
\r
227 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))
\r
229 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
232 if(cmdout.IsEmpty())
\r
237 int CGit::Run(CGitCall* pcall)
\r
239 PROCESS_INFORMATION pi;
\r
241 if(RunAsync(pcall->GetCmd(),&pi,&hRead))
\r
242 return GIT_ERROR_CREATE_PROCESS;
\r
245 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
\r
246 bool bAborted=false;
\r
247 while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
\r
249 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
\r
250 if(!bAborted)//For now, flush output when command aborted.
\r
251 if(pcall->OnOutputData(data,readnumber))
\r
258 CloseHandle(pi.hThread);
\r
260 WaitForSingleObject(pi.hProcess, INFINITE);
\r
263 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
\r
265 return GIT_ERROR_GET_EXIT_CODE;
\r
268 CloseHandle(pi.hProcess);
\r
270 CloseHandle(hRead);
\r
273 class CGitCall_ByteVector : public CGitCall
\r
276 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}
\r
277 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
279 size_t oldsize=m_pvector->size();
\r
280 m_pvector->resize(m_pvector->size()+size);
\r
281 memcpy(&*(m_pvector->begin()+oldsize),data,size);
\r
284 BYTE_VECTOR* m_pvector;
\r
287 int CGit::Run(CString cmd,BYTE_VECTOR *vector)
\r
289 CGitCall_ByteVector call(cmd,vector);
\r
292 int CGit::Run(CString cmd, CString* output,int code)
\r
294 BYTE_VECTOR vector;
\r
296 ret=Run(cmd,&vector);
\r
298 vector.push_back(0);
\r
300 StringAppend(output,&(vector[0]),code);
\r
304 CString CGit::GetUserName(void)
\r
307 Run(_T("git.exe config user.name"),&UserName,CP_UTF8);
\r
309 return UserName.Tokenize(_T("\n"),start);
\r
311 CString CGit::GetUserEmail(void)
\r
314 Run(_T("git.exe config user.email"),&UserName,CP_UTF8);
\r
316 return UserName.Tokenize(_T("\n"),start);
\r
319 CString CGit::GetCurrentBranch(void)
\r
322 //Run(_T("git.exe branch"),&branch);
\r
324 int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);
\r
332 one=output.Tokenize(_T("\n"),pos);
\r
333 //list.push_back(one.Right(one.GetLength()-2));
\r
334 if(one[0] == _T('*'))
\r
335 return one.Right(one.GetLength()-2);
\r
338 return CString("");
\r
341 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)
\r
343 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
\r
345 if ( sProjectRoot.IsEmpty() )
\r
348 CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");
\r
351 _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));
\r
359 fgets(s, sizeof(s), pFile);
\r
363 const char *pfx = "ref: refs/heads/";
\r
364 const int len = 16;//strlen(pfx)
\r
366 if ( !strncmp(s, pfx, len) )
\r
368 //# We're on a branch. It might not exist. But
\r
369 //# HEAD looks good enough to be a branch.
\r
370 sBranchOut = s + len;
\r
371 sBranchOut.TrimRight(_T(" \r\n\t"));
\r
373 if ( sBranchOut.IsEmpty() )
\r
378 //# Assume this is a detached head.
\r
379 sBranchOut = "HEAD";
\r
387 int CGit::BuildOutputFormat(CString &format,bool IsFull)
\r
390 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
\r
394 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
\r
396 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
\r
398 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
\r
400 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
\r
402 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
\r
404 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
\r
406 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
\r
410 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
\r
412 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
\r
414 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
\r
419 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
\r
425 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash, CTGitPath *path ,int count,int mask,CString *from,CString *to)
\r
427 CGitCall_ByteVector gitCall(CString(),&logOut);
\r
428 return GetLog(&gitCall,hash,path,count,mask,from,to);
\r
431 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
\r
432 int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
\r
443 file.Format(_T(" -- \"%s\""),path->GetGitPathString());
\r
446 num.Format(_T("-n%d"),count);
\r
450 if(mask& LOG_INFO_STAT )
\r
451 param += _T(" --numstat ");
\r
452 if(mask& LOG_INFO_FILESTATE)
\r
453 param += _T(" --raw ");
\r
455 if(mask& LOG_INFO_FULLHISTORY)
\r
456 param += _T(" --full-history ");
\r
458 if(mask& LOG_INFO_BOUNDARY)
\r
459 param += _T(" --left-right --boundary ");
\r
461 if(mask& CGit::LOG_INFO_ALL_BRANCH)
\r
462 param += _T(" --all ");
\r
464 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
\r
465 param += _T(" -C ");
\r
467 if(mask& CGit::LOG_INFO_DETECT_RENAME )
\r
468 param += _T(" -M ");
\r
470 if(mask& CGit::LOG_INFO_FIRST_PARENT )
\r
471 param += _T(" --first-parent ");
\r
473 if(mask& CGit::LOG_INFO_NO_MERGE )
\r
474 param += _T(" --no-merges ");
\r
476 if(mask& CGit::LOG_INFO_FOLLOW)
\r
477 param += _T(" --follow ");
\r
479 if(from != NULL && to != NULL)
\r
482 range.Format(_T(" %s..%s "),*from,*to);
\r
487 cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
\r
490 BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
\r
493 cmd += CString(_T("\" "))+hash+file;
\r
495 pgitCall->SetCmd(cmd);
\r
497 return Run(pgitCall);
\r
498 // return Run(cmd,&logOut);
\r
502 int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)
\r
511 cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);
\r
512 BuildOutputFormat(log,false);
\r
513 cmd += log+_T("\"");
\r
515 cmd+= _T(" -- \"")+path->GetGitPathString()+_T("\"");
\r
516 //cmd += CString(_T("\" HEAD~40..HEAD"));
\r
517 return Run(cmd,&logOut);
\r
521 #define BUFSIZE 512
\r
522 void GetTempPath(CString &path)
\r
524 TCHAR lpPathBuffer[BUFSIZE];
\r
526 DWORD dwBufSize=BUFSIZE;
\r
527 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
528 lpPathBuffer); // buffer for path
\r
529 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
533 path.Format(_T("%s"),lpPathBuffer);
\r
535 CString GetTempFile()
\r
537 TCHAR lpPathBuffer[BUFSIZE];
\r
539 DWORD dwBufSize=BUFSIZE;
\r
540 TCHAR szTempName[BUFSIZE];
\r
543 dwRetVal = GetTempPath(dwBufSize, // length of the buffer
\r
544 lpPathBuffer); // buffer for path
\r
545 if (dwRetVal > dwBufSize || (dwRetVal == 0))
\r
549 // Create a temporary file.
\r
550 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
\r
551 TEXT("Patch"), // temp file name prefix
\r
552 0, // create unique name
\r
553 szTempName); // buffer for name
\r
561 return CString(szTempName);
\r
565 int CGit::RunLogFile(CString cmd,CString &filename)
\r
568 PROCESS_INFORMATION pi;
\r
569 si.cb=sizeof(STARTUPINFO);
\r
570 GetStartupInfo(&si);
\r
572 SECURITY_ATTRIBUTES psa={sizeof(psa),NULL,TRUE};;
\r
573 psa.bInheritHandle=TRUE;
\r
575 HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
\r
576 &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
\r
579 si.wShowWindow=SW_HIDE;
\r
580 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
\r
581 si.hStdOutput = houtfile;
\r
583 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
\r
586 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
\r
587 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
\r
590 return GIT_ERROR_CREATE_PROCESS;
\r
593 WaitForSingleObject(pi.hProcess,INFINITE);
\r
595 CloseHandle(pi.hThread);
\r
596 CloseHandle(pi.hProcess);
\r
597 CloseHandle(houtfile);
\r
598 return GIT_SUCCESS;
\r
602 git_revnum_t CGit::GetHash(CString &friendname)
\r
606 cmd.Format(_T("git.exe rev-parse %s" ),friendname);
\r
607 Run(cmd,&out,CP_UTF8);
\r
608 // int pos=out.ReverseFind(_T('\n'));
\r
609 int pos=out.FindOneOf(_T("\r\n"));
\r
611 return out.Left(pos);
\r
615 int CGit::GetTagList(STRING_VECTOR &list)
\r
618 CString cmd,output;
\r
619 cmd=_T("git.exe tag -l");
\r
621 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
629 one=output.Tokenize(_T("\n"),pos);
\r
630 list.push_back(one);
\r
636 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
\r
639 CString cmd,output;
\r
640 cmd=_T("git.exe branch");
\r
642 if(type==(BRANCH_LOCAL|BRANCH_REMOTE))
\r
644 else if(type==BRANCH_REMOTE)
\r
648 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
655 one=output.Tokenize(_T("\n"),pos);
\r
656 list.push_back(one.Right(one.GetLength()-2));
\r
657 if(one[0] == _T('*'))
\r
666 int CGit::GetRemoteList(STRING_VECTOR &list)
\r
669 CString cmd,output;
\r
670 cmd=_T("git.exe config --get-regexp remote.*.url");
\r
671 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
678 one=output.Tokenize(_T("\n"),pos);
\r
679 int start=one.Find(_T("."),0);
\r
683 url=one.Right(one.GetLength()-start-1);
\r
685 one=one.Left(one.Find(_T("."),0));
\r
686 list.push_back(one);
\r
693 int CGit::GetRefList(STRING_VECTOR &list)
\r
696 CString cmd,output;
\r
697 cmd=_T("git show-ref -d");
\r
698 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
705 one=output.Tokenize(_T("\n"),pos);
\r
706 int start=one.Find(_T(" "),0);
\r
710 name=one.Right(one.GetLength()-start-1);
\r
711 list.push_back(name);
\r
717 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
\r
720 CString cmd,output;
\r
721 cmd=_T("git show-ref -d");
\r
722 ret=g_Git.Run(cmd,&output,CP_UTF8);
\r
729 one=output.Tokenize(_T("\n"),pos);
\r
730 int start=one.Find(_T(" "),0);
\r
734 name=one.Right(one.GetLength()-start-1);
\r
737 hash=one.Left(start);
\r
739 map[hash].push_back(name);
\r
746 BOOL CGit::CheckMsysGitDir()
\r
748 static BOOL bInitialized = FALSE;
\r
755 TCHAR *oldpath,*home;
\r
758 // set HOME if not set already
\r
759 _tgetenv_s(&size, NULL, 0, _T("HOME"));
\r
762 _tdupenv_s(&home,&size,_T("USERPROFILE"));
\r
763 _tputenv_s(_T("HOME"),home);
\r
768 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
770 if(!sshclient.IsEmpty())
\r
772 _tputenv_s(_T("GIT_SSH"),sshclient);
\r
775 TCHAR sPlink[MAX_PATH];
\r
776 GetModuleFileName(NULL, sPlink, _countof(sPlink));
\r
777 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
\r
779 _tcscpy(ptr + 1, _T("TortoisePlink.exe"));
\r
780 _tputenv_s(_T("GIT_SSH"), sPlink);
\r
785 TCHAR sAskPass[MAX_PATH];
\r
786 GetModuleFileName(NULL, sAskPass, _countof(sAskPass));
\r
787 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
\r
790 _tcscpy(ptr + 1, _T("SshAskPass.exe"));
\r
791 _tputenv_s(_T("DISPLAY"),_T(":9999"));
\r
792 _tputenv_s(_T("SSH_ASKPASS"),sAskPass);
\r
795 // search PATH if git/bin directory is alredy present
\r
796 if ( FindGitPath() )
\r
798 bInitialized = TRUE;
\r
802 // add git/bin path to PATH
\r
804 CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
805 CString str=msysdir;
\r
808 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);
\r
809 str=msysinstalldir;
\r
810 if ( !str.IsEmpty() )
\r
812 str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";
\r
821 //CGit::m_MsysGitPath=str;
\r
825 _tdupenv_s(&oldpath,&size,_T("PATH"));
\r
828 path.Format(_T("%s;%s"),oldpath,str);
\r
830 _tputenv_s(_T("PATH"),path);
\r
832 CString sOldPath = oldpath;
\r
836 if( !FindGitPath() )
\r
842 #ifdef _TORTOISESHELL
\r
843 l_processEnv = GetEnvironmentStrings();
\r
844 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
\r
845 _tputenv_s(_T("PATH"),sOldPath);
\r
848 bInitialized = TRUE;
\r
854 class CGitCall_EnumFiles : public CGitCall
\r
857 CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
858 : m_pszProjectPath(pszProjectPath),
\r
859 m_pszSubPath(pszSubPath),
\r
861 m_pEnumCb(pEnumCb),
\r
862 m_pUserData(pUserData)
\r
866 typedef std::map<CStringA,char> TStrCharMap;
\r
868 const TCHAR * m_pszProjectPath;
\r
869 const TCHAR * m_pszSubPath;
\r
870 unsigned int m_nFlags;
\r
871 WGENUMFILECB * m_pEnumCb;
\r
872 void * m_pUserData;
\r
874 BYTE_VECTOR m_DataCollector;
\r
876 virtual bool OnOutputData(const BYTE* data, size_t size)
\r
878 m_DataCollector.append(data,size);
\r
881 // lines from igit.exe are 0 terminated
\r
882 int found=m_DataCollector.findData((const BYTE*)"",1);
\r
885 OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );
\r
886 m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);
\r
888 return false;//Should never reach this
\r
890 virtual void OnEnd()
\r
894 BYTE HexChar(char ch)
\r
896 if (ch >= '0' && ch <= '9')
\r
897 return (UINT)(ch - '0');
\r
898 else if (ch >= 'A' && ch <= 'F')
\r
899 return (UINT)(ch - 'A') + 10;
\r
900 else if (ch >= 'a' && ch <= 'f')
\r
901 return (UINT)(ch - 'a') + 10;
\r
906 bool OnSingleLine(LPCSTR line)
\r
908 //Parse single line
\r
910 wgFile_s fileStatus;
\r
914 fileStatus.nFlags = 0;
\r
916 fileStatus.nFlags |= WGFF_Directory;
\r
917 else if (*line != 'F')
\r
924 fileStatus.nStatus = WGFS_Unknown;
\r
927 case 'N': fileStatus.nStatus = WGFS_Normal; break;
\r
928 case 'M': fileStatus.nStatus = WGFS_Modified; break;
\r
929 case 'S': fileStatus.nStatus = WGFS_Staged; break;
\r
930 case 'A': fileStatus.nStatus = WGFS_Added; break;
\r
931 case 'C': fileStatus.nStatus = WGFS_Conflicted; break;
\r
932 case 'D': fileStatus.nStatus = WGFS_Deleted; break;
\r
933 case 'I': fileStatus.nStatus = WGFS_Ignored; break;
\r
934 case 'U': fileStatus.nStatus = WGFS_Unversioned; break;
\r
935 case 'E': fileStatus.nStatus = WGFS_Empty; break;
\r
936 case '?': fileStatus.nStatus = WGFS_Unknown; break;
\r
946 fileStatus.sha1 = NULL;
\r
947 if ( !(fileStatus.nFlags & WGFF_Directory) )
\r
949 for (int i=0; i<20; i++)
\r
951 sha1[i] = (HexChar(line[0])<<4)&0xF0;
\r
952 sha1[i] |= HexChar(line[1])&0xF;
\r
961 int len = strlen(line);
\r
962 if (len && len < 2048)
\r
964 WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));
\r
966 MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);
\r
967 fileStatus.sFileName = buf;
\r
969 if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))
\r
977 BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)
\r
979 if(!pszProjectPath || *pszProjectPath=='\0')
\r
982 CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);
\r
985 /* char W_szToDir[MAX_PATH];
\r
986 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
\r
987 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
\r
988 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
\r
990 SetCurrentDirectoryA(W_szToDir);
\r
991 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
\r
993 SetCurrentDir(pszProjectPath);
\r
998 if (nFlags & WGEFF_NoRecurse) sMode += _T("r");
\r
999 if (nFlags & WGEFF_FullPath) sMode += _T("f");
\r
1000 if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");
\r
1001 if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");
\r
1002 if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");
\r
1003 if (nFlags & WGEFF_SingleFile) sMode += _T("s");
\r
1011 cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath, sMode, pszSubPath);
\r
1013 cmd.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath, sMode);
\r
1015 W_GitCall.SetCmd(cmd);
\r
1016 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
\r
1017 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
\r
1019 if ( Run(&W_GitCall) )
\r
1025 BOOL CGit::CheckCleanWorkTree()
\r
1029 cmd=_T("git.exe rev-parse --verify HEAD");
\r
1031 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1034 cmd=_T("git.exe update-index --ignore-submodules --refresh");
\r
1035 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1038 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
\r
1039 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1042 cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
\r
1043 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1048 int CGit::Revert(CTGitPathList &list,bool keep)
\r
1051 for(int i=0;i<list.GetCount();i++)
\r
1053 ret = Revert((CTGitPath&)list[i],keep);
\r
1059 int CGit::Revert(CTGitPath &path,bool keep)
\r
1062 if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
1063 { //To init git repository, there are not HEAD, so we can use git reset command
\r
1064 cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());
\r
1065 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1068 else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )
\r
1070 cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
\r
1071 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1074 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());
\r
1075 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1080 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());
\r
1081 if(g_Git.Run(cmd,&out,CP_OEMCP))
\r
1087 int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
\r
1089 BYTE_VECTOR vector;
\r
1093 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
\r
1095 cmd=_T("git.exe ls-files -u -t -z");
\r
1097 if(g_Git.Run(cmd,&vector))
\r
1102 list.ParserFromLsFile(vector);
\r