1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
25 #include "GitConfig.h"
27 #include "UnicodeUtils.h"
31 int CGit::m_LogEncode
=CP_UTF8
;
32 typedef CComCritSecLock
<CComCriticalSection
> CAutoLocker
;
34 static LPTSTR
nextpath(wchar_t *path
, wchar_t *buf
, size_t buflen
)
36 wchar_t term
, *base
= path
;
38 if (path
== NULL
|| buf
== NULL
|| buflen
== 0)
41 term
= (*path
== L
'"') ? *path
++ : L
';';
43 for (buflen
--; *path
&& *path
!= term
&& buflen
; buflen
--)
46 *buf
= L
'\0'; /* reserved a byte via initial subtract */
48 while (*path
== term
|| *path
== L
';')
51 return (path
!= base
) ? path
: NULL
;
54 static inline BOOL
FileExists(LPCTSTR lpszFileName
)
57 return _tstat(lpszFileName
, &st
) == 0;
60 static BOOL
FindGitPath()
63 _tgetenv_s(&size
, NULL
, 0, _T("PATH"));
70 TCHAR
*env
= (TCHAR
*)alloca(size
* sizeof(TCHAR
));
71 _tgetenv_s(&size
, env
, size
, _T("PATH"));
75 // search in all paths defined in PATH
76 while ((env
= nextpath(env
, buf
, MAX_PATH
- 1)) != NULL
&& *buf
)
78 TCHAR
*pfin
= buf
+ _tcslen(buf
)-1;
80 // ensure trailing slash
81 if (*pfin
!= _T('/') && *pfin
!= _T('\\'))
82 _tcscpy_s(++pfin
, 2, _T("\\")); // we have enough space left, MAX_PATH-1 is used in nextpath above
84 const size_t len
= _tcslen(buf
);
86 if ((len
+ 7) < MAX_PATH
)
87 _tcscpy_s(pfin
+ 1, MAX_PATH
- len
, _T("git.exe"));
91 if ( FileExists(buf
) )
95 CGit::ms_LastMsysGitDir
= buf
;
96 CGit::ms_LastMsysGitDir
.TrimRight(_T("\\"));
97 if (CGit::ms_LastMsysGitDir
.GetLength() > 4)
99 // often the msysgit\cmd folder is on the %PATH%, but
100 // that git.exe does not work, so try to guess the bin folder
101 CString binDir
= CGit::ms_LastMsysGitDir
.Mid(0, CGit::ms_LastMsysGitDir
.GetLength() - 4) + _T("\\bin\\git.exe");
102 if (FileExists(binDir
))
103 CGit::ms_LastMsysGitDir
= CGit::ms_LastMsysGitDir
.Mid(0, CGit::ms_LastMsysGitDir
.GetLength() - 4) + _T("\\bin");
112 static bool g_bSortLogical
;
113 static bool g_bSortLocalBranchesFirst
;
115 static void GetSortOptions()
117 g_bSortLogical
= !CRegDWORD(L
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_CURRENT_USER
);
119 g_bSortLogical
= !CRegDWORD(L
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_LOCAL_MACHINE
);
120 g_bSortLocalBranchesFirst
= !CRegDWORD(L
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoSortLocalBranchesFirst", 0, false, HKEY_CURRENT_USER
);
121 if (g_bSortLocalBranchesFirst
)
122 g_bSortLocalBranchesFirst
= !CRegDWORD(L
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoSortLocalBranchesFirst", 0, false, HKEY_LOCAL_MACHINE
);
125 static int LogicalComparePredicate(CString
&left
, CString
&right
)
128 return StrCmpLogicalW(left
, right
) < 0;
129 return StrCmpI(left
, right
) < 0;
132 static int LogicalCompareBranchesPredicate(CString
&left
, CString
&right
)
134 if (g_bSortLocalBranchesFirst
)
136 int leftIsRemote
= left
.Find(_T("remotes/"));
137 int rightIsRemote
= right
.Find(_T("remotes/"));
139 if (leftIsRemote
== 0 && rightIsRemote
< 0)
141 else if (leftIsRemote
< 0 && rightIsRemote
== 0)
145 return StrCmpLogicalW(left
, right
) < 0;
146 return StrCmpI(left
, right
) < 0;
149 #define MAX_DIRBUFFER 1000
150 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
152 CString
CGit::ms_LastMsysGitDir
;
158 GetCurrentDirectory(MAX_DIRBUFFER
,m_CurrentDir
.GetBuffer(MAX_DIRBUFFER
));
159 m_CurrentDir
.ReleaseBuffer();
160 m_IsGitDllInited
= false;
162 m_GitSimpleListDiff
=0;
163 m_IsUseGitDLL
= !!CRegDWORD(_T("Software\\TortoiseGit\\UsingGitDLL"),1);
164 m_IsUseLibGit2
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE
);
165 m_IsUseLibGit2_mask
= CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2_mask"), 0);
168 this->m_bInitialized
=false;
170 m_critGitDllSec
.Init();
177 git_close_diff(m_GitDiff
);
180 if(this->m_GitSimpleListDiff
)
182 git_close_diff(m_GitSimpleListDiff
);
183 m_GitSimpleListDiff
=0;
187 bool CGit::IsBranchNameValid(CString branchname
)
189 CStringA branchA
= CUnicodeUtils::GetUTF8(_T("refs/heads/") + branchname
);
190 return !!git_reference_is_valid_name(branchA
);
193 static char g_Buffer
[4096];
195 int CGit::RunAsync(CString cmd
, PROCESS_INFORMATION
*piOut
, HANDLE
*hReadOut
, HANDLE
*hErrReadOut
, CString
*StdioFile
)
197 SECURITY_ATTRIBUTES sa
;
198 HANDLE hRead
, hWrite
, hReadErr
= NULL
, hWriteErr
= NULL
;
199 HANDLE hStdioFile
= NULL
;
201 sa
.nLength
= sizeof(SECURITY_ATTRIBUTES
);
202 sa
.lpSecurityDescriptor
=NULL
;
203 sa
.bInheritHandle
=TRUE
;
204 if(!CreatePipe(&hRead
,&hWrite
,&sa
,0))
206 return TGIT_GIT_ERROR_OPEN_PIP
;
208 if (hErrReadOut
&& !CreatePipe(&hReadErr
, &hWriteErr
, &sa
, 0))
209 return TGIT_GIT_ERROR_OPEN_PIP
;
213 hStdioFile
=CreateFile(*StdioFile
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
214 &sa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
218 PROCESS_INFORMATION pi
;
219 si
.cb
=sizeof(STARTUPINFO
);
223 si
.hStdError
= hWriteErr
;
225 si
.hStdError
= hWrite
;
227 si
.hStdOutput
=hStdioFile
;
229 si
.hStdOutput
=hWrite
;
231 si
.wShowWindow
=SW_HIDE
;
232 si
.dwFlags
=STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
234 LPTSTR pEnv
= (!m_Environment
.empty()) ? &m_Environment
[0]: NULL
;
235 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
237 //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
238 dwFlags
|= DETACHED_PROCESS
| CREATE_NEW_PROCESS_GROUP
;
240 memset(&this->m_CurrentGitPi
,0,sizeof(PROCESS_INFORMATION
));
241 memset(&pi
, 0, sizeof(PROCESS_INFORMATION
));
243 if(cmd
.Find(_T("git")) == 0)
245 int firstSpace
= cmd
.Find(_T(" "));
247 cmd
= _T('"')+CGit::ms_LastMsysGitDir
+_T("\\")+ cmd
.Left(firstSpace
) + _T('"')+ cmd
.Mid(firstSpace
);
249 cmd
=_T('"')+CGit::ms_LastMsysGitDir
+_T("\\")+cmd
+_T('"');
252 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
255 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
| FORMAT_MESSAGE_FROM_SYSTEM
,
256 NULL
,GetLastError(), MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
259 return TGIT_GIT_ERROR_CREATE_PROCESS
;
266 CloseHandle(hWriteErr
);
272 *hErrReadOut
= hReadErr
;
276 //Must use sperate function to convert ANSI str to union code string
277 //Becuase A2W use stack as internal convert buffer.
278 void CGit::StringAppend(CString
*str
,BYTE
*p
,int code
,int length
)
281 //str->Append(A2W_CP((LPCSTR)p,code));
289 len
= (int)strlen((const char*)p
);
294 //buf = new WCHAR[len*4 + 1];
295 buf
= str
->GetBuffer(len
*4+1+str
->GetLength())+str
->GetLength();
296 SecureZeroMemory(buf
, (len
*4 + 1)*sizeof(WCHAR
));
297 MultiByteToWideChar(code
, 0, (LPCSTR
)p
, len
, buf
, len
*4);
298 str
->ReleaseBuffer();
303 // This method was originally used to check for orphaned branches
304 BOOL
CGit::CanParseRev(CString ref
)
310 if (Run(_T("git.exe rev-parse --revs-only ") + ref
, &cmdout
, CP_UTF8
))
320 // Checks if we have an orphaned HEAD
321 BOOL
CGit::IsInitRepos()
324 // handle error on reading HEAD hash as init repo
325 if (GetHash(hash
, _T("HEAD")) != 0)
327 return hash
.IsEmpty() ? TRUE
: FALSE
;
330 DWORD WINAPI
CGit::AsyncReadStdErrThread(LPVOID lpParam
)
332 PASYNCREADSTDERRTHREADARGS pDataArray
;
333 pDataArray
= (PASYNCREADSTDERRTHREADARGS
)lpParam
;
336 BYTE data
[CALL_OUTPUT_READ_CHUNK_SIZE
];
337 while (ReadFile(pDataArray
->fileHandle
, data
, CALL_OUTPUT_READ_CHUNK_SIZE
, &readnumber
, NULL
))
339 if (pDataArray
->pcall
->OnOutputErrData(data
,readnumber
))
346 int CGit::Run(CGitCall
* pcall
)
348 PROCESS_INFORMATION pi
;
349 HANDLE hRead
, hReadErr
;
350 if(RunAsync(pcall
->GetCmd(),&pi
,&hRead
, &hReadErr
))
351 return TGIT_GIT_ERROR_CREATE_PROCESS
;
354 ASYNCREADSTDERRTHREADARGS threadArguments
;
355 threadArguments
.fileHandle
= hReadErr
;
356 threadArguments
.pcall
= pcall
;
357 thread
= CreateThread(NULL
, 0, AsyncReadStdErrThread
, &threadArguments
, 0, NULL
);
360 BYTE data
[CALL_OUTPUT_READ_CHUNK_SIZE
];
362 while(ReadFile(hRead
,data
,CALL_OUTPUT_READ_CHUNK_SIZE
,&readnumber
,NULL
))
364 // TODO: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
365 if(!bAborted
)//For now, flush output when command aborted.
366 if(pcall
->OnOutputData(data
,readnumber
))
373 WaitForSingleObject(thread
, INFINITE
);
375 CloseHandle(pi
.hThread
);
377 WaitForSingleObject(pi
.hProcess
, INFINITE
);
380 if(!GetExitCodeProcess(pi
.hProcess
,&exitcode
))
382 return TGIT_GIT_ERROR_GET_EXIT_CODE
;
385 CloseHandle(pi
.hProcess
);
388 CloseHandle(hReadErr
);
391 class CGitCall_ByteVector
: public CGitCall
394 CGitCall_ByteVector(CString cmd
,BYTE_VECTOR
* pvector
, BYTE_VECTOR
* pvectorErr
= NULL
):CGitCall(cmd
),m_pvector(pvector
),m_pvectorErr(pvectorErr
){}
395 virtual bool OnOutputData(const BYTE
* data
, size_t size
)
399 size_t oldsize
=m_pvector
->size();
400 m_pvector
->resize(m_pvector
->size()+size
);
401 memcpy(&*(m_pvector
->begin()+oldsize
),data
,size
);
404 virtual bool OnOutputErrData(const BYTE
* data
, size_t size
)
406 if (!m_pvectorErr
|| size
== 0)
408 size_t oldsize
= m_pvectorErr
->size();
409 m_pvectorErr
->resize(m_pvectorErr
->size() + size
);
410 memcpy(&*(m_pvectorErr
->begin() + oldsize
), data
, size
);
413 BYTE_VECTOR
* m_pvector
;
414 BYTE_VECTOR
* m_pvectorErr
;
417 int CGit::Run(CString cmd
,BYTE_VECTOR
*vector
, BYTE_VECTOR
*vectorErr
)
419 CGitCall_ByteVector
call(cmd
, vector
, vectorErr
);
422 int CGit::Run(CString cmd
, CString
* output
, int code
)
426 ret
= Run(cmd
, output
, &err
, code
);
428 if (output
&& !err
.IsEmpty())
430 if (!output
->IsEmpty())
437 int CGit::Run(CString cmd
, CString
* output
, CString
* outputErr
, int code
)
439 BYTE_VECTOR vector
, vectorErr
;
442 ret
= Run(cmd
, &vector
, &vectorErr
);
444 ret
= Run(cmd
, &vector
);
447 StringAppend(output
, &(vector
[0]), code
);
451 vectorErr
.push_back(0);
452 StringAppend(outputErr
, &(vectorErr
[0]), code
);
458 CString
CGit::GetUserName(void)
461 env
.CopyProcessEnvironment();
462 CString envname
= env
.GetEnv(_T("GIT_AUTHOR_NAME"));
463 if (!envname
.IsEmpty())
465 return GetConfigValue(L
"user.name", this->GetGitEncode(L
"i18n.commitencoding"));
467 CString
CGit::GetUserEmail(void)
470 env
.CopyProcessEnvironment();
471 CString envmail
= env
.GetEnv(_T("GIT_AUTHOR_EMAIL"));
472 if (!envmail
.IsEmpty())
475 return GetConfigValue(L
"user.email");
478 CString
CGit::GetConfigValue(CString name
,int encoding
, CString
*GitPath
, BOOL RemoveCR
)
482 if(this->m_IsUseGitDLL
)
484 CString
*git_path
=NULL
;
486 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
499 key
= CUnicodeUtils::GetMulti(name
, encoding
);
502 p
= CUnicodeUtils::GetMulti(*GitPath
, CP_UTF8
);
504 if(git_get_config(key
.GetBuffer(), value
.GetBufferSetLength(4096), 4096, p
.GetBuffer()))
508 StringAppend(&configValue
,(BYTE
*)value
.GetBuffer(),encoding
);
510 return configValue
.Tokenize(_T("\n"),start
);
518 cmd
.Format(L
"git.exe config %s", name
);
519 Run(cmd
, &configValue
, NULL
, encoding
);
521 return configValue
.Tokenize(_T("\n"),start
);
526 int CGit::SetConfigValue(CString key
, CString value
, CONFIG_TYPE type
, int encoding
, CString
*GitPath
)
528 if(this->m_IsUseGitDLL
)
530 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
539 CStringA keya
, valuea
;
540 keya
= CUnicodeUtils::GetMulti(key
, CP_UTF8
);
541 valuea
= CUnicodeUtils::GetMulti(value
, encoding
);
544 p
= CUnicodeUtils::GetMulti(*GitPath
, CP_UTF8
);
546 return get_set_config(keya
.GetBuffer(), valuea
.GetBuffer(), type
, p
.GetBuffer());
556 option
= _T("--global");
559 option
= _T("--system");
564 cmd
.Format(_T("git.exe config %s %s \"%s\""), option
, key
, value
);
566 if (Run(cmd
, &out
, NULL
, encoding
))
574 int CGit::UnsetConfigValue(CString key
, CONFIG_TYPE type
, int encoding
, CString
*GitPath
)
576 if(this->m_IsUseGitDLL
)
578 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
587 keya
= CUnicodeUtils::GetMulti(key
, CP_UTF8
);
590 p
=CUnicodeUtils::GetMulti(*GitPath
,CP_ACP
);
592 return get_set_config(keya
.GetBuffer(), NULL
, type
, p
.GetBuffer());
601 option
= _T("--global");
604 option
= _T("--system");
609 cmd
.Format(_T("git.exe config %s --unset %s"), option
, key
);
611 if (Run(cmd
, &out
, NULL
, encoding
))
619 CString
CGit::GetCurrentBranch(void)
622 //Run(_T("git.exe branch"),&branch);
624 if(this->GetCurrentBranchFromFile(this->m_CurrentDir
,output
))
626 return _T("(no branch)");
633 CString
CGit::GetSymbolicRef(const wchar_t* symbolicRefName
, bool bStripRefsHeads
)
636 if(this->m_IsUseGitDLL
)
638 unsigned char sha1
[20];
641 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
642 const char *refs_heads_master
= git_resolve_ref(CUnicodeUtils::GetUTF8(CString(symbolicRefName
)), sha1
, 0, &flag
);
643 if(refs_heads_master
&& (flag
&REF_ISSYMREF
))
645 StringAppend(&refName
,(BYTE
*)refs_heads_master
);
647 refName
= StripRefName(refName
);
654 cmd
.Format(L
"git symbolic-ref %s", symbolicRefName
);
655 if (Run(cmd
, &refName
, NULL
, CP_UTF8
) != 0)
656 return CString();//Error
658 refName
= refName
.Tokenize(L
"\n", iStart
);
660 refName
= StripRefName(refName
);
665 CString
CGit::GetFullRefName(CString shortRefName
)
669 cmd
.Format(L
"git rev-parse --symbolic-full-name %s", shortRefName
);
670 if (Run(cmd
, &refName
, NULL
, CP_UTF8
) != 0)
671 return CString();//Error
673 return refName
.Tokenize(L
"\n", iStart
);
676 CString
CGit::StripRefName(CString refName
)
678 if(wcsncmp(refName
, L
"refs/heads/", 11) == 0)
679 refName
= refName
.Mid(11);
680 else if(wcsncmp(refName
, L
"refs/", 5) == 0)
681 refName
= refName
.Mid(5);
683 return refName
.Tokenize(_T("\n"),start
);
686 int CGit::GetCurrentBranchFromFile(const CString
&sProjectRoot
, CString
&sBranchOut
)
688 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
690 if ( sProjectRoot
.IsEmpty() )
694 if (!g_GitAdminDir
.GetAdminDirPath(sProjectRoot
, sDotGitPath
))
697 CString sHeadFile
= sDotGitPath
+ _T("HEAD");
700 _tfopen_s(&pFile
, sHeadFile
.GetString(), _T("r"));
708 fgets(s
, sizeof(s
), pFile
);
712 const char *pfx
= "ref: refs/heads/";
713 const int len
= 16;//strlen(pfx)
715 if ( !strncmp(s
, pfx
, len
) )
717 //# We're on a branch. It might not exist. But
718 //# HEAD looks good enough to be a branch.
719 CStringA
utf8Branch(s
+ len
);
720 sBranchOut
= CUnicodeUtils::GetUnicode(utf8Branch
);
721 sBranchOut
.TrimRight(_T(" \r\n\t"));
723 if ( sBranchOut
.IsEmpty() )
728 //# Assume this is a detached head.
737 int CGit::BuildOutputFormat(CString
&format
,bool IsFull
)
740 log
.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN
);
744 log
.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME
);
746 log
.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL
);
748 log
.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE
);
750 log
.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME
);
752 log
.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL
);
754 log
.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE
);
756 log
.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY
);
760 log
.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH
);
762 log
.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT
);
764 log
.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT
);
769 log
.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE
);
775 CString
CGit::GetLogCmd(CString
&range
, CTGitPath
*path
, int count
, int mask
, bool paramonly
,
785 file
.Format(_T(" -- \"%s\""),path
->GetGitPathString());
788 num
.Format(_T("-n%d"),count
);
792 if(mask
& LOG_INFO_STAT
)
793 param
+= _T(" --numstat ");
794 if(mask
& LOG_INFO_FILESTATE
)
795 param
+= _T(" --raw ");
797 if(mask
& LOG_INFO_FULLHISTORY
)
798 param
+= _T(" --full-history ");
800 if(mask
& LOG_INFO_BOUNDARY
)
801 param
+= _T(" --left-right --boundary ");
803 if(mask
& CGit::LOG_INFO_ALL_BRANCH
)
804 param
+= _T(" --all ");
806 if(mask
& CGit::LOG_INFO_DETECT_COPYRENAME
)
809 if(mask
& CGit::LOG_INFO_DETECT_RENAME
)
812 if(mask
& CGit::LOG_INFO_FIRST_PARENT
)
813 param
+= _T(" --first-parent ");
815 if(mask
& CGit::LOG_INFO_NO_MERGE
)
816 param
+= _T(" --no-merges ");
818 if(mask
& CGit::LOG_INFO_FOLLOW
)
819 param
+= _T(" --follow ");
821 if(mask
& CGit::LOG_INFO_SHOW_MERGEDFILE
)
824 if(mask
& CGit::LOG_INFO_FULL_DIFF
)
825 param
+= _T(" --full-diff ");
827 if(mask
& CGit::LOG_INFO_SIMPILFY_BY_DECORATION
)
828 param
+= _T(" --simplify-by-decoration ");
834 if( Filter
&& (Filter
->m_From
!= -1))
836 st1
.Format(_T(" --max-age=%I64u "), Filter
->m_From
);
840 if( Filter
&& (Filter
->m_To
!= -1))
842 st2
.Format(_T(" --min-age=%I64u "), Filter
->m_To
);
847 if( Filter
&& (!Filter
->m_Author
.IsEmpty()))
849 st1
.Format(_T(" --author=\"%s\"" ),Filter
->m_Author
);
854 if( Filter
&& (!Filter
->m_Committer
.IsEmpty()))
856 st1
.Format(_T(" --committer=\"%s\"" ),Filter
->m_Author
);
861 if( Filter
&& (!Filter
->m_MessageFilter
.IsEmpty()))
863 st1
.Format(_T(" --grep=\"%s\"" ),Filter
->m_MessageFilter
);
870 if(!Filter
->m_IsRegex
)
871 param
+= _T(" --fixed-strings ");
873 param
+= _T(" --regexp-ignore-case --extended-regexp ");
876 DWORD logOrderBy
= CRegDWORD(_T("Software\\TortoiseGit\\LogOrderBy"), LOG_ORDER_TOPOORDER
);
877 if (logOrderBy
== LOG_ORDER_TOPOORDER
)
878 param
+= _T(" --topo-order");
879 else if (logOrderBy
== LOG_ORDER_DATEORDER
)
880 param
+= _T(" --date-order");
882 if(paramonly
) //tgit.dll.Git.cpp:setup_revisions() only looks at args[1] and greater. To account for this, pass a dummy parameter in the 0th place
883 cmd
.Format(_T("--ignore-this-parameter %s -z %s --parents "), num
, param
);
887 BuildOutputFormat(log
,!(mask
&CGit::LOG_INFO_ONLY_HASH
));
888 cmd
.Format(_T("git.exe log %s -z %s --parents --pretty=format:\"%s\""),
897 void GetTempPath(CString
&path
)
899 TCHAR lpPathBuffer
[BUFSIZE
];
901 DWORD dwBufSize
=BUFSIZE
;
902 dwRetVal
= GetTortoiseGitTempPath(dwBufSize
, // length of the buffer
903 lpPathBuffer
); // buffer for path
904 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
908 path
.Format(_T("%s"),lpPathBuffer
);
910 CString
GetTempFile()
912 TCHAR lpPathBuffer
[BUFSIZE
];
914 DWORD dwBufSize
=BUFSIZE
;
915 TCHAR szTempName
[BUFSIZE
];
918 dwRetVal
= GetTortoiseGitTempPath(dwBufSize
, // length of the buffer
919 lpPathBuffer
); // buffer for path
920 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
924 // Create a temporary file.
925 uRetVal
= GetTempFileName(lpPathBuffer
, // directory for tmp files
926 TEXT("Patch"), // temp file name prefix
927 0, // create unique name
928 szTempName
); // buffer for name
936 return CString(szTempName
);
940 DWORD
GetTortoiseGitTempPath(DWORD nBufferLength
, LPTSTR lpBuffer
)
942 DWORD result
= ::GetTempPath(nBufferLength
, lpBuffer
);
943 if (result
== 0) return 0;
944 if (lpBuffer
== NULL
|| (result
+ 13 > nBufferLength
))
951 _tcscat_s(lpBuffer
, nBufferLength
, _T("TortoiseGit\\"));
952 CreateDirectory(lpBuffer
, NULL
);
957 int CGit::RunLogFile(CString cmd
,const CString
&filename
)
960 PROCESS_INFORMATION pi
;
961 si
.cb
=sizeof(STARTUPINFO
);
964 SECURITY_ATTRIBUTES psa
={sizeof(psa
),NULL
,TRUE
};;
965 psa
.bInheritHandle
=TRUE
;
967 HANDLE houtfile
=CreateFile(filename
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
968 &psa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
970 si
.wShowWindow
= SW_HIDE
;
971 si
.dwFlags
= STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
972 si
.hStdOutput
= houtfile
;
974 LPTSTR pEnv
= (!m_Environment
.empty()) ? &m_Environment
[0]: NULL
;
975 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
977 if(cmd
.Find(_T("git")) == 0)
978 cmd
=CGit::ms_LastMsysGitDir
+_T("\\")+cmd
;
980 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
983 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
984 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
987 return TGIT_GIT_ERROR_CREATE_PROCESS
;
990 WaitForSingleObject(pi
.hProcess
,INFINITE
);
992 CloseHandle(pi
.hThread
);
993 CloseHandle(pi
.hProcess
);
994 CloseHandle(houtfile
);
995 return TGIT_GIT_SUCCESS
;
999 int CGit::GetHash(CGitHash
&hash
, TCHAR
* friendname
)
1001 // no need to parse a ref if it's already a 40-byte hash
1002 if (CGitHash::IsValidSHA1(friendname
))
1004 CString
sHash(friendname
);
1005 hash
= CGitHash(sHash
);
1011 git_repository
*repo
= NULL
;
1012 CStringA gitdirA
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1013 if (git_repository_open(&repo
, gitdirA
.GetBuffer()))
1015 gitdirA
.ReleaseBuffer();
1018 gitdirA
.ReleaseBuffer();
1020 int isHeadOrphan
= git_repository_head_orphan(repo
);
1021 if (isHeadOrphan
!= 0)
1023 git_repository_free(repo
);
1025 if (isHeadOrphan
== 1)
1031 CStringA refnameA
= CUnicodeUtils::GetMulti(friendname
, CP_UTF8
);
1033 git_object
* gitObject
= NULL
;
1034 if (git_revparse_single(&gitObject
, repo
, refnameA
.GetBuffer()))
1036 refnameA
.ReleaseBuffer();
1037 git_repository_free(repo
);
1040 refnameA
.ReleaseBuffer();
1042 const git_oid
* oid
= git_object_id(gitObject
);
1045 git_object_free(gitObject
);
1046 git_repository_free(repo
);
1050 hash
= CGitHash((char *)oid
->id
);
1052 git_object_free(gitObject
); // also frees oid
1053 git_repository_free(repo
);
1060 cmd
.Format(_T("git.exe rev-parse %s" ),FixBranchName(friendname
));
1061 int ret
= Run(cmd
, &gitLastErr
, NULL
, CP_UTF8
);
1062 hash
= CGitHash(gitLastErr
.Trim());
1067 int CGit::GetInitAddList(CTGitPathList
&outputlist
)
1072 cmd
=_T("git.exe ls-files -s -t -z");
1074 if (Run(cmd
, &cmdout
))
1077 if (outputlist
.ParserFromLsFile(cmdout
))
1079 for(int i
= 0; i
< outputlist
.GetCount(); ++i
)
1080 const_cast<CTGitPath
&>(outputlist
[i
]).m_Action
= CTGitPath::LOGACTIONS_ADDED
;
1084 int CGit::GetCommitDiffList(const CString
&rev1
,const CString
&rev2
,CTGitPathList
&outputlist
)
1088 if(rev1
== GIT_REV_ZERO
|| rev2
== GIT_REV_ZERO
)
1091 if(rev1
== GIT_REV_ZERO
)
1092 cmd
.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2
);
1094 cmd
.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1
);
1098 cmd
.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2
,rev1
);
1105 outputlist
.ParserFromLog(out
);
1110 int addto_list_each_ref_fn(const char *refname
, const unsigned char * /*sha1*/, int /*flags*/, void *cb_data
)
1112 STRING_VECTOR
*list
= (STRING_VECTOR
*)cb_data
;
1114 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1115 list
->push_back(str
);
1119 int CGit::GetTagList(STRING_VECTOR
&list
)
1121 if (this->m_IsUseLibGit2
)
1123 git_repository
*repo
= NULL
;
1125 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1126 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1128 gitdir
.ReleaseBuffer();
1131 gitdir
.ReleaseBuffer();
1133 git_strarray tag_names
;
1135 if (git_tag_list(&tag_names
, repo
))
1137 git_repository_free(repo
);
1141 for (size_t i
= 0; i
< tag_names
.count
; ++i
)
1143 CStringA
tagName(tag_names
.strings
[i
]);
1144 list
.push_back(CUnicodeUtils::GetUnicode(tagName
));
1147 git_strarray_free(&tag_names
);
1149 git_repository_free(repo
);
1151 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1157 CString cmd
, output
;
1158 cmd
=_T("git.exe tag -l");
1159 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1166 one
=output
.Tokenize(_T("\n"),pos
);
1168 list
.push_back(one
);
1170 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1177 Use this method only if m_IsUseLibGit2 is used for fallbacks.
1178 If you directly use libgit2 methods, use GetLibGit2LastErr instead.
1180 CString
CGit::GetGitLastErr(CString msg
)
1182 if (this->m_IsUseLibGit2
)
1183 return GetLibGit2LastErr(msg
);
1184 else if (gitLastErr
.IsEmpty())
1185 return msg
+ _T("\nUnknown git.exe error.");
1188 CString lastError
= gitLastErr
;
1190 return msg
+ _T("\n") + lastError
;
1194 CString
CGit::GetLibGit2LastErr()
1196 const git_error
*libgit2err
= giterr_last();
1199 CString lastError
= CUnicodeUtils::GetUnicode(CStringA(libgit2err
->message
));
1201 return _T("libgit2 returned: ") + lastError
;
1204 return _T("An error occoured in libgit2, but no message is available.");
1207 CString
CGit::GetLibGit2LastErr(CString msg
)
1210 return msg
+ _T("\n") + GetLibGit2LastErr();
1211 return GetLibGit2LastErr();
1214 CString
CGit::FixBranchName_Mod(CString
& branchName
)
1216 if(branchName
== "FETCH_HEAD")
1217 branchName
= DerefFetchHead();
1221 CString
CGit::FixBranchName(const CString
& branchName
)
1223 CString tempBranchName
= branchName
;
1224 FixBranchName_Mod(tempBranchName
);
1225 return tempBranchName
;
1228 bool CGit::IsBranchTagNameUnique(const CString
& name
)
1233 cmd
.Format(_T("git show-ref --tags --heads refs/heads/%s refs/tags/%s"), name
, name
);
1234 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1240 if (!output
.Tokenize(_T("\n"), pos
).IsEmpty())
1251 Checks if a branch or tag with the given name exists
1252 isBranch is true -> branch, tag otherwise
1254 bool CGit::BranchTagExists(const CString
& name
, bool isBranch
/*= true*/)
1256 CString cmd
, output
;
1258 cmd
= _T("git show-ref ");
1260 cmd
+= _T("--heads ");
1262 cmd
+= _T("--tags ");
1264 cmd
+= _T("refs/heads/") + name
;
1265 cmd
+= _T(" refs/tags/") + name
;
1267 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1270 if (!output
.IsEmpty())
1277 CString
CGit::DerefFetchHead()
1279 using namespace std
;
1281 g_GitAdminDir
.GetAdminDirPath(m_CurrentDir
, dotGitPath
);
1282 ifstream
fetchHeadFile((dotGitPath
+ L
"FETCH_HEAD").GetString(), ios::in
| ios::binary
);
1283 int forMergeLineCount
= 0;
1285 string hashToReturn
;
1286 while(getline(fetchHeadFile
, line
))
1288 //Tokenize this line
1289 string::size_type prevPos
= 0;
1290 string::size_type pos
= line
.find('\t');
1291 if(pos
== string::npos
) continue; //invalid line
1293 string hash
= line
.substr(0, pos
);
1294 ++pos
; prevPos
= pos
; pos
= line
.find('\t', pos
); if(pos
== string::npos
) continue;
1296 bool forMerge
= pos
== prevPos
;
1297 ++pos
; prevPos
= pos
; pos
= line
.size(); if(pos
== string::npos
) continue;
1299 string remoteBranch
= line
.substr(prevPos
, pos
- prevPos
);
1304 hashToReturn
= hash
;
1305 ++forMergeLineCount
;
1306 if(forMergeLineCount
> 1)
1307 return L
""; //More then 1 branch to merge found. Octopus merge needed. Cannot pick single ref from FETCH_HEAD
1311 return CUnicodeUtils::GetUnicode(hashToReturn
.c_str());
1314 int CGit::GetBranchList(STRING_VECTOR
&list
,int *current
,BRANCH_TYPE type
)
1317 CString cmd
, output
, cur
;
1318 cmd
= _T("git.exe branch --no-color");
1320 if((type
&BRANCH_ALL
) == BRANCH_ALL
)
1322 else if(type
&BRANCH_REMOTE
)
1325 ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1332 one
=output
.Tokenize(_T("\n"),pos
);
1333 one
.Trim(L
" \r\n\t");
1334 if(one
.Find(L
" -> ") >= 0 || one
.IsEmpty())
1335 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
1336 if(one
[0] == _T('*'))
1341 if (one
!= _T("(no branch)"))
1342 list
.push_back(one
);
1346 if(type
& BRANCH_FETCH_HEAD
&& !DerefFetchHead().IsEmpty())
1347 list
.push_back(L
"FETCH_HEAD");
1349 std::sort(list
.begin(), list
.end(), LogicalCompareBranchesPredicate
);
1351 if (current
&& cur
!= _T("(no branch)"))
1353 for (unsigned int i
= 0; i
< list
.size(); ++i
)
1366 int CGit::GetRemoteList(STRING_VECTOR
&list
)
1368 if (this->m_IsUseLibGit2
)
1370 git_repository
*repo
= NULL
;
1372 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1373 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1375 gitdir
.ReleaseBuffer();
1378 gitdir
.ReleaseBuffer();
1380 git_strarray remotes
;
1382 if (git_remote_list(&remotes
, repo
))
1384 git_repository_free(repo
);
1388 for (size_t i
= 0; i
< remotes
.count
; ++i
)
1390 CStringA
remote(remotes
.strings
[i
]);
1391 list
.push_back(CUnicodeUtils::GetUnicode(remote
));
1394 git_strarray_free(&remotes
);
1396 git_repository_free(repo
);
1398 std::sort(list
.begin(), list
.end());
1405 CString cmd
, output
;
1406 cmd
=_T("git.exe remote");
1407 ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1414 one
=output
.Tokenize(_T("\n"),pos
);
1416 list
.push_back(one
);
1423 int CGit::GetRemoteTags(CString remote
, STRING_VECTOR
&list
)
1425 CString cmd
, out
, err
;
1426 cmd
.Format(_T("git.exe ls-remote -t \"%s\""), remote
);
1427 if (Run(cmd
, &out
, &err
, CP_UTF8
))
1429 MessageBox(NULL
, err
, _T("TortoiseGit"), MB_ICONERROR
);
1436 CString one
= out
.Tokenize(_T("\n"), pos
).Mid(51).Trim(); // sha1, tab + refs/tags/
1437 // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1438 if (one
.Find(_T("^{}")) >= 1)
1441 list
.push_back(one
);
1443 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1447 int libgit2_addto_list_each_ref_fn(const char *refname
, void *payload
)
1449 STRING_VECTOR
*list
= (STRING_VECTOR
*)payload
;
1451 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1452 list
->push_back(str
);
1456 int CGit::GetRefList(STRING_VECTOR
&list
)
1458 if (this->m_IsUseLibGit2
)
1460 git_repository
*repo
= NULL
;
1462 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1463 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1465 gitdir
.ReleaseBuffer();
1468 gitdir
.ReleaseBuffer();
1470 if (git_reference_foreach(repo
, GIT_REF_LISTALL
, libgit2_addto_list_each_ref_fn
, &list
))
1472 git_repository_free(repo
);
1476 git_repository_free(repo
);
1478 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1484 CString cmd
, output
;
1485 cmd
=_T("git.exe show-ref -d");
1486 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1493 one
=output
.Tokenize(_T("\n"),pos
);
1494 int start
=one
.Find(_T(" "),0);
1498 name
=one
.Right(one
.GetLength()-start
-1);
1499 list
.push_back(name
);
1502 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1508 typedef struct map_each_ref_payload
{
1509 git_repository
* repo
;
1510 MAP_HASH_NAME
* map
;
1511 } map_each_ref_payload
;
1513 int libgit2_addto_map_each_ref_fn(const char *refname
, void *payload
)
1515 map_each_ref_payload
*payloadContent
= (map_each_ref_payload
*)payload
;
1518 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1520 git_object
* gitObject
= NULL
;
1524 if (git_revparse_single(&gitObject
, payloadContent
->repo
, refname
))
1529 if (git_object_type(gitObject
) == GIT_OBJ_TAG
)
1531 str
+= _T("^{}"); // deref tag
1532 git_object
* derefedTag
= NULL
;
1533 if (git_object_peel(&derefedTag
, gitObject
, GIT_OBJ_ANY
))
1537 git_object_free(gitObject
);
1538 gitObject
= derefedTag
;
1541 const git_oid
* oid
= git_object_id(gitObject
);
1547 CGitHash
hash((char *)oid
->id
);
1548 (*payloadContent
->map
)[hash
].push_back(str
);
1553 git_object_free(gitObject
);
1560 int CGit::GetMapHashToFriendName(MAP_HASH_NAME
&map
)
1562 if (this->m_IsUseLibGit2
)
1564 git_repository
*repo
= NULL
;
1566 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1567 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1569 gitdir
.ReleaseBuffer();
1572 gitdir
.ReleaseBuffer();
1574 map_each_ref_payload payloadContent
= { repo
, &map
};
1576 if (git_reference_foreach(repo
, GIT_REF_LISTALL
, libgit2_addto_map_each_ref_fn
, &payloadContent
))
1578 git_repository_free(repo
);
1582 git_repository_free(repo
);
1584 for (auto it
= map
.begin(); it
!= map
.end(); ++it
)
1586 std::sort(it
->second
.begin(), it
->second
.end());
1593 CString cmd
, output
;
1594 cmd
=_T("git.exe show-ref -d");
1595 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1602 one
=output
.Tokenize(_T("\n"),pos
);
1603 int start
=one
.Find(_T(" "),0);
1607 name
=one
.Right(one
.GetLength()-start
-1);
1610 hash
=one
.Left(start
);
1612 map
[CGitHash(hash
)].push_back(name
);
1620 BOOL
CGit::CheckMsysGitDir()
1627 this->m_Environment
.clear();
1628 m_Environment
.CopyProcessEnvironment();
1631 size_t homesize
,size
;
1633 // set HOME if not set already
1634 _tgetenv_s(&homesize
, NULL
, 0, _T("HOME"));
1637 CString home
= GetHomeDirectory();
1638 m_Environment
.SetEnv(_T("HOME"), home
.GetBuffer());
1639 home
.ReleaseBuffer();
1644 CString sshclient
=CRegString(_T("Software\\TortoiseGit\\SSH"));
1645 if (sshclient
.IsEmpty())
1646 sshclient
= CRegString(_T("Software\\TortoiseGit\\SSH"), _T(""), FALSE
, HKEY_LOCAL_MACHINE
);
1648 if(!sshclient
.IsEmpty())
1650 m_Environment
.SetEnv(_T("GIT_SSH"), sshclient
.GetBuffer());
1651 m_Environment
.SetEnv(_T("SVN_SSH"), sshclient
.GetBuffer());
1655 TCHAR sPlink
[MAX_PATH
];
1656 GetModuleFileName(NULL
, sPlink
, _countof(sPlink
));
1657 LPTSTR ptr
= _tcsrchr(sPlink
, _T('\\'));
1659 _tcscpy_s(ptr
+ 1, MAX_PATH
- (ptr
- sPlink
+ 1), _T("TortoiseGitPLink.exe"));
1660 m_Environment
.SetEnv(_T("GIT_SSH"), sPlink
);
1661 m_Environment
.SetEnv(_T("SVN_SSH"), sPlink
);
1666 TCHAR sAskPass
[MAX_PATH
];
1667 GetModuleFileName(NULL
, sAskPass
, _countof(sAskPass
));
1668 LPTSTR ptr
= _tcsrchr(sAskPass
, _T('\\'));
1671 _tcscpy_s(ptr
+ 1, MAX_PATH
- (ptr
- sAskPass
+ 1), _T("SshAskPass.exe"));
1672 m_Environment
.SetEnv(_T("DISPLAY"),_T(":9999"));
1673 m_Environment
.SetEnv(_T("SSH_ASKPASS"),sAskPass
);
1674 m_Environment
.SetEnv(_T("GIT_ASKPASS"),sAskPass
);
1678 // add git/bin path to PATH
1680 CRegString msysdir
=CRegString(REG_MSYSGIT_PATH
,_T(""),FALSE
);
1682 if(str
.IsEmpty() || !FileExists(str
+ _T("\\git.exe")))
1684 CRegString msyslocalinstalldir
= CRegString(REG_MSYSGIT_INSTALL_LOCAL
, _T(""), FALSE
, HKEY_CURRENT_USER
);
1685 str
= msyslocalinstalldir
;
1686 str
.TrimRight(_T("\\"));
1689 CRegString msysinstalldir
= CRegString(REG_MSYSGIT_INSTALL
, _T(""), FALSE
, HKEY_LOCAL_MACHINE
);
1690 str
= msysinstalldir
;
1691 str
.TrimRight(_T("\\"));
1693 if ( !str
.IsEmpty() )
1697 CGit::ms_LastMsysGitDir
= str
;
1702 // search PATH if git/bin directory is already present
1703 if ( FindGitPath() )
1705 m_bInitialized
= TRUE
;
1706 msysdir
= CGit::ms_LastMsysGitDir
;
1716 CGit::ms_LastMsysGitDir
= str
;
1719 // check for git.exe existance (maybe it was deinstalled in the meantime)
1720 if (!FileExists(CGit::ms_LastMsysGitDir
+ _T("\\git.exe")))
1724 _tdupenv_s(&oldpath
,&size
,_T("PATH"));
1727 path
.Format(_T("%s;%s"),oldpath
,str
+ _T(";")+ (CString
)CRegString(REG_MSYSGIT_EXTRA_PATH
,_T(""),FALSE
));
1729 m_Environment
.SetEnv(_T("PATH"),path
.GetBuffer());
1731 CString str1
= m_Environment
.GetEnv(_T("PATH"));
1733 CString sOldPath
= oldpath
;
1736 m_bInitialized
= TRUE
;
1740 CString
CGit::GetHomeDirectory()
1742 const wchar_t * homeDir
= wget_windows_home_directory();
1743 return CString(homeDir
, (int)wcslen(homeDir
));
1746 CString
CGit::GetGitLocalConfig()
1749 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, path
);
1750 path
+= _T("config");
1754 CString
CGit::GetGitGlobalConfig()
1756 return g_Git
.GetHomeDirectory() + _T("\\.gitconfig");
1759 CString
CGit::GetGitGlobalXDGConfigPath()
1761 return g_Git
.GetHomeDirectory() + _T("\\.config\\git");
1764 CString
CGit::GetGitGlobalXDGConfig()
1766 return g_Git
.GetGitGlobalXDGConfigPath() + _T("\\config");
1769 CString
CGit::GetGitSystemConfig()
1771 const wchar_t * systemConfig
= wget_msysgit_etc();
1772 return CString(systemConfig
, (int)wcslen(systemConfig
));
1775 BOOL
CGit::CheckCleanWorkTree()
1779 cmd
=_T("git.exe rev-parse --verify HEAD");
1781 if(Run(cmd
,&out
,CP_UTF8
))
1784 cmd
=_T("git.exe update-index --ignore-submodules --refresh");
1785 if(Run(cmd
,&out
,CP_UTF8
))
1788 cmd
=_T("git.exe diff-files --quiet --ignore-submodules");
1789 if(Run(cmd
,&out
,CP_UTF8
))
1792 cmd
=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
1793 if(Run(cmd
,&out
,CP_UTF8
))
1798 int CGit::Revert(CString commit
, CTGitPathList
&list
, bool)
1801 for (int i
= 0; i
< list
.GetCount(); ++i
)
1803 ret
= Revert(commit
, (CTGitPath
&)list
[i
]);
1809 int CGit::Revert(CString commit
, CTGitPath
&path
)
1813 if(path
.m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !path
.GetGitOldPathString().IsEmpty())
1815 if (CTGitPath(path
.GetGitOldPathString()).IsDirectory())
1818 err
.Format(_T("Cannot revert renaming of \"%s\". A directory with the old name \"%s\" exists."), path
.GetGitPathString(), path
.GetGitOldPathString());
1819 ::MessageBox(NULL
, err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1823 // if the filenames only differ in case, we have to pass "-f"
1824 if (path
.GetGitPathString().CompareNoCase(path
.GetGitOldPathString()) == 0)
1826 cmd
.Format(_T("git.exe mv %s-- \"%s\" \"%s\""), force
, path
.GetGitPathString(), path
.GetGitOldPathString());
1827 if (Run(cmd
, &out
, CP_UTF8
))
1829 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1833 cmd
.Format(_T("git.exe checkout %s -f -- \"%s\""), commit
, path
.GetGitOldPathString());
1834 if (Run(cmd
, &out
, CP_UTF8
))
1836 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1841 else if(path
.m_Action
& CTGitPath::LOGACTIONS_ADDED
)
1842 { //To init git repository, there are not HEAD, so we can use git reset command
1843 cmd
.Format(_T("git.exe rm -f --cached -- \"%s\""),path
.GetGitPathString());
1845 if (Run(cmd
, &out
, CP_UTF8
))
1847 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1853 cmd
.Format(_T("git.exe checkout %s -f -- \"%s\""), commit
, path
.GetGitPathString());
1854 if (Run(cmd
, &out
, CP_UTF8
))
1856 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1861 if (path
.m_Action
& CTGitPath::LOGACTIONS_DELETED
)
1863 cmd
.Format(_T("git.exe add -f -- \"%s\""), path
.GetGitPathString());
1864 if (Run(cmd
, &out
, CP_UTF8
))
1866 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1874 int CGit::ListConflictFile(CTGitPathList
&list
,CTGitPath
*path
)
1880 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path
->GetGitPathString());
1882 cmd
=_T("git.exe ls-files -u -t -z");
1884 if (Run(cmd
, &vector
))
1889 if (list
.ParserFromLsFile(vector
))
1895 bool CGit::IsFastForward(const CString
&from
, const CString
&to
, CGitHash
* commonAncestor
)
1898 CGitHash basehash
,hash
;
1900 cmd
.Format(_T("git.exe merge-base %s %s"), FixBranchName(to
), FixBranchName(from
));
1902 if (Run(cmd
, &base
, &err
, CP_UTF8
))
1906 basehash
= base
.Trim();
1908 GetHash(hash
, from
);
1911 *commonAncestor
= basehash
;
1913 return hash
== basehash
;
1916 unsigned int CGit::Hash2int(CGitHash
&hash
)
1919 for (int i
= 0; i
< 4; ++i
)
1922 ret
|= hash
.m_hash
[i
];
1927 int CGit::RefreshGitIndex()
1929 if(g_Git
.m_IsUseGitDLL
)
1931 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
1934 return [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
1945 cmd
=_T("git.exe update-index --refresh");
1946 return Run(cmd
, &output
, CP_UTF8
);
1950 int CGit::GetOneFile(CString Refname
, CTGitPath
&path
, const CString
&outputfile
)
1952 if(g_Git
.m_IsUseGitDLL
)
1954 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
1957 g_Git
.CheckAndInitDll();
1958 CStringA ref
, patha
, outa
;
1959 ref
= CUnicodeUtils::GetMulti(Refname
, CP_UTF8
);
1960 patha
= CUnicodeUtils::GetMulti(path
.GetGitPathString(), CP_UTF8
);
1961 outa
= CUnicodeUtils::GetMulti(outputfile
, CP_UTF8
);
1962 ::DeleteFile(outputfile
);
1963 return git_checkout_file((const char*)ref
.GetBuffer(),(const char*)patha
.GetBuffer(),(const char*)outa
.GetBuffer());
1973 cmd
.Format(_T("git.exe cat-file -p %s:\"%s\""), Refname
, path
.GetGitPathString());
1974 return RunLogFile(cmd
,outputfile
);
1977 void CEnvironment::CopyProcessEnvironment()
1979 TCHAR
*p
= GetEnvironmentStrings();
1980 while(*p
!=0 || *(p
+1) !=0)
1981 this->push_back(*p
++);
1983 push_back(_T('\0'));
1984 push_back(_T('\0'));
1987 CString
CEnvironment::GetEnv(TCHAR
*name
)
1990 for (size_t i
= 0; i
< size(); ++i
)
1994 CString sname
= str
.Tokenize(_T("="),start
);
1995 if(sname
.CompareNoCase(name
) == 0)
1997 return &(*this)[i
+start
];
2004 void CEnvironment::SetEnv(TCHAR
*name
, TCHAR
* value
)
2007 for (i
= 0; i
< size(); ++i
)
2009 CString str
= &(*this)[i
];
2011 CString sname
= str
.Tokenize(_T("="),start
);
2012 if(sname
.CompareNoCase(name
) == 0)
2021 i
-= 1; // roll back terminate \0\0
2022 this->push_back(_T('\0'));
2025 CEnvironment::iterator it
;
2029 while(*it
&& i
<size())
2038 this->insert(it
,*name
++);
2043 this->insert(it
, _T('='));
2049 this->insert(it
,*value
++);
2056 int CGit::GetGitEncode(TCHAR
* configkey
)
2058 CString str
=GetConfigValue(configkey
);
2063 return CUnicodeUtils::GetCPCode(str
);
2067 int CGit::GetDiffPath(CTGitPathList
*PathList
, CGitHash
*hash1
, CGitHash
*hash2
, char *arg
)
2073 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
2076 diff
= GetGitDiff();
2078 git_open_diff(&diff
, arg
);
2087 isStat
= !!strstr(arg
, "stat");
2092 ret
= git_root_diff(diff
, hash1
->m_hash
, &file
, &count
,isStat
);
2094 ret
= git_diff(diff
,hash2
->m_hash
,hash1
->m_hash
,&file
,&count
,isStat
);
2103 for (int j
= 0; j
< count
; ++j
)
2112 int mode
=0,IsBin
=0,inc
=0,dec
=0;
2113 git_get_diff_file(diff
,file
,j
,&newname
,&oldname
,
2114 &mode
,&IsBin
,&inc
,&dec
);
2116 StringAppend(&strnewname
, (BYTE
*)newname
, CP_UTF8
);
2117 StringAppend(&stroldname
, (BYTE
*)oldname
, CP_UTF8
);
2119 path
.SetFromGit(strnewname
,&stroldname
);
2120 path
.ParserAction((BYTE
)mode
);
2124 path
.m_StatAdd
=_T("-");
2125 path
.m_StatDel
=_T("-");
2129 path
.m_StatAdd
.Format(_T("%d"),inc
);
2130 path
.m_StatDel
.Format(_T("%d"),dec
);
2132 PathList
->AddPath(path
);
2134 git_diff_flush(diff
);
2137 git_close_diff(diff
);
2142 int CGit::GetShortHASHLength()
2147 CString
CGit::GetShortName(CString ref
, REF_TYPE
*out_type
)
2151 REF_TYPE type
= CGit::UNKNOWN
;
2153 if (CGit::GetShortName(str
, shortname
, _T("refs/heads/")))
2155 type
= CGit::LOCAL_BRANCH
;
2158 else if (CGit::GetShortName(str
, shortname
, _T("refs/remotes/")))
2160 type
= CGit::REMOTE_BRANCH
;
2162 else if (CGit::GetShortName(str
, shortname
, _T("refs/tags/")))
2166 else if (CGit::GetShortName(str
, shortname
, _T("refs/stash")))
2169 shortname
=_T("stash");
2171 else if (CGit::GetShortName(str
, shortname
, _T("refs/bisect/")))
2173 if (shortname
.Find(_T("good")) == 0)
2175 type
= CGit::BISECT_GOOD
;
2176 shortname
= _T("good");
2179 if (shortname
.Find(_T("bad")) == 0)
2181 type
= CGit::BISECT_BAD
;
2182 shortname
= _T("bad");
2185 else if (CGit::GetShortName(str
, shortname
, _T("refs/notes/")))
2191 type
= CGit::UNKNOWN
;
2192 shortname
= _T("Unknown");
2201 bool CGit::UsingLibGit2(int cmd
)
2203 if (cmd
>= 0 && cmd
< 32)
2204 return ((1 << cmd
) & m_IsUseLibGit2_mask
) ? true : false;