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
)
397 if (!m_pvector
|| size
== 0)
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
);
506 if (git_get_config(key
.GetBuffer(), value
.GetBufferSetLength(4096), 4096, p
.GetBuffer()))
509 catch (const char *msg
)
511 ::MessageBox(NULL
, _T("Could not get config.\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
515 StringAppend(&configValue
,(BYTE
*)value
.GetBuffer(),encoding
);
517 return configValue
.Tokenize(_T("\n"),start
);
523 cmd
.Format(L
"git.exe config %s", name
);
524 Run(cmd
, &configValue
, NULL
, encoding
);
526 return configValue
.Tokenize(_T("\n"),start
);
531 int CGit::SetConfigValue(CString key
, CString value
, CONFIG_TYPE type
, int encoding
, CString
*GitPath
)
533 if(this->m_IsUseGitDLL
)
535 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
544 CStringA keya
, valuea
;
545 keya
= CUnicodeUtils::GetMulti(key
, CP_UTF8
);
546 valuea
= CUnicodeUtils::GetMulti(value
, encoding
);
549 p
= CUnicodeUtils::GetMulti(*GitPath
, CP_UTF8
);
553 return get_set_config(keya
.GetBuffer(), valuea
.GetBuffer(), type
, p
.GetBuffer());
555 catch (const char *msg
)
557 ::MessageBox(NULL
, _T("Could not set config.\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
568 option
= _T("--global");
571 option
= _T("--system");
576 cmd
.Format(_T("git.exe config %s %s \"%s\""), option
, key
, value
);
578 if (Run(cmd
, &out
, NULL
, encoding
))
586 int CGit::UnsetConfigValue(CString key
, CONFIG_TYPE type
, int encoding
, CString
*GitPath
)
588 if(this->m_IsUseGitDLL
)
590 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
599 keya
= CUnicodeUtils::GetMulti(key
, CP_UTF8
);
602 p
=CUnicodeUtils::GetMulti(*GitPath
,CP_ACP
);
606 return get_set_config(keya
.GetBuffer(), NULL
, type
, p
.GetBuffer());
608 catch (const char *msg
)
610 ::MessageBox(NULL
, _T("Could not unset config.\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
621 option
= _T("--global");
624 option
= _T("--system");
629 cmd
.Format(_T("git.exe config %s --unset %s"), option
, key
);
631 if (Run(cmd
, &out
, NULL
, encoding
))
639 CString
CGit::GetCurrentBranch(void)
642 //Run(_T("git.exe branch"),&branch);
644 if(this->GetCurrentBranchFromFile(this->m_CurrentDir
,output
))
646 return _T("(no branch)");
653 CString
CGit::GetSymbolicRef(const wchar_t* symbolicRefName
, bool bStripRefsHeads
)
656 if(this->m_IsUseGitDLL
)
658 unsigned char sha1
[20];
661 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
662 const char *refs_heads_master
= git_resolve_ref(CUnicodeUtils::GetUTF8(CString(symbolicRefName
)), sha1
, 0, &flag
);
663 if(refs_heads_master
&& (flag
&REF_ISSYMREF
))
665 StringAppend(&refName
,(BYTE
*)refs_heads_master
);
667 refName
= StripRefName(refName
);
674 cmd
.Format(L
"git symbolic-ref %s", symbolicRefName
);
675 if (Run(cmd
, &refName
, NULL
, CP_UTF8
) != 0)
676 return CString();//Error
678 refName
= refName
.Tokenize(L
"\n", iStart
);
680 refName
= StripRefName(refName
);
685 CString
CGit::GetFullRefName(CString shortRefName
)
689 cmd
.Format(L
"git rev-parse --symbolic-full-name %s", shortRefName
);
690 if (Run(cmd
, &refName
, NULL
, CP_UTF8
) != 0)
691 return CString();//Error
693 return refName
.Tokenize(L
"\n", iStart
);
696 CString
CGit::StripRefName(CString refName
)
698 if(wcsncmp(refName
, L
"refs/heads/", 11) == 0)
699 refName
= refName
.Mid(11);
700 else if(wcsncmp(refName
, L
"refs/", 5) == 0)
701 refName
= refName
.Mid(5);
703 return refName
.Tokenize(_T("\n"),start
);
706 int CGit::GetCurrentBranchFromFile(const CString
&sProjectRoot
, CString
&sBranchOut
)
708 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
710 if ( sProjectRoot
.IsEmpty() )
714 if (!g_GitAdminDir
.GetAdminDirPath(sProjectRoot
, sDotGitPath
))
717 CString sHeadFile
= sDotGitPath
+ _T("HEAD");
720 _tfopen_s(&pFile
, sHeadFile
.GetString(), _T("r"));
728 fgets(s
, sizeof(s
), pFile
);
732 const char *pfx
= "ref: refs/heads/";
733 const int len
= 16;//strlen(pfx)
735 if ( !strncmp(s
, pfx
, len
) )
737 //# We're on a branch. It might not exist. But
738 //# HEAD looks good enough to be a branch.
739 CStringA
utf8Branch(s
+ len
);
740 sBranchOut
= CUnicodeUtils::GetUnicode(utf8Branch
);
741 sBranchOut
.TrimRight(_T(" \r\n\t"));
743 if ( sBranchOut
.IsEmpty() )
748 //# Assume this is a detached head.
757 int CGit::BuildOutputFormat(CString
&format
,bool IsFull
)
760 log
.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN
);
764 log
.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME
);
766 log
.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL
);
768 log
.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE
);
770 log
.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME
);
772 log
.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL
);
774 log
.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE
);
776 log
.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY
);
780 log
.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH
);
782 log
.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT
);
784 log
.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT
);
789 log
.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE
);
795 CString
CGit::GetLogCmd(CString
&range
, CTGitPath
*path
, int count
, int mask
, bool paramonly
,
805 file
.Format(_T(" -- \"%s\""),path
->GetGitPathString());
808 num
.Format(_T("-n%d"),count
);
812 if(mask
& LOG_INFO_STAT
)
813 param
+= _T(" --numstat ");
814 if(mask
& LOG_INFO_FILESTATE
)
815 param
+= _T(" --raw ");
817 if(mask
& LOG_INFO_FULLHISTORY
)
818 param
+= _T(" --full-history ");
820 if(mask
& LOG_INFO_BOUNDARY
)
821 param
+= _T(" --left-right --boundary ");
823 if(mask
& CGit::LOG_INFO_ALL_BRANCH
)
824 param
+= _T(" --all ");
826 if(mask
& CGit::LOG_INFO_DETECT_COPYRENAME
)
829 if(mask
& CGit::LOG_INFO_DETECT_RENAME
)
832 if(mask
& CGit::LOG_INFO_FIRST_PARENT
)
833 param
+= _T(" --first-parent ");
835 if(mask
& CGit::LOG_INFO_NO_MERGE
)
836 param
+= _T(" --no-merges ");
838 if(mask
& CGit::LOG_INFO_FOLLOW
)
839 param
+= _T(" --follow ");
841 if(mask
& CGit::LOG_INFO_SHOW_MERGEDFILE
)
844 if(mask
& CGit::LOG_INFO_FULL_DIFF
)
845 param
+= _T(" --full-diff ");
847 if(mask
& CGit::LOG_INFO_SIMPILFY_BY_DECORATION
)
848 param
+= _T(" --simplify-by-decoration ");
854 if( Filter
&& (Filter
->m_From
!= -1))
856 st1
.Format(_T(" --max-age=%I64u "), Filter
->m_From
);
860 if( Filter
&& (Filter
->m_To
!= -1))
862 st2
.Format(_T(" --min-age=%I64u "), Filter
->m_To
);
867 if( Filter
&& (!Filter
->m_Author
.IsEmpty()))
869 st1
.Format(_T(" --author=\"%s\"" ),Filter
->m_Author
);
874 if( Filter
&& (!Filter
->m_Committer
.IsEmpty()))
876 st1
.Format(_T(" --committer=\"%s\"" ),Filter
->m_Author
);
881 if( Filter
&& (!Filter
->m_MessageFilter
.IsEmpty()))
883 st1
.Format(_T(" --grep=\"%s\"" ),Filter
->m_MessageFilter
);
890 if(!Filter
->m_IsRegex
)
891 param
+= _T(" --fixed-strings ");
893 param
+= _T(" --regexp-ignore-case --extended-regexp ");
896 DWORD logOrderBy
= CRegDWORD(_T("Software\\TortoiseGit\\LogOrderBy"), LOG_ORDER_TOPOORDER
);
897 if (logOrderBy
== LOG_ORDER_TOPOORDER
)
898 param
+= _T(" --topo-order");
899 else if (logOrderBy
== LOG_ORDER_DATEORDER
)
900 param
+= _T(" --date-order");
902 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
903 cmd
.Format(_T("--ignore-this-parameter %s -z %s --parents "), num
, param
);
907 BuildOutputFormat(log
,!(mask
&CGit::LOG_INFO_ONLY_HASH
));
908 cmd
.Format(_T("git.exe log %s -z %s --parents --pretty=format:\"%s\""),
917 void GetTempPath(CString
&path
)
919 TCHAR lpPathBuffer
[BUFSIZE
];
921 DWORD dwBufSize
=BUFSIZE
;
922 dwRetVal
= GetTortoiseGitTempPath(dwBufSize
, // length of the buffer
923 lpPathBuffer
); // buffer for path
924 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
928 path
.Format(_T("%s"),lpPathBuffer
);
930 CString
GetTempFile()
932 TCHAR lpPathBuffer
[BUFSIZE
];
934 DWORD dwBufSize
=BUFSIZE
;
935 TCHAR szTempName
[BUFSIZE
];
938 dwRetVal
= GetTortoiseGitTempPath(dwBufSize
, // length of the buffer
939 lpPathBuffer
); // buffer for path
940 if (dwRetVal
> dwBufSize
|| (dwRetVal
== 0))
944 // Create a temporary file.
945 uRetVal
= GetTempFileName(lpPathBuffer
, // directory for tmp files
946 TEXT("Patch"), // temp file name prefix
947 0, // create unique name
948 szTempName
); // buffer for name
956 return CString(szTempName
);
960 DWORD
GetTortoiseGitTempPath(DWORD nBufferLength
, LPTSTR lpBuffer
)
962 DWORD result
= ::GetTempPath(nBufferLength
, lpBuffer
);
963 if (result
== 0) return 0;
964 if (lpBuffer
== NULL
|| (result
+ 13 > nBufferLength
))
971 _tcscat_s(lpBuffer
, nBufferLength
, _T("TortoiseGit\\"));
972 CreateDirectory(lpBuffer
, NULL
);
977 int CGit::RunLogFile(CString cmd
,const CString
&filename
)
980 PROCESS_INFORMATION pi
;
981 si
.cb
=sizeof(STARTUPINFO
);
984 SECURITY_ATTRIBUTES psa
={sizeof(psa
),NULL
,TRUE
};;
985 psa
.bInheritHandle
=TRUE
;
987 HANDLE houtfile
=CreateFile(filename
,GENERIC_WRITE
,FILE_SHARE_READ
| FILE_SHARE_WRITE
,
988 &psa
,CREATE_ALWAYS
,FILE_ATTRIBUTE_NORMAL
,NULL
);
990 si
.wShowWindow
= SW_HIDE
;
991 si
.dwFlags
= STARTF_USESTDHANDLES
|STARTF_USESHOWWINDOW
;
992 si
.hStdOutput
= houtfile
;
994 LPTSTR pEnv
= (!m_Environment
.empty()) ? &m_Environment
[0]: NULL
;
995 DWORD dwFlags
= pEnv
? CREATE_UNICODE_ENVIRONMENT
: 0;
997 if(cmd
.Find(_T("git")) == 0)
998 cmd
=CGit::ms_LastMsysGitDir
+_T("\\")+cmd
;
1000 if(!CreateProcess(NULL
,(LPWSTR
)cmd
.GetString(), NULL
,NULL
,TRUE
,dwFlags
,pEnv
,(LPWSTR
)m_CurrentDir
.GetString(),&si
,&pi
))
1003 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_FROM_SYSTEM
,
1004 NULL
,GetLastError(),MAKELANGID(LANG_NEUTRAL
, SUBLANG_DEFAULT
),
1007 return TGIT_GIT_ERROR_CREATE_PROCESS
;
1010 WaitForSingleObject(pi
.hProcess
,INFINITE
);
1012 CloseHandle(pi
.hThread
);
1013 CloseHandle(pi
.hProcess
);
1014 CloseHandle(houtfile
);
1015 return TGIT_GIT_SUCCESS
;
1019 int CGit::GetHash(CGitHash
&hash
, TCHAR
* friendname
)
1021 // no need to parse a ref if it's already a 40-byte hash
1022 if (CGitHash::IsValidSHA1(friendname
))
1024 CString
sHash(friendname
);
1025 hash
= CGitHash(sHash
);
1031 git_repository
*repo
= NULL
;
1032 CStringA gitdirA
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1033 if (git_repository_open(&repo
, gitdirA
.GetBuffer()))
1035 gitdirA
.ReleaseBuffer();
1038 gitdirA
.ReleaseBuffer();
1040 int isHeadOrphan
= git_repository_head_orphan(repo
);
1041 if (isHeadOrphan
!= 0)
1043 git_repository_free(repo
);
1045 if (isHeadOrphan
== 1)
1051 CStringA refnameA
= CUnicodeUtils::GetMulti(friendname
, CP_UTF8
);
1053 git_object
* gitObject
= NULL
;
1054 if (git_revparse_single(&gitObject
, repo
, refnameA
.GetBuffer()))
1056 refnameA
.ReleaseBuffer();
1057 git_repository_free(repo
);
1060 refnameA
.ReleaseBuffer();
1062 const git_oid
* oid
= git_object_id(gitObject
);
1065 git_object_free(gitObject
);
1066 git_repository_free(repo
);
1070 hash
= CGitHash((char *)oid
->id
);
1072 git_object_free(gitObject
); // also frees oid
1073 git_repository_free(repo
);
1080 cmd
.Format(_T("git.exe rev-parse %s" ),FixBranchName(friendname
));
1082 int ret
= Run(cmd
, &gitLastErr
, NULL
, CP_UTF8
);
1083 hash
= CGitHash(gitLastErr
.Trim());
1090 int CGit::GetInitAddList(CTGitPathList
&outputlist
)
1095 cmd
=_T("git.exe ls-files -s -t -z");
1097 if (Run(cmd
, &cmdout
))
1100 if (outputlist
.ParserFromLsFile(cmdout
))
1102 for(int i
= 0; i
< outputlist
.GetCount(); ++i
)
1103 const_cast<CTGitPath
&>(outputlist
[i
]).m_Action
= CTGitPath::LOGACTIONS_ADDED
;
1107 int CGit::GetCommitDiffList(const CString
&rev1
,const CString
&rev2
,CTGitPathList
&outputlist
)
1111 if(rev1
== GIT_REV_ZERO
|| rev2
== GIT_REV_ZERO
)
1114 if(rev1
== GIT_REV_ZERO
)
1115 cmd
.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2
);
1117 cmd
.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1
);
1121 cmd
.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2
,rev1
);
1128 outputlist
.ParserFromLog(out
);
1133 int addto_list_each_ref_fn(const char *refname
, const unsigned char * /*sha1*/, int /*flags*/, void *cb_data
)
1135 STRING_VECTOR
*list
= (STRING_VECTOR
*)cb_data
;
1137 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1138 list
->push_back(str
);
1142 int CGit::GetTagList(STRING_VECTOR
&list
)
1144 if (this->m_IsUseLibGit2
)
1146 git_repository
*repo
= NULL
;
1148 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1149 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1151 gitdir
.ReleaseBuffer();
1154 gitdir
.ReleaseBuffer();
1156 git_strarray tag_names
;
1158 if (git_tag_list(&tag_names
, repo
))
1160 git_repository_free(repo
);
1164 for (size_t i
= 0; i
< tag_names
.count
; ++i
)
1166 CStringA
tagName(tag_names
.strings
[i
]);
1167 list
.push_back(CUnicodeUtils::GetUnicode(tagName
));
1170 git_strarray_free(&tag_names
);
1172 git_repository_free(repo
);
1174 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1180 CString cmd
, output
;
1181 cmd
=_T("git.exe tag -l");
1182 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1189 one
=output
.Tokenize(_T("\n"),pos
);
1191 list
.push_back(one
);
1193 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1200 Use this method only if m_IsUseLibGit2 is used for fallbacks.
1201 If you directly use libgit2 methods, use GetLibGit2LastErr instead.
1203 CString
CGit::GetGitLastErr(CString msg
)
1205 if (this->m_IsUseLibGit2
)
1206 return GetLibGit2LastErr(msg
);
1207 else if (gitLastErr
.IsEmpty())
1208 return msg
+ _T("\nUnknown git.exe error.");
1211 CString lastError
= gitLastErr
;
1213 return msg
+ _T("\n") + lastError
;
1217 CString
CGit::GetLibGit2LastErr()
1219 const git_error
*libgit2err
= giterr_last();
1222 CString lastError
= CUnicodeUtils::GetUnicode(CStringA(libgit2err
->message
));
1224 return _T("libgit2 returned: ") + lastError
;
1227 return _T("An error occoured in libgit2, but no message is available.");
1230 CString
CGit::GetLibGit2LastErr(CString msg
)
1233 return msg
+ _T("\n") + GetLibGit2LastErr();
1234 return GetLibGit2LastErr();
1237 CString
CGit::FixBranchName_Mod(CString
& branchName
)
1239 if(branchName
== "FETCH_HEAD")
1240 branchName
= DerefFetchHead();
1244 CString
CGit::FixBranchName(const CString
& branchName
)
1246 CString tempBranchName
= branchName
;
1247 FixBranchName_Mod(tempBranchName
);
1248 return tempBranchName
;
1251 bool CGit::IsBranchTagNameUnique(const CString
& name
)
1256 cmd
.Format(_T("git show-ref --tags --heads refs/heads/%s refs/tags/%s"), name
, name
);
1257 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1263 if (!output
.Tokenize(_T("\n"), pos
).IsEmpty())
1274 Checks if a branch or tag with the given name exists
1275 isBranch is true -> branch, tag otherwise
1277 bool CGit::BranchTagExists(const CString
& name
, bool isBranch
/*= true*/)
1279 CString cmd
, output
;
1281 cmd
= _T("git show-ref ");
1283 cmd
+= _T("--heads ");
1285 cmd
+= _T("--tags ");
1287 cmd
+= _T("refs/heads/") + name
;
1288 cmd
+= _T(" refs/tags/") + name
;
1290 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1293 if (!output
.IsEmpty())
1300 CString
CGit::DerefFetchHead()
1302 using namespace std
;
1304 g_GitAdminDir
.GetAdminDirPath(m_CurrentDir
, dotGitPath
);
1305 ifstream
fetchHeadFile((dotGitPath
+ L
"FETCH_HEAD").GetString(), ios::in
| ios::binary
);
1306 int forMergeLineCount
= 0;
1308 string hashToReturn
;
1309 while(getline(fetchHeadFile
, line
))
1311 //Tokenize this line
1312 string::size_type prevPos
= 0;
1313 string::size_type pos
= line
.find('\t');
1314 if(pos
== string::npos
) continue; //invalid line
1316 string hash
= line
.substr(0, pos
);
1317 ++pos
; prevPos
= pos
; pos
= line
.find('\t', pos
); if(pos
== string::npos
) continue;
1319 bool forMerge
= pos
== prevPos
;
1320 ++pos
; prevPos
= pos
; pos
= line
.size(); if(pos
== string::npos
) continue;
1322 string remoteBranch
= line
.substr(prevPos
, pos
- prevPos
);
1327 hashToReturn
= hash
;
1328 ++forMergeLineCount
;
1329 if(forMergeLineCount
> 1)
1330 return L
""; //More then 1 branch to merge found. Octopus merge needed. Cannot pick single ref from FETCH_HEAD
1334 return CUnicodeUtils::GetUnicode(hashToReturn
.c_str());
1337 int CGit::GetBranchList(STRING_VECTOR
&list
,int *current
,BRANCH_TYPE type
)
1340 CString cmd
, output
, cur
;
1341 cmd
= _T("git.exe branch --no-color");
1343 if((type
&BRANCH_ALL
) == BRANCH_ALL
)
1345 else if(type
&BRANCH_REMOTE
)
1348 ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1355 one
=output
.Tokenize(_T("\n"),pos
);
1356 one
.Trim(L
" \r\n\t");
1357 if(one
.Find(L
" -> ") >= 0 || one
.IsEmpty())
1358 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
1359 if(one
[0] == _T('*'))
1364 if (one
!= _T("(no branch)"))
1365 list
.push_back(one
);
1369 if(type
& BRANCH_FETCH_HEAD
&& !DerefFetchHead().IsEmpty())
1370 list
.push_back(L
"FETCH_HEAD");
1372 std::sort(list
.begin(), list
.end(), LogicalCompareBranchesPredicate
);
1374 if (current
&& cur
!= _T("(no branch)"))
1376 for (unsigned int i
= 0; i
< list
.size(); ++i
)
1389 int CGit::GetRemoteList(STRING_VECTOR
&list
)
1391 if (this->m_IsUseLibGit2
)
1393 git_repository
*repo
= NULL
;
1395 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1396 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1398 gitdir
.ReleaseBuffer();
1401 gitdir
.ReleaseBuffer();
1403 git_strarray remotes
;
1405 if (git_remote_list(&remotes
, repo
))
1407 git_repository_free(repo
);
1411 for (size_t i
= 0; i
< remotes
.count
; ++i
)
1413 CStringA
remote(remotes
.strings
[i
]);
1414 list
.push_back(CUnicodeUtils::GetUnicode(remote
));
1417 git_strarray_free(&remotes
);
1419 git_repository_free(repo
);
1421 std::sort(list
.begin(), list
.end());
1428 CString cmd
, output
;
1429 cmd
=_T("git.exe remote");
1430 ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1437 one
=output
.Tokenize(_T("\n"),pos
);
1439 list
.push_back(one
);
1446 int CGit::GetRemoteTags(CString remote
, STRING_VECTOR
&list
)
1448 CString cmd
, out
, err
;
1449 cmd
.Format(_T("git.exe ls-remote -t \"%s\""), remote
);
1450 if (Run(cmd
, &out
, &err
, CP_UTF8
))
1452 MessageBox(NULL
, err
, _T("TortoiseGit"), MB_ICONERROR
);
1459 CString one
= out
.Tokenize(_T("\n"), pos
).Mid(51).Trim(); // sha1, tab + refs/tags/
1460 // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1461 if (one
.Find(_T("^{}")) >= 1)
1464 list
.push_back(one
);
1466 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1470 int libgit2_addto_list_each_ref_fn(const char *refname
, void *payload
)
1472 STRING_VECTOR
*list
= (STRING_VECTOR
*)payload
;
1474 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1475 list
->push_back(str
);
1479 int CGit::GetRefList(STRING_VECTOR
&list
)
1481 if (this->m_IsUseLibGit2
)
1483 git_repository
*repo
= NULL
;
1485 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1486 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1488 gitdir
.ReleaseBuffer();
1491 gitdir
.ReleaseBuffer();
1493 if (git_reference_foreach(repo
, GIT_REF_LISTALL
, libgit2_addto_list_each_ref_fn
, &list
))
1495 git_repository_free(repo
);
1499 git_repository_free(repo
);
1501 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1507 CString cmd
, output
;
1508 cmd
=_T("git.exe show-ref -d");
1509 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1516 one
=output
.Tokenize(_T("\n"),pos
);
1517 int start
=one
.Find(_T(" "),0);
1521 name
=one
.Right(one
.GetLength()-start
-1);
1522 list
.push_back(name
);
1525 std::sort(list
.begin(), list
.end(), LogicalComparePredicate
);
1531 typedef struct map_each_ref_payload
{
1532 git_repository
* repo
;
1533 MAP_HASH_NAME
* map
;
1534 } map_each_ref_payload
;
1536 int libgit2_addto_map_each_ref_fn(const char *refname
, void *payload
)
1538 map_each_ref_payload
*payloadContent
= (map_each_ref_payload
*)payload
;
1541 g_Git
.StringAppend(&str
, (BYTE
*)refname
, CP_UTF8
);
1543 git_object
* gitObject
= NULL
;
1547 if (git_revparse_single(&gitObject
, payloadContent
->repo
, refname
))
1552 if (git_object_type(gitObject
) == GIT_OBJ_TAG
)
1554 str
+= _T("^{}"); // deref tag
1555 git_object
* derefedTag
= NULL
;
1556 if (git_object_peel(&derefedTag
, gitObject
, GIT_OBJ_ANY
))
1560 git_object_free(gitObject
);
1561 gitObject
= derefedTag
;
1564 const git_oid
* oid
= git_object_id(gitObject
);
1570 CGitHash
hash((char *)oid
->id
);
1571 (*payloadContent
->map
)[hash
].push_back(str
);
1576 git_object_free(gitObject
);
1583 int CGit::GetMapHashToFriendName(MAP_HASH_NAME
&map
)
1585 if (this->m_IsUseLibGit2
)
1587 git_repository
*repo
= NULL
;
1589 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(m_CurrentDir
).GetGitPathString(), CP_UTF8
);
1590 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1592 gitdir
.ReleaseBuffer();
1595 gitdir
.ReleaseBuffer();
1597 map_each_ref_payload payloadContent
= { repo
, &map
};
1599 if (git_reference_foreach(repo
, GIT_REF_LISTALL
, libgit2_addto_map_each_ref_fn
, &payloadContent
))
1601 git_repository_free(repo
);
1605 git_repository_free(repo
);
1607 for (auto it
= map
.begin(); it
!= map
.end(); ++it
)
1609 std::sort(it
->second
.begin(), it
->second
.end());
1616 CString cmd
, output
;
1617 cmd
=_T("git.exe show-ref -d");
1618 int ret
= Run(cmd
, &output
, NULL
, CP_UTF8
);
1625 one
=output
.Tokenize(_T("\n"),pos
);
1626 int start
=one
.Find(_T(" "),0);
1630 name
=one
.Right(one
.GetLength()-start
-1);
1633 hash
=one
.Left(start
);
1635 map
[CGitHash(hash
)].push_back(name
);
1643 static void SetLibGit2SearchPath(int level
, const CString
&value
)
1645 CStringA valueA
= CUnicodeUtils::GetMulti(value
, CP_UTF8
);
1646 git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH
, level
, valueA
.GetBuffer());
1647 valueA
.ReleaseBuffer();
1650 BOOL
CGit::CheckMsysGitDir()
1657 this->m_Environment
.clear();
1658 m_Environment
.CopyProcessEnvironment();
1661 size_t homesize
,size
;
1663 // set HOME if not set already
1664 _tgetenv_s(&homesize
, NULL
, 0, _T("HOME"));
1667 CString home
= GetHomeDirectory();
1668 m_Environment
.SetEnv(_T("HOME"), home
.GetBuffer());
1669 home
.ReleaseBuffer();
1674 CString sshclient
=CRegString(_T("Software\\TortoiseGit\\SSH"));
1675 if (sshclient
.IsEmpty())
1676 sshclient
= CRegString(_T("Software\\TortoiseGit\\SSH"), _T(""), FALSE
, HKEY_LOCAL_MACHINE
);
1678 if(!sshclient
.IsEmpty())
1680 m_Environment
.SetEnv(_T("GIT_SSH"), sshclient
.GetBuffer());
1681 m_Environment
.SetEnv(_T("SVN_SSH"), sshclient
.GetBuffer());
1685 TCHAR sPlink
[MAX_PATH
];
1686 GetModuleFileName(NULL
, sPlink
, _countof(sPlink
));
1687 LPTSTR ptr
= _tcsrchr(sPlink
, _T('\\'));
1689 _tcscpy_s(ptr
+ 1, MAX_PATH
- (ptr
- sPlink
+ 1), _T("TortoiseGitPLink.exe"));
1690 m_Environment
.SetEnv(_T("GIT_SSH"), sPlink
);
1691 m_Environment
.SetEnv(_T("SVN_SSH"), sPlink
);
1696 TCHAR sAskPass
[MAX_PATH
];
1697 GetModuleFileName(NULL
, sAskPass
, _countof(sAskPass
));
1698 LPTSTR ptr
= _tcsrchr(sAskPass
, _T('\\'));
1701 _tcscpy_s(ptr
+ 1, MAX_PATH
- (ptr
- sAskPass
+ 1), _T("SshAskPass.exe"));
1702 m_Environment
.SetEnv(_T("DISPLAY"),_T(":9999"));
1703 m_Environment
.SetEnv(_T("SSH_ASKPASS"),sAskPass
);
1704 m_Environment
.SetEnv(_T("GIT_ASKPASS"),sAskPass
);
1708 // add git/bin path to PATH
1710 CRegString msysdir
=CRegString(REG_MSYSGIT_PATH
,_T(""),FALSE
);
1712 if(str
.IsEmpty() || !FileExists(str
+ _T("\\git.exe")))
1714 CRegString msyslocalinstalldir
= CRegString(REG_MSYSGIT_INSTALL_LOCAL
, _T(""), FALSE
, HKEY_CURRENT_USER
);
1715 str
= msyslocalinstalldir
;
1716 str
.TrimRight(_T("\\"));
1719 CRegString msysinstalldir
= CRegString(REG_MSYSGIT_INSTALL
, _T(""), FALSE
, HKEY_LOCAL_MACHINE
);
1720 str
= msysinstalldir
;
1721 str
.TrimRight(_T("\\"));
1723 if ( !str
.IsEmpty() )
1727 CGit::ms_LastMsysGitDir
= str
;
1732 // search PATH if git/bin directory is already present
1733 if ( FindGitPath() )
1735 m_bInitialized
= TRUE
;
1736 msysdir
= CGit::ms_LastMsysGitDir
;
1746 CGit::ms_LastMsysGitDir
= str
;
1749 // check for git.exe existance (maybe it was deinstalled in the meantime)
1750 if (!FileExists(CGit::ms_LastMsysGitDir
+ _T("\\git.exe")))
1753 // Configure libgit2 search paths
1755 PathCanonicalize(msysGitDir
.GetBufferSetLength(MAX_PATH
), CGit::ms_LastMsysGitDir
+ _T("\\..\\etc"));
1756 msysGitDir
.ReleaseBuffer();
1757 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_SYSTEM
, msysGitDir
);
1758 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_GLOBAL
, g_Git
.GetHomeDirectory());
1759 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_XDG
, g_Git
.GetGitGlobalXDGConfigPath());
1762 _tdupenv_s(&oldpath
,&size
,_T("PATH"));
1765 path
.Format(_T("%s;%s"),oldpath
,str
+ _T(";")+ (CString
)CRegString(REG_MSYSGIT_EXTRA_PATH
,_T(""),FALSE
));
1767 m_Environment
.SetEnv(_T("PATH"),path
.GetBuffer());
1769 CString str1
= m_Environment
.GetEnv(_T("PATH"));
1771 CString sOldPath
= oldpath
;
1774 m_bInitialized
= TRUE
;
1778 CString
CGit::GetHomeDirectory()
1780 const wchar_t * homeDir
= wget_windows_home_directory();
1781 return CString(homeDir
, (int)wcslen(homeDir
));
1784 CString
CGit::GetGitLocalConfig()
1787 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, path
);
1788 path
+= _T("config");
1792 CString
CGit::GetGitGlobalConfig()
1794 return g_Git
.GetHomeDirectory() + _T("\\.gitconfig");
1797 CString
CGit::GetGitGlobalXDGConfigPath()
1799 return g_Git
.GetHomeDirectory() + _T("\\.config\\git");
1802 CString
CGit::GetGitGlobalXDGConfig()
1804 return g_Git
.GetGitGlobalXDGConfigPath() + _T("\\config");
1807 CString
CGit::GetGitSystemConfig()
1809 const wchar_t * systemConfig
= wget_msysgit_etc();
1810 return CString(systemConfig
, (int)wcslen(systemConfig
));
1813 BOOL
CGit::CheckCleanWorkTree()
1817 cmd
=_T("git.exe rev-parse --verify HEAD");
1819 if(Run(cmd
,&out
,CP_UTF8
))
1822 cmd
=_T("git.exe update-index --ignore-submodules --refresh");
1823 if(Run(cmd
,&out
,CP_UTF8
))
1826 cmd
=_T("git.exe diff-files --quiet --ignore-submodules");
1827 if(Run(cmd
,&out
,CP_UTF8
))
1830 cmd
=_T("git diff-index --cached --quiet HEAD --ignore-submodules");
1831 if(Run(cmd
,&out
,CP_UTF8
))
1836 int CGit::Revert(CString commit
, CTGitPathList
&list
, bool)
1839 for (int i
= 0; i
< list
.GetCount(); ++i
)
1841 ret
= Revert(commit
, (CTGitPath
&)list
[i
]);
1847 int CGit::Revert(CString commit
, CTGitPath
&path
)
1851 if(path
.m_Action
& CTGitPath::LOGACTIONS_REPLACED
&& !path
.GetGitOldPathString().IsEmpty())
1853 if (CTGitPath(path
.GetGitOldPathString()).IsDirectory())
1856 err
.Format(_T("Cannot revert renaming of \"%s\". A directory with the old name \"%s\" exists."), path
.GetGitPathString(), path
.GetGitOldPathString());
1857 ::MessageBox(NULL
, err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1861 // if the filenames only differ in case, we have to pass "-f"
1862 if (path
.GetGitPathString().CompareNoCase(path
.GetGitOldPathString()) == 0)
1864 cmd
.Format(_T("git.exe mv %s-- \"%s\" \"%s\""), force
, path
.GetGitPathString(), path
.GetGitOldPathString());
1865 if (Run(cmd
, &out
, CP_UTF8
))
1867 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1871 cmd
.Format(_T("git.exe checkout %s -f -- \"%s\""), commit
, path
.GetGitOldPathString());
1872 if (Run(cmd
, &out
, CP_UTF8
))
1874 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1879 else if(path
.m_Action
& CTGitPath::LOGACTIONS_ADDED
)
1880 { //To init git repository, there are not HEAD, so we can use git reset command
1881 cmd
.Format(_T("git.exe rm -f --cached -- \"%s\""),path
.GetGitPathString());
1883 if (Run(cmd
, &out
, CP_UTF8
))
1885 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1891 cmd
.Format(_T("git.exe checkout %s -f -- \"%s\""), commit
, path
.GetGitPathString());
1892 if (Run(cmd
, &out
, CP_UTF8
))
1894 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1899 if (path
.m_Action
& CTGitPath::LOGACTIONS_DELETED
)
1901 cmd
.Format(_T("git.exe add -f -- \"%s\""), path
.GetGitPathString());
1902 if (Run(cmd
, &out
, CP_UTF8
))
1904 ::MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1912 int CGit::ListConflictFile(CTGitPathList
&list
,CTGitPath
*path
)
1918 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path
->GetGitPathString());
1920 cmd
=_T("git.exe ls-files -u -t -z");
1922 if (Run(cmd
, &vector
))
1927 if (list
.ParserFromLsFile(vector
))
1933 bool CGit::IsFastForward(const CString
&from
, const CString
&to
, CGitHash
* commonAncestor
)
1936 CGitHash basehash
,hash
;
1938 cmd
.Format(_T("git.exe merge-base %s %s"), FixBranchName(to
), FixBranchName(from
));
1940 if (Run(cmd
, &base
, &err
, CP_UTF8
))
1944 basehash
= base
.Trim();
1946 GetHash(hash
, from
);
1949 *commonAncestor
= basehash
;
1951 return hash
== basehash
;
1954 unsigned int CGit::Hash2int(CGitHash
&hash
)
1957 for (int i
= 0; i
< 4; ++i
)
1960 ret
|= hash
.m_hash
[i
];
1965 int CGit::RefreshGitIndex()
1967 if(g_Git
.m_IsUseGitDLL
)
1969 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
1972 return [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
1983 cmd
=_T("git.exe update-index --refresh");
1984 return Run(cmd
, &output
, CP_UTF8
);
1988 int CGit::GetOneFile(CString Refname
, CTGitPath
&path
, const CString
&outputfile
)
1990 if(g_Git
.m_IsUseGitDLL
)
1992 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
1995 g_Git
.CheckAndInitDll();
1996 CStringA ref
, patha
, outa
;
1997 ref
= CUnicodeUtils::GetMulti(Refname
, CP_UTF8
);
1998 patha
= CUnicodeUtils::GetMulti(path
.GetGitPathString(), CP_UTF8
);
1999 outa
= CUnicodeUtils::GetMulti(outputfile
, CP_UTF8
);
2000 ::DeleteFile(outputfile
);
2001 return git_checkout_file((const char*)ref
.GetBuffer(),(const char*)patha
.GetBuffer(),(const char*)outa
.GetBuffer());
2011 cmd
.Format(_T("git.exe cat-file -p %s:\"%s\""), Refname
, path
.GetGitPathString());
2012 return RunLogFile(cmd
,outputfile
);
2015 void CEnvironment::CopyProcessEnvironment()
2017 TCHAR
*p
= GetEnvironmentStrings();
2018 while(*p
!=0 || *(p
+1) !=0)
2019 this->push_back(*p
++);
2021 push_back(_T('\0'));
2022 push_back(_T('\0'));
2025 CString
CEnvironment::GetEnv(TCHAR
*name
)
2028 for (size_t i
= 0; i
< size(); ++i
)
2032 CString sname
= str
.Tokenize(_T("="),start
);
2033 if(sname
.CompareNoCase(name
) == 0)
2035 return &(*this)[i
+start
];
2042 void CEnvironment::SetEnv(TCHAR
*name
, TCHAR
* value
)
2045 for (i
= 0; i
< size(); ++i
)
2047 CString str
= &(*this)[i
];
2049 CString sname
= str
.Tokenize(_T("="),start
);
2050 if(sname
.CompareNoCase(name
) == 0)
2059 i
-= 1; // roll back terminate \0\0
2060 this->push_back(_T('\0'));
2063 CEnvironment::iterator it
;
2067 while(*it
&& i
<size())
2076 this->insert(it
,*name
++);
2081 this->insert(it
, _T('='));
2087 this->insert(it
,*value
++);
2094 int CGit::GetGitEncode(TCHAR
* configkey
)
2096 CString str
=GetConfigValue(configkey
);
2101 return CUnicodeUtils::GetCPCode(str
);
2105 int CGit::GetDiffPath(CTGitPathList
*PathList
, CGitHash
*hash1
, CGitHash
*hash2
, char *arg
)
2111 CAutoLocker
lock(g_Git
.m_critGitDllSec
);
2114 diff
= GetGitDiff();
2116 git_open_diff(&diff
, arg
);
2125 isStat
= !!strstr(arg
, "stat");
2130 ret
= git_root_diff(diff
, hash1
->m_hash
, &file
, &count
,isStat
);
2132 ret
= git_diff(diff
,hash2
->m_hash
,hash1
->m_hash
,&file
,&count
,isStat
);
2141 for (int j
= 0; j
< count
; ++j
)
2150 int mode
=0,IsBin
=0,inc
=0,dec
=0;
2151 git_get_diff_file(diff
,file
,j
,&newname
,&oldname
,
2152 &mode
,&IsBin
,&inc
,&dec
);
2154 StringAppend(&strnewname
, (BYTE
*)newname
, CP_UTF8
);
2155 StringAppend(&stroldname
, (BYTE
*)oldname
, CP_UTF8
);
2157 path
.SetFromGit(strnewname
,&stroldname
);
2158 path
.ParserAction((BYTE
)mode
);
2162 path
.m_StatAdd
=_T("-");
2163 path
.m_StatDel
=_T("-");
2167 path
.m_StatAdd
.Format(_T("%d"),inc
);
2168 path
.m_StatDel
.Format(_T("%d"),dec
);
2170 PathList
->AddPath(path
);
2172 git_diff_flush(diff
);
2175 git_close_diff(diff
);
2180 int CGit::GetShortHASHLength()
2185 CString
CGit::GetShortName(CString ref
, REF_TYPE
*out_type
)
2189 REF_TYPE type
= CGit::UNKNOWN
;
2191 if (CGit::GetShortName(str
, shortname
, _T("refs/heads/")))
2193 type
= CGit::LOCAL_BRANCH
;
2196 else if (CGit::GetShortName(str
, shortname
, _T("refs/remotes/")))
2198 type
= CGit::REMOTE_BRANCH
;
2200 else if (CGit::GetShortName(str
, shortname
, _T("refs/tags/")))
2204 else if (CGit::GetShortName(str
, shortname
, _T("refs/stash")))
2207 shortname
=_T("stash");
2209 else if (CGit::GetShortName(str
, shortname
, _T("refs/bisect/")))
2211 if (shortname
.Find(_T("good")) == 0)
2213 type
= CGit::BISECT_GOOD
;
2214 shortname
= _T("good");
2217 if (shortname
.Find(_T("bad")) == 0)
2219 type
= CGit::BISECT_BAD
;
2220 shortname
= _T("bad");
2223 else if (CGit::GetShortName(str
, shortname
, _T("refs/notes/")))
2229 type
= CGit::UNKNOWN
;
2230 shortname
= _T("Unknown");
2239 bool CGit::UsingLibGit2(int cmd
)
2241 if (cmd
>= 0 && cmd
< 32)
2242 return ((1 << cmd
) & m_IsUseLibGit2_mask
) ? true : false;