8 #include "UnicodeUtils.h"
11 static LPTSTR
nextpath(LPCTSTR src
, LPTSTR dst
, UINT maxlen
)
15 while (*src
== _T(';'))
23 while (*src
&& *src
!= _T(';'))
37 while (*src
&& *src
!= _T('"'))
52 while (*src
== _T(';'))
59 return (orgsrc
!= src
) ? (LPTSTR
)src
: NULL
;
62 static inline BOOL
FileExists(LPCTSTR lpszFileName
)
65 return _tstat(lpszFileName
, &st
) == 0;
68 static BOOL
FindGitPath()
71 _tgetenv_s(&size
, NULL
, 0, _T("PATH"));
78 TCHAR
*env
= (TCHAR
*)alloca(size
* sizeof(TCHAR
));
79 _tgetenv_s(&size
, env
, size
, _T("PATH"));
83 // search in all paths defined in PATH
84 while ((env
= nextpath(env
, buf
, _MAX_PATH
-1)) && *buf
)
86 TCHAR
*pfin
= buf
+ _tcslen(buf
)-1;
88 // ensure trailing slash
89 if (*pfin
!= _T('/') && *pfin
!= _T('\\'))
90 _tcscpy(++pfin
, _T("\\"));
92 const int len
= _tcslen(buf
);
94 if ((len
+ 7) < _MAX_PATH
)
95 _tcscpy(pfin
+1, _T("git.exe"));
99 if ( FileExists(buf
) )
103 CGit::ms_LastMsysGitDir
= buf
;
112 #define MAX_DIRBUFFER 1000
113 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
115 CString
CGit::ms_LastMsysGitDir
;
118 // contains system environment that should be used by child processes (RunAsync)
119 // initialized by CheckMsysGitDir
120 static LPTSTR l_processEnv
= NULL
;
126 GetCurrentDirectory(MAX_DIRBUFFER
,m_CurrentDir
.GetBuffer(MAX_DIRBUFFER
));
127 m_CurrentDir
.ReleaseBuffer();
136 static char g_Buffer
[4096];
138 int CGit::RunAsync(CString cmd
,PROCESS_INFORMATION
*piOut
,HANDLE
*hReadOut
,CString
*StdioFile
)
140 SECURITY_ATTRIBUTES sa
;
141 HANDLE hRead
, hWrite
;
142 HANDLE hStdioFile
= NULL
;
144 sa
.nLength
= sizeof(SECURITY_ATTRIBUTES
);
145 sa
.lpSecurityDescriptor
=NULL
;
146 sa
.bInheritHandle
=TRUE
;
147 if(!CreatePipe(&hRead
,&hWrite
,&sa
,0))
149 return GIT_ERROR_OPEN_PIP
;
154 hStdioFile
=CreateFile(*StdioFile
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
155 &sa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
159 PROCESS_INFORMATION pi
;
160 si
.cb
=sizeof(STARTUPINFO
);
165 si
.hStdOutput
=hStdioFile
;
167 si
.hStdOutput
=hWrite
;
169 si
.wShowWindow
=SW_HIDE
;
170 si
.dwFlags
=STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
172 LPTSTR pEnv
= l_processEnv
;
173 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
175 //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
176 dwFlags
|= DETACHED_PROCESS
;
178 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
181 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
182 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
185 return GIT_ERROR_CREATE_PROCESS
;
197 //Must use sperate function to convert ANSI str to union code string
198 //Becuase A2W use stack as internal convert buffer.
199 void CGit::StringAppend(CString
*str
,BYTE
*p
,int code
,int length
)
202 //str->Append(A2W_CP((LPCSTR)p,code));
210 len
= strlen((const char*)p
);
215 //buf = new WCHAR[len*4 + 1];
216 buf
= str
->GetBuffer(len
*4+1+str
->GetLength())+str
->GetLength();
217 SecureZeroMemory(buf
, (len
*4 + 1)*sizeof(WCHAR
));
218 MultiByteToWideChar(code
, 0, (LPCSTR
)p
, len
, buf
, len
*4);
219 str
->ReleaseBuffer();
223 BOOL
CGit::IsInitRepos()
227 if(g_Git
.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout
,CP_UTF8
))
229 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
237 int CGit::Run(CGitCall
* pcall
)
239 PROCESS_INFORMATION pi
;
241 if(RunAsync(pcall
->GetCmd(),&pi
,&hRead
))
242 return GIT_ERROR_CREATE_PROCESS
;
245 BYTE data
[CALL_OUTPUT_READ_CHUNK_SIZE
];
247 while(ReadFile(hRead
,data
,CALL_OUTPUT_READ_CHUNK_SIZE
,&readnumber
,NULL
))
249 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
250 if(!bAborted
)//For now, flush output when command aborted.
251 if(pcall
->OnOutputData(data
,readnumber
))
258 CloseHandle(pi
.hThread
);
260 WaitForSingleObject(pi
.hProcess
, INFINITE
);
263 if(!GetExitCodeProcess(pi
.hProcess
,&exitcode
))
265 return GIT_ERROR_GET_EXIT_CODE
;
268 CloseHandle(pi
.hProcess
);
273 class CGitCall_ByteVector
: public CGitCall
276 CGitCall_ByteVector(CString cmd
,BYTE_VECTOR
* pvector
):CGitCall(cmd
),m_pvector(pvector
){}
277 virtual bool OnOutputData(const BYTE
* data
, size_t size
)
279 size_t oldsize
=m_pvector
->size();
280 m_pvector
->resize(m_pvector
->size()+size
);
281 memcpy(&*(m_pvector
->begin()+oldsize
),data
,size
);
284 BYTE_VECTOR
* m_pvector
;
287 int CGit::Run(CString cmd
,BYTE_VECTOR
*vector
)
289 CGitCall_ByteVector
call(cmd
,vector
);
292 int CGit::Run(CString cmd
, CString
* output
,int code
)
296 ret
=Run(cmd
,&vector
);
300 StringAppend(output
,&(vector
[0]),code
);
304 CString
CGit::GetUserName(void)
307 Run(_T("git.exe config user.name"),&UserName
,CP_UTF8
);
309 return UserName
.Tokenize(_T("\n"),start
);
311 CString
CGit::GetUserEmail(void)
314 Run(_T("git.exe config user.email"),&UserName
,CP_UTF8
);
316 return UserName
.Tokenize(_T("\n"),start
);
319 CString
CGit::GetCurrentBranch(void)
322 //Run(_T("git.exe branch"),&branch);
324 int ret
=g_Git
.Run(_T("git.exe branch"),&output
,CP_UTF8
);
332 one
=output
.Tokenize(_T("\n"),pos
);
333 //list.push_back(one.Right(one.GetLength()-2));
334 if(one
[0] == _T('*'))
335 return one
.Right(one
.GetLength()-2);
341 int CGit::GetCurrentBranchFromFile(const CString
&sProjectRoot
, CString
&sBranchOut
)
343 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
345 if ( sProjectRoot
.IsEmpty() )
348 CString sHeadFile
= sProjectRoot
+ _T("\\") + g_GitAdminDir
.GetAdminDirName() + _T("\\HEAD");
351 _tfopen_s(&pFile
, sHeadFile
.GetString(), _T("r"));
359 fgets(s
, sizeof(s
), pFile
);
363 const char *pfx
= "ref: refs/heads/";
364 const int len
= 16;//strlen(pfx)
366 if ( !strncmp(s
, pfx
, len
) )
368 //# We're on a branch. It might not exist. But
369 //# HEAD looks good enough to be a branch.
370 sBranchOut
= s
+ len
;
371 sBranchOut
.TrimRight(_T(" \r\n\t"));
373 if ( sBranchOut
.IsEmpty() )
378 //# Assume this is a detached head.
387 int CGit::BuildOutputFormat(CString
&format
,bool IsFull
)
390 log
.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN
);
394 log
.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME
);
396 log
.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL
);
398 log
.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE
);
400 log
.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME
);
402 log
.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL
);
404 log
.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE
);
406 log
.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY
);
410 log
.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH
);
412 log
.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT
);
414 log
.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT
);
419 log
.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE
);
425 int CGit::GetLog(BYTE_VECTOR
& logOut
, CString
&hash
, CTGitPath
*path
,int count
,int mask
,CString
*from
,CString
*to
)
427 CGitCall_ByteVector
gitCall(CString(),&logOut
);
428 return GetLog(&gitCall
,hash
,path
,count
,mask
,from
,to
);
431 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
432 int CGit::GetLog(CGitCall
* pgitCall
, CString
&hash
, CTGitPath
*path
, int count
, int mask
,CString
*from
,CString
*to
)
443 file
.Format(_T(" -- \"%s\""),path
->GetGitPathString());
446 num
.Format(_T("-n%d"),count
);
450 if(mask
& LOG_INFO_STAT
)
451 param
+= _T(" --numstat ");
452 if(mask
& LOG_INFO_FILESTATE
)
453 param
+= _T(" --raw ");
455 if(mask
& LOG_INFO_FULLHISTORY
)
456 param
+= _T(" --full-history ");
458 if(mask
& LOG_INFO_BOUNDARY
)
459 param
+= _T(" --left-right --boundary ");
461 if(mask
& CGit::LOG_INFO_ALL_BRANCH
)
462 param
+= _T(" --all ");
464 if(mask
& CGit::LOG_INFO_DETECT_COPYRENAME
)
467 if(mask
& CGit::LOG_INFO_DETECT_RENAME
)
470 if(mask
& CGit::LOG_INFO_FIRST_PARENT
)
471 param
+= _T(" --first-parent ");
473 if(mask
& CGit::LOG_INFO_NO_MERGE
)
474 param
+= _T(" --no-merges ");
476 if(mask
& CGit::LOG_INFO_FOLLOW
)
477 param
+= _T(" --follow ");
479 if(mask
& CGit::LOG_INFO_SHOW_MERGEDFILE
)
482 if(from
!= NULL
&& to
!= NULL
)
485 range
.Format(_T(" %s..%s "),*from
,*to
);
490 cmd
.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
493 BuildOutputFormat(log
,!(mask
&CGit::LOG_INFO_ONLY_HASH
));
496 cmd
+= CString(_T("\" "))+hash
+file
;
498 pgitCall
->SetCmd(cmd
);
500 return Run(pgitCall
);
501 // return Run(cmd,&logOut);
505 int CGit::GetShortLog(CString
&logOut
,CTGitPath
* path
, int count
)
514 cmd
.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n
);
515 BuildOutputFormat(log
,false);
518 cmd
+= _T(" -- \"")+path
->GetGitPathString()+_T("\"");
519 //cmd += CString(_T("\" HEAD~40..HEAD"));
520 return Run(cmd
,&logOut
);
525 void GetTempPath(CString
&path
)
527 TCHAR lpPathBuffer
[BUFSIZE
];
529 DWORD dwBufSize
=BUFSIZE
;
530 dwRetVal
= GetTempPath(dwBufSize
, // length of the buffer
531 lpPathBuffer
); // buffer for path
532 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
536 path
.Format(_T("%s"),lpPathBuffer
);
538 CString
GetTempFile()
540 TCHAR lpPathBuffer
[BUFSIZE
];
542 DWORD dwBufSize
=BUFSIZE
;
543 TCHAR szTempName
[BUFSIZE
];
546 dwRetVal
= GetTempPath(dwBufSize
, // length of the buffer
547 lpPathBuffer
); // buffer for path
548 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
552 // Create a temporary file.
553 uRetVal
= GetTempFileName(lpPathBuffer
, // directory for tmp files
554 TEXT("Patch"), // temp file name prefix
555 0, // create unique name
556 szTempName
); // buffer for name
564 return CString(szTempName
);
568 int CGit::RunLogFile(CString cmd
,CString
&filename
)
571 PROCESS_INFORMATION pi
;
572 si
.cb
=sizeof(STARTUPINFO
);
575 SECURITY_ATTRIBUTES psa
={sizeof(psa
),NULL
,TRUE
};;
576 psa
.bInheritHandle
=TRUE
;
578 HANDLE houtfile
=CreateFile(filename
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
579 &psa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
582 si
.wShowWindow
=SW_HIDE
;
583 si
.dwFlags
=STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
584 si
.hStdOutput
= houtfile
;
586 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,NULL
,NULL
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
589 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
590 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
593 return GIT_ERROR_CREATE_PROCESS
;
596 WaitForSingleObject(pi
.hProcess
,INFINITE
);
598 CloseHandle(pi
.hThread
);
599 CloseHandle(pi
.hProcess
);
600 CloseHandle(houtfile
);
605 git_revnum_t
CGit::GetHash(CString
&friendname
)
609 cmd
.Format(_T("git.exe rev-parse %s" ),friendname
);
610 Run(cmd
,&out
,CP_UTF8
);
611 // int pos=out.ReverseFind(_T('\n'));
612 int pos
=out
.FindOneOf(_T("\r\n"));
614 return out
.Left(pos
);
618 int CGit::GetTagList(STRING_VECTOR
&list
)
622 cmd
=_T("git.exe tag -l");
624 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
632 one
=output
.Tokenize(_T("\n"),pos
);
639 int CGit::GetBranchList(STRING_VECTOR
&list
,int *current
,BRANCH_TYPE type
)
643 cmd
=_T("git.exe branch");
645 if(type
==(BRANCH_LOCAL
|BRANCH_REMOTE
))
647 else if(type
==BRANCH_REMOTE
)
651 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
658 one
=output
.Tokenize(_T("\n"),pos
);
659 list
.push_back(one
.Right(one
.GetLength()-2));
660 if(one
[0] == _T('*'))
669 int CGit::GetRemoteList(STRING_VECTOR
&list
)
673 cmd
=_T("git.exe config --get-regexp remote.*.url");
674 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
681 one
=output
.Tokenize(_T("\n"),pos
);
682 int start
=one
.Find(_T("."),0);
686 url
=one
.Right(one
.GetLength()-start
-1);
688 one
=one
.Left(one
.Find(_T("."),0));
696 int CGit::GetRefList(STRING_VECTOR
&list
)
700 cmd
=_T("git show-ref -d");
701 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
708 one
=output
.Tokenize(_T("\n"),pos
);
709 int start
=one
.Find(_T(" "),0);
713 name
=one
.Right(one
.GetLength()-start
-1);
714 list
.push_back(name
);
720 int CGit::GetMapHashToFriendName(MAP_HASH_NAME
&map
)
724 cmd
=_T("git show-ref -d");
725 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
732 one
=output
.Tokenize(_T("\n"),pos
);
733 int start
=one
.Find(_T(" "),0);
737 name
=one
.Right(one
.GetLength()-start
-1);
740 hash
=one
.Left(start
);
742 map
[hash
].push_back(name
);
749 BOOL
CGit::CheckMsysGitDir()
751 static BOOL bInitialized
= FALSE
;
758 TCHAR
*oldpath
,*home
;
761 // set HOME if not set already
762 _tgetenv_s(&size
, NULL
, 0, _T("HOME"));
765 _tdupenv_s(&home
,&size
,_T("USERPROFILE"));
766 _tputenv_s(_T("HOME"),home
);
771 CString sshclient
=CRegString(_T("Software\\TortoiseGit\\SSH"));
773 if(!sshclient
.IsEmpty())
775 _tputenv_s(_T("GIT_SSH"),sshclient
);
778 TCHAR sPlink
[MAX_PATH
];
779 GetModuleFileName(NULL
, sPlink
, _countof(sPlink
));
780 LPTSTR ptr
= _tcsrchr(sPlink
, _T('\\'));
782 _tcscpy(ptr
+ 1, _T("TortoisePlink.exe"));
783 _tputenv_s(_T("GIT_SSH"), sPlink
);
788 TCHAR sAskPass
[MAX_PATH
];
789 GetModuleFileName(NULL
, sAskPass
, _countof(sAskPass
));
790 LPTSTR ptr
= _tcsrchr(sAskPass
, _T('\\'));
793 _tcscpy(ptr
+ 1, _T("SshAskPass.exe"));
794 _tputenv_s(_T("DISPLAY"),_T(":9999"));
795 _tputenv_s(_T("SSH_ASKPASS"),sAskPass
);
798 // search PATH if git/bin directory is alredy present
805 // add git/bin path to PATH
807 CRegString msysdir
=CRegString(REG_MSYSGIT_PATH
,_T(""),FALSE
);
811 CRegString msysinstalldir
=CRegString(REG_MSYSGIT_INSTALL
,_T(""),FALSE
,HKEY_LOCAL_MACHINE
);
813 if ( !str
.IsEmpty() )
815 str
+= (str
[str
.GetLength()-1] != '\\') ? "\\bin" : "bin";
824 //CGit::m_MsysGitPath=str;
828 _tdupenv_s(&oldpath
,&size
,_T("PATH"));
831 path
.Format(_T("%s;%s"),oldpath
,str
);
833 _tputenv_s(_T("PATH"),path
);
835 CString sOldPath
= oldpath
;
845 #ifdef _TORTOISESHELL
846 l_processEnv
= GetEnvironmentStrings();
847 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
848 _tputenv_s(_T("PATH"),sOldPath
);
857 class CGitCall_EnumFiles
: public CGitCall
860 CGitCall_EnumFiles(const TCHAR
*pszProjectPath
, const TCHAR
*pszSubPath
, unsigned int nFlags
, WGENUMFILECB
*pEnumCb
, void *pUserData
)
861 : m_pszProjectPath(pszProjectPath
),
862 m_pszSubPath(pszSubPath
),
865 m_pUserData(pUserData
)
869 typedef std::map
<CStringA
,char> TStrCharMap
;
871 const TCHAR
* m_pszProjectPath
;
872 const TCHAR
* m_pszSubPath
;
873 unsigned int m_nFlags
;
874 WGENUMFILECB
* m_pEnumCb
;
877 BYTE_VECTOR m_DataCollector
;
879 virtual bool OnOutputData(const BYTE
* data
, size_t size
)
881 m_DataCollector
.append(data
,size
);
884 // lines from igit.exe are 0 terminated
885 int found
=m_DataCollector
.findData((const BYTE
*)"",1);
888 OnSingleLine( (LPCSTR
)&*m_DataCollector
.begin() );
889 m_DataCollector
.erase(m_DataCollector
.begin(), m_DataCollector
.begin()+found
+1);
891 return false;//Should never reach this
897 BYTE
HexChar(char ch
)
899 if (ch
>= '0' && ch
<= '9')
900 return (UINT
)(ch
- '0');
901 else if (ch
>= 'A' && ch
<= 'F')
902 return (UINT
)(ch
- 'A') + 10;
903 else if (ch
>= 'a' && ch
<= 'f')
904 return (UINT
)(ch
- 'a') + 10;
909 bool OnSingleLine(LPCSTR line
)
917 fileStatus
.nFlags
= 0;
919 fileStatus
.nFlags
|= WGFF_Directory
;
920 else if (*line
!= 'F')
927 fileStatus
.nStatus
= WGFS_Unknown
;
930 case 'N': fileStatus
.nStatus
= WGFS_Normal
; break;
931 case 'M': fileStatus
.nStatus
= WGFS_Modified
; break;
932 case 'S': fileStatus
.nStatus
= WGFS_Staged
; break;
933 case 'A': fileStatus
.nStatus
= WGFS_Added
; break;
934 case 'C': fileStatus
.nStatus
= WGFS_Conflicted
; break;
935 case 'D': fileStatus
.nStatus
= WGFS_Deleted
; break;
936 case 'I': fileStatus
.nStatus
= WGFS_Ignored
; break;
937 case 'U': fileStatus
.nStatus
= WGFS_Unversioned
; break;
938 case 'E': fileStatus
.nStatus
= WGFS_Empty
; break;
939 case '?': fileStatus
.nStatus
= WGFS_Unknown
; break;
949 fileStatus
.sha1
= NULL
;
950 if ( !(fileStatus
.nFlags
& WGFF_Directory
) )
952 for (int i
=0; i
<20; i
++)
954 sha1
[i
] = (HexChar(line
[0])<<4)&0xF0;
955 sha1
[i
] |= HexChar(line
[1])&0xF;
964 int len
= strlen(line
);
965 if (len
&& len
< 2048)
967 WCHAR
*buf
= (WCHAR
*)alloca((len
*4+2)*sizeof(WCHAR
));
969 MultiByteToWideChar(CP_ACP
, 0, line
, len
+1, buf
, len
*4+1);
970 fileStatus
.sFileName
= buf
;
972 if (*buf
&& (*m_pEnumCb
)(&fileStatus
,m_pUserData
))
980 BOOL
CGit::EnumFiles(const TCHAR
*pszProjectPath
, const TCHAR
*pszSubPath
, unsigned int nFlags
, WGENUMFILECB
*pEnumCb
, void *pUserData
)
982 if(!pszProjectPath
|| *pszProjectPath
=='\0')
985 CGitCall_EnumFiles
W_GitCall(pszProjectPath
,pszSubPath
,nFlags
,pEnumCb
,pUserData
);
988 /* char W_szToDir[MAX_PATH];
989 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
990 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
991 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
993 SetCurrentDirectoryA(W_szToDir);
994 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
996 SetCurrentDir(pszProjectPath
);
1001 if (nFlags
& WGEFF_NoRecurse
) sMode
+= _T("r");
1002 if (nFlags
& WGEFF_FullPath
) sMode
+= _T("f");
1003 if (nFlags
& WGEFF_DirStatusDelta
) sMode
+= _T("d");
1004 if (nFlags
& WGEFF_DirStatusAll
) sMode
+= _T("D");
1005 if (nFlags
& WGEFF_EmptyAsNormal
) sMode
+= _T("e");
1006 if (nFlags
& WGEFF_SingleFile
) sMode
+= _T("s");
1014 cmd
.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath
, sMode
, pszSubPath
);
1016 cmd
.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath
, sMode
);
1018 W_GitCall
.SetCmd(cmd
);
1019 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
1020 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
1022 if ( Run(&W_GitCall
) )
1028 BOOL
CGit::CheckCleanWorkTree()
1032 cmd
=_T("git.exe rev-parse --verify HEAD");
1034 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1037 cmd
=_T("git.exe update-index --ignore-submodules --refresh");
1038 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1041 cmd
=_T("git.exe diff-files --quiet --ignore-submodules");
1042 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1045 cmd
=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
1046 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1051 int CGit::Revert(CTGitPathList
&list
,bool keep
)
1054 for(int i
=0;i
<list
.GetCount();i
++)
1056 ret
= Revert((CTGitPath
&)list
[i
],keep
);
1062 int CGit::Revert(CTGitPath
&path
,bool keep
)
1065 if(path
.m_Action
& CTGitPath::LOGACTIONS_ADDED
)
1066 { //To init git repository, there are not HEAD, so we can use git reset command
1067 cmd
.Format(_T("git.exe rm --cache -- \"%s\""),path
.GetGitPathString());
1068 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1071 else if(path
.m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
1073 cmd
.Format(_T("git.exe mv \"%s\" \"%s\""),path
.GetGitPathString(),path
.GetGitOldPathString());
1074 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1077 cmd
.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path
.GetGitOldPathString());
1078 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1083 cmd
.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path
.GetGitPathString());
1084 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1090 int CGit::ListConflictFile(CTGitPathList
&list
,CTGitPath
*path
)
1096 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path
->GetGitPathString());
1098 cmd
=_T("git.exe ls-files -u -t -z");
1100 if(g_Git
.Run(cmd
,&vector
))
1105 list
.ParserFromLsFile(vector
);