8 #include "UnicodeUtils.h"
11 int CGit::m_LogEncode
=CP_UTF8
;
14 static LPTSTR
nextpath(LPCTSTR src
, LPTSTR dst
, UINT maxlen
)
18 while (*src
== _T(';'))
26 while (*src
&& *src
!= _T(';'))
40 while (*src
&& *src
!= _T('"'))
55 while (*src
== _T(';'))
62 return (orgsrc
!= src
) ? (LPTSTR
)src
: NULL
;
65 static inline BOOL
FileExists(LPCTSTR lpszFileName
)
68 return _tstat(lpszFileName
, &st
) == 0;
71 static BOOL
FindGitPath()
74 _tgetenv_s(&size
, NULL
, 0, _T("PATH"));
81 TCHAR
*env
= (TCHAR
*)alloca(size
* sizeof(TCHAR
));
82 _tgetenv_s(&size
, env
, size
, _T("PATH"));
86 // search in all paths defined in PATH
87 while ((env
= nextpath(env
, buf
, _MAX_PATH
-1)) && *buf
)
89 TCHAR
*pfin
= buf
+ _tcslen(buf
)-1;
91 // ensure trailing slash
92 if (*pfin
!= _T('/') && *pfin
!= _T('\\'))
93 _tcscpy(++pfin
, _T("\\"));
95 const int len
= _tcslen(buf
);
97 if ((len
+ 7) < _MAX_PATH
)
98 _tcscpy(pfin
+1, _T("git.exe"));
102 if ( FileExists(buf
) )
106 CGit::ms_LastMsysGitDir
= buf
;
115 #define MAX_DIRBUFFER 1000
116 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
118 CString
CGit::ms_LastMsysGitDir
;
124 GetCurrentDirectory(MAX_DIRBUFFER
,m_CurrentDir
.GetBuffer(MAX_DIRBUFFER
));
125 m_CurrentDir
.ReleaseBuffer();
126 m_IsGitDllInited
= false;
128 this->m_bInitialized
=false;
130 m_critGitDllSec
.Init();
137 git_close_diff(m_GitDiff
);
142 static char g_Buffer
[4096];
144 int CGit::RunAsync(CString cmd
,PROCESS_INFORMATION
*piOut
,HANDLE
*hReadOut
,CString
*StdioFile
)
146 SECURITY_ATTRIBUTES sa
;
147 HANDLE hRead
, hWrite
;
148 HANDLE hStdioFile
= NULL
;
150 sa
.nLength
= sizeof(SECURITY_ATTRIBUTES
);
151 sa
.lpSecurityDescriptor
=NULL
;
152 sa
.bInheritHandle
=TRUE
;
153 if(!CreatePipe(&hRead
,&hWrite
,&sa
,0))
155 return GIT_ERROR_OPEN_PIP
;
160 hStdioFile
=CreateFile(*StdioFile
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
161 &sa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
165 PROCESS_INFORMATION pi
;
166 si
.cb
=sizeof(STARTUPINFO
);
171 si
.hStdOutput
=hStdioFile
;
173 si
.hStdOutput
=hWrite
;
175 si
.wShowWindow
=SW_HIDE
;
176 si
.dwFlags
=STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
178 LPTSTR pEnv
= m_Environment
.size()? &m_Environment
[0]: NULL
;
179 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
181 //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
182 dwFlags
|= DETACHED_PROCESS
| CREATE_NEW_PROCESS_GROUP
;
184 memset(&this->m_CurrentGitPi
,0,sizeof(PROCESS_INFORMATION
));
186 if(cmd
.Find(_T("git") == 0))
187 cmd
=CGit::ms_LastMsysGitDir
+_T("\\")+cmd
;
189 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
192 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
193 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
196 return GIT_ERROR_CREATE_PROCESS
;
210 //Must use sperate function to convert ANSI str to union code string
211 //Becuase A2W use stack as internal convert buffer.
212 void CGit::StringAppend(CString
*str
,BYTE
*p
,int code
,int length
)
215 //str->Append(A2W_CP((LPCSTR)p,code));
223 len
= strlen((const char*)p
);
228 //buf = new WCHAR[len*4 + 1];
229 buf
= str
->GetBuffer(len
*4+1+str
->GetLength())+str
->GetLength();
230 SecureZeroMemory(buf
, (len
*4 + 1)*sizeof(WCHAR
));
231 MultiByteToWideChar(code
, 0, (LPCSTR
)p
, len
, buf
, len
*4);
232 str
->ReleaseBuffer();
236 BOOL
CGit::IsInitRepos()
240 if(g_Git
.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout
,CP_UTF8
))
242 // CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
250 int CGit::Run(CGitCall
* pcall
)
252 PROCESS_INFORMATION pi
;
254 if(RunAsync(pcall
->GetCmd(),&pi
,&hRead
))
255 return GIT_ERROR_CREATE_PROCESS
;
258 BYTE data
[CALL_OUTPUT_READ_CHUNK_SIZE
];
260 while(ReadFile(hRead
,data
,CALL_OUTPUT_READ_CHUNK_SIZE
,&readnumber
,NULL
))
262 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
263 if(!bAborted
)//For now, flush output when command aborted.
264 if(pcall
->OnOutputData(data
,readnumber
))
271 CloseHandle(pi
.hThread
);
273 WaitForSingleObject(pi
.hProcess
, INFINITE
);
276 if(!GetExitCodeProcess(pi
.hProcess
,&exitcode
))
278 return GIT_ERROR_GET_EXIT_CODE
;
281 CloseHandle(pi
.hProcess
);
286 class CGitCall_ByteVector
: public CGitCall
289 CGitCall_ByteVector(CString cmd
,BYTE_VECTOR
* pvector
):CGitCall(cmd
),m_pvector(pvector
){}
290 virtual bool OnOutputData(const BYTE
* data
, size_t size
)
292 size_t oldsize
=m_pvector
->size();
293 m_pvector
->resize(m_pvector
->size()+size
);
294 memcpy(&*(m_pvector
->begin()+oldsize
),data
,size
);
297 BYTE_VECTOR
* m_pvector
;
300 int CGit::Run(CString cmd
,BYTE_VECTOR
*vector
)
302 CGitCall_ByteVector
call(cmd
,vector
);
305 int CGit::Run(CString cmd
, CString
* output
,int code
)
309 ret
=Run(cmd
,&vector
);
313 StringAppend(output
,&(vector
[0]),code
);
317 CString
CGit::GetUserName(void)
319 return GetConfigValue(L
"user.name");
321 CString
CGit::GetUserEmail(void)
323 return GetConfigValue(L
"user.email");
326 CString
CGit::GetConfigValue(CString name
)
330 cmd
.Format(L
"git.exe config %s", name
);
331 Run(cmd
,&configValue
,CP_UTF8
);
333 return configValue
.Tokenize(_T("\n"),start
);
337 CString
CGit::GetCurrentBranch(void)
340 //Run(_T("git.exe branch"),&branch);
342 int ret
=g_Git
.Run(_T("git.exe branch --no-color"),&output
,CP_UTF8
);
350 one
=output
.Tokenize(_T("\n"),pos
);
351 //list.push_back(one.Right(one.GetLength()-2));
352 if(one
[0] == _T('*'))
353 return one
.Right(one
.GetLength()-2);
359 CString
CGit::GetSymbolicRef(const wchar_t* symbolicRefName
, bool bStripRefsHeads
)
363 cmd
.Format(L
"git symbolic-ref %s", symbolicRefName
);
364 if(Run(cmd
, &refName
, CP_UTF8
) != 0)
365 return CString();//Error
367 refName
= refName
.Tokenize(L
"\n", iStart
);
369 refName
= StripRefName(refName
);
373 CString
CGit::GetFullRefName(CString shortRefName
)
377 cmd
.Format(L
"git rev-parse --symbolic-full-name %s", shortRefName
);
378 if(Run(cmd
, &refName
, CP_UTF8
) != 0)
379 return CString();//Error
381 return refName
.Tokenize(L
"\n", iStart
);
384 CString
CGit::StripRefName(CString refName
)
386 if(wcsncmp(refName
, L
"refs/heads/", 11) == 0)
387 refName
= refName
.Mid(11);
388 else if(wcsncmp(refName
, L
"refs/", 5) == 0)
389 refName
= refName
.Mid(5);
391 return refName
.Tokenize(_T("\n"),start
);
394 int CGit::GetCurrentBranchFromFile(const CString
&sProjectRoot
, CString
&sBranchOut
)
396 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
398 if ( sProjectRoot
.IsEmpty() )
401 CString sHeadFile
= sProjectRoot
+ _T("\\") + g_GitAdminDir
.GetAdminDirName() + _T("\\HEAD");
404 _tfopen_s(&pFile
, sHeadFile
.GetString(), _T("r"));
412 fgets(s
, sizeof(s
), pFile
);
416 const char *pfx
= "ref: refs/heads/";
417 const int len
= 16;//strlen(pfx)
419 if ( !strncmp(s
, pfx
, len
) )
421 //# We're on a branch. It might not exist. But
422 //# HEAD looks good enough to be a branch.
423 sBranchOut
= s
+ len
;
424 sBranchOut
.TrimRight(_T(" \r\n\t"));
426 if ( sBranchOut
.IsEmpty() )
431 //# Assume this is a detached head.
440 int CGit::BuildOutputFormat(CString
&format
,bool IsFull
)
443 log
.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN
);
447 log
.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME
);
449 log
.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL
);
451 log
.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE
);
453 log
.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME
);
455 log
.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL
);
457 log
.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE
);
459 log
.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY
);
463 log
.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH
);
465 log
.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT
);
467 log
.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT
);
472 log
.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE
);
478 int CGit::GetLog(BYTE_VECTOR
& logOut
, CString
&hash
, CTGitPath
*path
,int count
,int mask
,CString
*from
,CString
*to
)
480 CGitCall_ByteVector
gitCall(CString(),&logOut
);
481 return GetLog(&gitCall
,hash
,path
,count
,mask
,from
,to
);
484 CString
CGit::GetLogCmd( CString
&hash
, CTGitPath
*path
, int count
, int mask
,CString
*from
,CString
*to
,bool paramonly
)
494 file
.Format(_T(" -- \"%s\""),path
->GetGitPathString());
497 num
.Format(_T("-n%d"),count
);
501 if(mask
& LOG_INFO_STAT
)
502 param
+= _T(" --numstat ");
503 if(mask
& LOG_INFO_FILESTATE
)
504 param
+= _T(" --raw ");
506 if(mask
& LOG_INFO_FULLHISTORY
)
507 param
+= _T(" --full-history ");
509 if(mask
& LOG_INFO_BOUNDARY
)
510 param
+= _T(" --left-right --boundary ");
512 if(mask
& CGit::LOG_INFO_ALL_BRANCH
)
513 param
+= _T(" --all ");
515 if(mask
& CGit::LOG_INFO_DETECT_COPYRENAME
)
518 if(mask
& CGit::LOG_INFO_DETECT_RENAME
)
521 if(mask
& CGit::LOG_INFO_FIRST_PARENT
)
522 param
+= _T(" --first-parent ");
524 if(mask
& CGit::LOG_INFO_NO_MERGE
)
525 param
+= _T(" --no-merges ");
527 if(mask
& CGit::LOG_INFO_FOLLOW
)
528 param
+= _T(" --follow ");
530 if(mask
& CGit::LOG_INFO_SHOW_MERGEDFILE
)
533 if(mask
& CGit::LOG_INFO_FULL_DIFF
)
534 param
+= _T(" --full-diff ");
536 if(from
!= NULL
&& to
!= NULL
)
539 range
.Format(_T(" %s..%s "),*from
,*to
);
545 cmd
.Format(_T("%s -z --topo-order %s --parents "),
548 cmd
.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
551 BuildOutputFormat(log
,!(mask
&CGit::LOG_INFO_ONLY_HASH
));
555 cmd
+= _T("-- ")+file
;
559 cmd
+= CString(_T("\" -- "))+file
;
564 //int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path ,int count,int mask)
565 int CGit::GetLog(CGitCall
* pgitCall
, CString
&hash
, CTGitPath
*path
, int count
, int mask
,CString
*from
,CString
*to
)
567 pgitCall
->SetCmd( GetLogCmd(hash
,path
,count
,mask
,from
,to
) );
569 return Run(pgitCall
);
570 // return Run(cmd,&logOut);
574 void GetTempPath(CString
&path
)
576 TCHAR lpPathBuffer
[BUFSIZE
];
578 DWORD dwBufSize
=BUFSIZE
;
579 dwRetVal
= GetTempPath(dwBufSize
, // length of the buffer
580 lpPathBuffer
); // buffer for path
581 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
585 path
.Format(_T("%s"),lpPathBuffer
);
587 CString
GetTempFile()
589 TCHAR lpPathBuffer
[BUFSIZE
];
591 DWORD dwBufSize
=BUFSIZE
;
592 TCHAR szTempName
[BUFSIZE
];
595 dwRetVal
= GetTempPath(dwBufSize
, // length of the buffer
596 lpPathBuffer
); // buffer for path
597 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
601 // Create a temporary file.
602 uRetVal
= GetTempFileName(lpPathBuffer
, // directory for tmp files
603 TEXT("Patch"), // temp file name prefix
604 0, // create unique name
605 szTempName
); // buffer for name
613 return CString(szTempName
);
617 int CGit::RunLogFile(CString cmd
,CString
&filename
)
620 PROCESS_INFORMATION pi
;
621 si
.cb
=sizeof(STARTUPINFO
);
624 SECURITY_ATTRIBUTES psa
={sizeof(psa
),NULL
,TRUE
};;
625 psa
.bInheritHandle
=TRUE
;
627 HANDLE houtfile
=CreateFile(filename
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
628 &psa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
631 si
.wShowWindow
=SW_HIDE
;
632 si
.dwFlags
=STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
633 si
.hStdOutput
= houtfile
;
635 LPTSTR pEnv
= m_Environment
.size()? &m_Environment
[0]: NULL
;
636 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
638 if(cmd
.Find(_T("git") == 0))
639 cmd
=CGit::ms_LastMsysGitDir
+_T("\\")+cmd
;
641 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
644 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
645 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
648 return GIT_ERROR_CREATE_PROCESS
;
651 WaitForSingleObject(pi
.hProcess
,INFINITE
);
653 CloseHandle(pi
.hThread
);
654 CloseHandle(pi
.hProcess
);
655 CloseHandle(houtfile
);
660 git_revnum_t
CGit::GetHash(const CString
&friendname
)
664 cmd
.Format(_T("git.exe rev-parse %s" ),friendname
);
665 Run(cmd
,&out
,CP_UTF8
);
666 // int pos=out.ReverseFind(_T('\n'));
667 int pos
=out
.FindOneOf(_T("\r\n"));
669 return out
.Left(pos
);
673 int CGit::GetInitAddList(CTGitPathList
&outputlist
)
678 cmd
=_T("git.exe ls-files -s -t -z");
680 if(g_Git
.Run(cmd
,&cmdout
))
683 outputlist
.ParserFromLsFile(cmdout
);
684 for(int i
=0;i
<outputlist
.GetCount();i
++)
685 ((int)outputlist
[i
].m_Action
) = CTGitPath::LOGACTIONS_ADDED
;
689 int CGit::GetCommitDiffList(CString
&rev1
,CString
&rev2
,CTGitPathList
&outputlist
)
693 if(rev1
== GIT_REV_ZERO
|| rev2
== GIT_REV_ZERO
)
696 if(rev1
== GIT_REV_ZERO
)
697 cmd
.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2
);
699 cmd
.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1
);
702 cmd
.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2
,rev1
);
706 if(g_Git
.Run(cmd
,&out
))
709 outputlist
.ParserFromLog(out
);
713 int CGit::GetTagList(STRING_VECTOR
&list
)
717 cmd
=_T("git.exe tag -l");
719 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
727 one
=output
.Tokenize(_T("\n"),pos
);
734 int CGit::GetBranchList(STRING_VECTOR
&list
,int *current
,BRANCH_TYPE type
)
738 cmd
=_T("git.exe branch --no-color");
740 if(type
==(BRANCH_LOCAL
|BRANCH_REMOTE
))
742 else if(type
==BRANCH_REMOTE
)
746 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
753 one
=output
.Tokenize(_T("\n"),pos
);
754 one
.Trim(L
" \r\n\t");
755 if(one
.Find(L
" -> ") >= 0 || one
.IsEmpty())
756 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
757 if(one
[0] == _T('*'))
770 int CGit::GetRemoteList(STRING_VECTOR
&list
)
774 cmd
=_T("git.exe config --get-regexp \"^^remote[.].*[.]url\"");
775 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
782 one
=output
.Tokenize(_T("\n"),pos
);
783 int start
=one
.Find(_T("."),0);
787 url
=one
.Right(one
.GetLength()-start
-1);
789 one
=one
.Left(one
.Find(_T("."),0));
797 int CGit::GetRefList(STRING_VECTOR
&list
)
801 cmd
=_T("git show-ref -d");
802 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
809 one
=output
.Tokenize(_T("\n"),pos
);
810 int start
=one
.Find(_T(" "),0);
814 name
=one
.Right(one
.GetLength()-start
-1);
815 list
.push_back(name
);
821 int CGit::GetMapHashToFriendName(MAP_HASH_NAME
&map
)
825 cmd
=_T("git show-ref -d");
826 ret
=g_Git
.Run(cmd
,&output
,CP_UTF8
);
833 one
=output
.Tokenize(_T("\n"),pos
);
834 int start
=one
.Find(_T(" "),0);
838 name
=one
.Right(one
.GetLength()-start
-1);
841 hash
=one
.Left(start
);
843 map
[hash
].push_back(name
);
850 BOOL
CGit::CheckMsysGitDir()
857 this->m_Environment
.clear();
858 m_Environment
.CopyProcessEnvironment();
860 TCHAR
*oldpath
,*home
;
861 size_t homesize
,size
,httpsize
;
863 // set HOME if not set already
864 _tgetenv_s(&homesize
, NULL
, 0, _T("HOME"));
867 _tdupenv_s(&home
,&size
,_T("USERPROFILE"));
868 m_Environment
.SetEnv(_T("HOME"),home
);
874 _tgetenv_s(&httpsize
, NULL
, 0, _T("http_proxy"));
877 CString regServeraddress_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-host"), _T(""));
878 CString regServerport_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-port"), _T(""));
879 CString regUsername_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-username"), _T(""));
880 CString regPassword_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-password"), _T(""));
881 CString regTimeout_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-timeout"), _T(""));
882 CString regExceptions_copy
= CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-exceptions"), _T(""));
885 if(!regServeraddress_copy
.IsEmpty())
887 if(regServeraddress_copy
.Left(4) != _T("http"))
888 http_proxy
=_T("http://");
890 if(!regUsername_copy
.IsEmpty())
892 http_proxy
+= regUsername_copy
;
893 http_proxy
+= _T(":")+regPassword_copy
;
894 http_proxy
+= _T("@");
896 http_proxy
+=regServeraddress_copy
;
897 if(!regServerport_copy
.IsEmpty())
899 http_proxy
+=_T(":")+regServerport_copy
;
901 m_Environment
.SetEnv(_T("http_proxy"),(LPTSTR
)http_proxy
.GetBuffer());
905 CString sshclient
=CRegString(_T("Software\\TortoiseGit\\SSH"));
907 if(!sshclient
.IsEmpty())
909 m_Environment
.SetEnv(_T("GIT_SSH"),sshclient
.GetBuffer());
912 CString ssh
=sshclient
;
913 ssh
.Replace(_T("/"),_T("\\"));
914 ssh
.Replace(_T("\\"),_T("\\\\"));
915 ssh
=CString(_T("\""))+ssh
+_T('\"');
916 m_Environment
.SetEnv(_T("SVN_SSH"),ssh
.GetBuffer());
920 TCHAR sPlink
[MAX_PATH
];
921 GetModuleFileName(NULL
, sPlink
, _countof(sPlink
));
922 LPTSTR ptr
= _tcsrchr(sPlink
, _T('\\'));
924 _tcscpy(ptr
+ 1, _T("TortoisePlink.exe"));
925 m_Environment
.SetEnv(_T("GIT_SSH"), sPlink
);
929 ssh
.Replace(_T("/"),_T("\\"));
930 ssh
.Replace(_T("\\"),_T("\\\\"));
931 ssh
=CString(_T("\""))+ssh
+_T('\"');
932 m_Environment
.SetEnv(_T("SVN_SSH"),ssh
.GetBuffer());
937 TCHAR sAskPass
[MAX_PATH
];
938 GetModuleFileName(NULL
, sAskPass
, _countof(sAskPass
));
939 LPTSTR ptr
= _tcsrchr(sAskPass
, _T('\\'));
942 _tcscpy(ptr
+ 1, _T("SshAskPass.exe"));
943 m_Environment
.SetEnv(_T("DISPLAY"),_T(":9999"));
944 m_Environment
.SetEnv(_T("SSH_ASKPASS"),sAskPass
);
948 // add git/bin path to PATH
950 CRegString msysdir
=CRegString(REG_MSYSGIT_PATH
,_T(""),FALSE
);
954 CRegString msysinstalldir
=CRegString(REG_MSYSGIT_INSTALL
,_T(""),FALSE
,HKEY_LOCAL_MACHINE
);
956 if ( !str
.IsEmpty() )
958 str
+= (str
[str
.GetLength()-1] != '\\') ? "\\bin" : "bin";
960 CGit::ms_LastMsysGitDir
= str
;
965 // search PATH if git/bin directory is alredy present
968 m_bInitialized
= TRUE
;
976 CGit::ms_LastMsysGitDir
= str
;
980 _tdupenv_s(&oldpath
,&size
,_T("PATH"));
983 path
.Format(_T("%s;%s"),oldpath
,str
);
985 m_Environment
.SetEnv(_T("PATH"),path
.GetBuffer());
987 CString str1
= m_Environment
.GetEnv(_T("PATH"));
989 CString sOldPath
= oldpath
;
992 m_bInitialized
= TRUE
;
998 class CGitCall_EnumFiles
: public CGitCall
1001 CGitCall_EnumFiles(const TCHAR
*pszProjectPath
, const TCHAR
*pszSubPath
, unsigned int nFlags
, WGENUMFILECB
*pEnumCb
, void *pUserData
)
1002 : m_pszProjectPath(pszProjectPath
),
1003 m_pszSubPath(pszSubPath
),
1006 m_pUserData(pUserData
)
1010 typedef std::map
<CStringA
,char> TStrCharMap
;
1012 const TCHAR
* m_pszProjectPath
;
1013 const TCHAR
* m_pszSubPath
;
1014 unsigned int m_nFlags
;
1015 WGENUMFILECB
* m_pEnumCb
;
1018 BYTE_VECTOR m_DataCollector
;
1020 virtual bool OnOutputData(const BYTE
* data
, size_t size
)
1022 m_DataCollector
.append(data
,size
);
1025 // lines from igit.exe are 0 terminated
1026 int found
=m_DataCollector
.findData((const BYTE
*)"",1);
1029 OnSingleLine( (LPCSTR
)&*m_DataCollector
.begin() );
1030 m_DataCollector
.erase(m_DataCollector
.begin(), m_DataCollector
.begin()+found
+1);
1032 return false;//Should never reach this
1034 virtual void OnEnd()
1038 BYTE
HexChar(char ch
)
1040 if (ch
>= '0' && ch
<= '9')
1041 return (UINT
)(ch
- '0');
1042 else if (ch
>= 'A' && ch
<= 'F')
1043 return (UINT
)(ch
- 'A') + 10;
1044 else if (ch
>= 'a' && ch
<= 'f')
1045 return (UINT
)(ch
- 'a') + 10;
1050 bool OnSingleLine(LPCSTR line
)
1054 wgFile_s fileStatus
;
1058 fileStatus
.nFlags
= 0;
1060 fileStatus
.nFlags
|= WGFF_Directory
;
1061 else if (*line
!= 'F')
1068 fileStatus
.nStatus
= WGFS_Unknown
;
1071 case 'N': fileStatus
.nStatus
= WGFS_Normal
; break;
1072 case 'M': fileStatus
.nStatus
= WGFS_Modified
; break;
1073 case 'S': fileStatus
.nStatus
= WGFS_Staged
; break;
1074 case 'A': fileStatus
.nStatus
= WGFS_Added
; break;
1075 case 'C': fileStatus
.nStatus
= WGFS_Conflicted
; break;
1076 case 'D': fileStatus
.nStatus
= WGFS_Deleted
; break;
1077 case 'I': fileStatus
.nStatus
= WGFS_Ignored
; break;
1078 case 'U': fileStatus
.nStatus
= WGFS_Unversioned
; break;
1079 case 'E': fileStatus
.nStatus
= WGFS_Empty
; break;
1080 case '?': fileStatus
.nStatus
= WGFS_Unknown
; break;
1090 fileStatus
.sha1
= NULL
;
1091 if ( !(fileStatus
.nFlags
& WGFF_Directory
) )
1093 for (int i
=0; i
<20; i
++)
1095 sha1
[i
] = (HexChar(line
[0])<<4)&0xF0;
1096 sha1
[i
] |= HexChar(line
[1])&0xF;
1105 int len
= strlen(line
);
1106 if (len
&& len
< 2048)
1108 WCHAR
*buf
= (WCHAR
*)alloca((len
*4+2)*sizeof(WCHAR
));
1110 MultiByteToWideChar(CP_ACP
, 0, line
, len
+1, buf
, len
*4+1);
1111 fileStatus
.sFileName
= buf
;
1113 if (*buf
&& (*m_pEnumCb
)(&fileStatus
,m_pUserData
))
1121 BOOL
CGit::EnumFiles(const TCHAR
*pszProjectPath
, const TCHAR
*pszSubPath
, unsigned int nFlags
, WGENUMFILECB
*pEnumCb
, void *pUserData
)
1123 if(!pszProjectPath
|| *pszProjectPath
=='\0')
1126 CGitCall_EnumFiles
W_GitCall(pszProjectPath
,pszSubPath
,nFlags
,pEnumCb
,pUserData
);
1129 /* char W_szToDir[MAX_PATH];
1130 strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);
1131 if(W_szToDir[strlen(W_szToDir)-1]!='\\')
1132 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);
1134 SetCurrentDirectoryA(W_szToDir);
1135 GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);
1137 SetCurrentDir(pszProjectPath
);
1142 if (nFlags
& WGEFF_NoRecurse
) sMode
+= _T("r");
1143 if (nFlags
& WGEFF_FullPath
) sMode
+= _T("f");
1144 if (nFlags
& WGEFF_DirStatusDelta
) sMode
+= _T("d");
1145 if (nFlags
& WGEFF_DirStatusAll
) sMode
+= _T("D");
1146 if (nFlags
& WGEFF_EmptyAsNormal
) sMode
+= _T("e");
1147 if (nFlags
& WGEFF_SingleFile
) sMode
+= _T("s");
1154 // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least
1155 // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with
1156 // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just
1157 // use forward slashes for supplied project and sub paths
1159 CString sProjectPath
= pszProjectPath
;
1160 sProjectPath
.Replace(_T('\\'), _T('/'));
1164 CString sSubPath
= pszSubPath
;
1165 sSubPath
.Replace(_T('\\'), _T('/'));
1167 cmd
.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath
, sMode
, sSubPath
);
1171 cmd
.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath
, sMode
);
1174 //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");
1176 W_GitCall
.SetCmd(cmd
);
1177 // NOTE: should igit get added as a part of msysgit then use below line instead of the above one
1178 //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);
1180 if ( Run(&W_GitCall
) )
1186 BOOL
CGit::CheckCleanWorkTree()
1190 cmd
=_T("git.exe rev-parse --verify HEAD");
1192 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1195 cmd
=_T("git.exe update-index --ignore-submodules --refresh");
1196 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1199 cmd
=_T("git.exe diff-files --quiet --ignore-submodules");
1200 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1203 cmd
=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
1204 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1209 int CGit::Revert(CTGitPathList
&list
,bool keep
)
1212 for(int i
=0;i
<list
.GetCount();i
++)
1214 ret
= Revert((CTGitPath
&)list
[i
],keep
);
1220 int CGit::Revert(CTGitPath
&path
,bool keep
)
1223 if(path
.m_Action
& CTGitPath::LOGACTIONS_ADDED
)
1224 { //To init git repository, there are not HEAD, so we can use git reset command
1225 cmd
.Format(_T("git.exe rm --cached -- \"%s\""),path
.GetGitPathString());
1227 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1230 else if(path
.m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
1232 cmd
.Format(_T("git.exe mv -- \"%s\" \"%s\""),path
.GetGitPathString(),path
.GetGitOldPathString());
1233 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1236 cmd
.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path
.GetGitOldPathString());
1237 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1242 cmd
.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path
.GetGitPathString());
1243 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
1249 int CGit::ListConflictFile(CTGitPathList
&list
,CTGitPath
*path
)
1255 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path
->GetGitPathString());
1257 cmd
=_T("git.exe ls-files -u -t -z");
1259 if(g_Git
.Run(cmd
,&vector
))
1264 list
.ParserFromLsFile(vector
);
1269 bool CGit::IsFastForward(CString
&from
, CString
&to
)
1273 cmd
.Format(_T("git.exe merge-base %s %s"), to
,from
);
1275 if(g_Git
.Run(cmd
,&base
,CP_ACP
))
1277 //CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
1282 hash
=g_Git
.GetHash(from
);
1286 return hash
== base
;
1289 unsigned int CGit::Hash2int(CString
&hash
)
1292 for(int i
=0;i
<8;i
++)
1295 if(hash
[i
]>=_T('a'))
1296 ret
|= (hash
[i
]-_T('a')+10)&0xFF;
1297 else if(hash
[i
]>=_T('A'))
1298 ret
|= (hash
[i
]-_T('A')+10)&0xFF;
1300 ret
|= (hash
[i
]-_T('0'))&0xFF;
1306 int CGit::RefreshGitIndex()
1309 cmd
=_T("git.exe update-index --refresh");
1310 return Run(cmd
,&output
,CP_ACP
);
1313 void CEnvironment::CopyProcessEnvironment()
1315 TCHAR
*p
= GetEnvironmentStrings();
1316 while(*p
!=0 || *(p
+1) !=0)
1317 this->push_back(*p
++);
1319 push_back(_T('\0'));
1320 push_back(_T('\0'));
1323 CString
CEnvironment::GetEnv(TCHAR
*name
)
1326 for(int i
=0;i
<size();i
++)
1330 CString sname
= str
.Tokenize(_T("="),start
);
1331 if(sname
.CompareNoCase(name
) == 0)
1333 return &(*this)[i
+start
+1];
1340 void CEnvironment::SetEnv(TCHAR
*name
, TCHAR
* value
)
1343 for( i
=0;i
<size();i
++)
1345 CString str
= &(*this)[i
];
1347 CString sname
= str
.Tokenize(_T("="),start
);
1348 if(sname
.CompareNoCase(name
) == 0)
1357 i
-= 1; // roll back terminate \0\0
1358 this->push_back(_T('\0'));
1361 CEnvironment::iterator it
;
1365 while(*it
&& i
<size())
1374 this->insert(it
,*name
++);
1379 this->insert(it
, _T('='));
1385 this->insert(it
,*value
++);