Use CUnicodeUtils::GetUnicode instead of CGit::StringAppend if possible
[TortoiseGit.git] / src / Git / Git.cpp
blob268a118d2cc840eac235cfd92f49db97a2a602f1
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2015 - 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.
20 #include "stdafx.h"
21 #include "Git.h"
22 #include "GitRev.h"
23 #include "registry.h"
24 #include "GitForWindows.h"
25 #include <map>
26 #include "UnicodeUtils.h"
27 #include "gitdll.h"
28 #include <fstream>
29 #include "FormatMessageWrapper.h"
30 #include "SmartHandle.h"
31 #include "MassiveGitTaskBase.h"
32 #include "git2/sys/filter.h"
33 #include "git2/sys/transport.h"
34 #include "../libgit2/filter-filter.h"
35 #include "../libgit2/ssh-wintunnel.h"
37 bool CGit::ms_bCygwinGit = (CRegDWORD(_T("Software\\TortoiseGit\\CygwinHack"), FALSE) == TRUE);
38 int CGit::m_LogEncode=CP_UTF8;
39 typedef CComCritSecLock<CComCriticalSection> CAutoLocker;
41 static LPCTSTR nextpath(const wchar_t* path, wchar_t* buf, size_t buflen)
43 if (path == NULL || buf == NULL || buflen == 0)
44 return NULL;
46 const wchar_t* base = path;
47 wchar_t term = (*path == L'"') ? *path++ : L';';
49 for (buflen--; *path && *path != term && buflen; buflen--)
50 *buf++ = *path++;
52 *buf = L'\0'; /* reserved a byte via initial subtract */
54 while (*path == term || *path == L';')
55 ++path;
57 return (path != base) ? path : NULL;
60 static inline BOOL FileExists(LPCTSTR lpszFileName)
62 struct _stat st;
63 return _tstat(lpszFileName, &st) == 0;
66 static CString FindFileOnPath(const CString& filename, LPCTSTR env, bool wantDirectory = false)
68 TCHAR buf[MAX_PATH] = { 0 };
70 // search in all paths defined in PATH
71 while ((env = nextpath(env, buf, MAX_PATH - 1)) != NULL && *buf)
73 TCHAR *pfin = buf + _tcslen(buf) - 1;
75 // ensure trailing slash
76 if (*pfin != _T('/') && *pfin != _T('\\'))
77 _tcscpy_s(++pfin, 2, _T("\\")); // we have enough space left, MAX_PATH-1 is used in nextpath above
79 const size_t len = _tcslen(buf);
81 if ((len + filename.GetLength()) < MAX_PATH)
82 _tcscpy_s(pfin + 1, MAX_PATH - len, filename);
83 else
84 break;
86 if (FileExists(buf))
88 if (wantDirectory)
89 pfin[1] = 0;
90 return buf;
94 return _T("");
97 static BOOL FindGitPath()
99 size_t size;
100 _tgetenv_s(&size, NULL, 0, _T("PATH"));
101 if (!size)
102 return FALSE;
104 TCHAR* env = (TCHAR*)alloca(size * sizeof(TCHAR));
105 if (!env)
106 return FALSE;
107 _tgetenv_s(&size, env, size, _T("PATH"));
109 CString gitExeDirectory = FindFileOnPath(_T("git.exe"), env, true);
110 if (!gitExeDirectory.IsEmpty())
112 CGit::ms_LastMsysGitDir = gitExeDirectory;
113 CGit::ms_LastMsysGitDir.TrimRight(_T("\\"));
114 if (CGit::ms_LastMsysGitDir.GetLength() > 4)
116 // often the msysgit\cmd folder is on the %PATH%, but
117 // that git.exe does not work, so try to guess the bin folder
118 CString binDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin\\git.exe");
119 if (FileExists(binDir))
120 CGit::ms_LastMsysGitDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin");
122 return TRUE;
125 return FALSE;
128 static CString FindExecutableOnPath(const CString& executable, LPCTSTR env)
130 CString filename = executable;
132 if (executable.GetLength() < 4 || executable.Find(_T(".exe"), executable.GetLength() - 4) != executable.GetLength() - 4)
133 filename += _T(".exe");
135 if (FileExists(filename))
136 return filename;
138 filename = FindFileOnPath(filename, env);
139 if (!filename.IsEmpty())
140 return filename;
142 return executable;
145 static bool g_bSortLogical;
146 static bool g_bSortLocalBranchesFirst;
147 static bool g_bSortTagsReversed;
148 static git_cred_acquire_cb g_Git2CredCallback;
149 static git_transport_certificate_check_cb g_Git2CheckCertificateCallback;
151 static void GetSortOptions()
153 g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_CURRENT_USER);
154 if (g_bSortLogical)
155 g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_LOCAL_MACHINE);
156 g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_CURRENT_USER);
157 if (g_bSortLocalBranchesFirst)
158 g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_LOCAL_MACHINE);
159 g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_LOCAL_MACHINE);
160 if (!g_bSortTagsReversed)
161 g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_CURRENT_USER);
164 static int LogicalComparePredicate(const CString &left, const CString &right)
166 if (g_bSortLogical)
167 return StrCmpLogicalW(left, right) < 0;
168 return StrCmpI(left, right) < 0;
171 static int LogicalCompareReversedPredicate(const CString &left, const CString &right)
173 if (g_bSortLogical)
174 return StrCmpLogicalW(left, right) > 0;
175 return StrCmpI(left, right) > 0;
178 static int LogicalCompareBranchesPredicate(const CString &left, const CString &right)
180 if (g_bSortLocalBranchesFirst)
182 int leftIsRemote = left.Find(_T("remotes/"));
183 int rightIsRemote = right.Find(_T("remotes/"));
185 if (leftIsRemote == 0 && rightIsRemote < 0)
186 return false;
187 else if (leftIsRemote < 0 && rightIsRemote == 0)
188 return true;
190 if (g_bSortLogical)
191 return StrCmpLogicalW(left, right) < 0;
192 return StrCmpI(left, right) < 0;
195 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
197 CString CGit::ms_LastMsysGitDir;
198 int CGit::ms_LastMsysGitVersion = 0;
199 CGit g_Git;
202 CGit::CGit(void)
204 GetCurrentDirectory(MAX_PATH, m_CurrentDir.GetBuffer(MAX_PATH));
205 m_CurrentDir.ReleaseBuffer();
206 m_IsGitDllInited = false;
207 m_GitDiff=0;
208 m_GitSimpleListDiff=0;
209 m_IsUseGitDLL = !!CRegDWORD(_T("Software\\TortoiseGit\\UsingGitDLL"),1);
210 m_IsUseLibGit2 = !!CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE);
211 m_IsUseLibGit2_mask = CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2_mask"), (1 << GIT_CMD_MERGE_BASE) | (1 << GIT_CMD_DELETETAGBRANCH) | (1 << GIT_CMD_GETONEFILE) | (1 << GIT_CMD_ADD));
213 SecureZeroMemory(&m_CurrentGitPi, sizeof(PROCESS_INFORMATION));
215 GetSortOptions();
216 this->m_bInitialized =false;
217 CheckMsysGitDir();
218 m_critGitDllSec.Init();
221 CGit::~CGit(void)
223 if(this->m_GitDiff)
225 git_close_diff(m_GitDiff);
226 m_GitDiff=0;
228 if(this->m_GitSimpleListDiff)
230 git_close_diff(m_GitSimpleListDiff);
231 m_GitSimpleListDiff=0;
235 bool CGit::IsBranchNameValid(const CString& branchname)
237 if (branchname.Left(1) == _T("-")) // branch names starting with a dash are discouraged when used with git.exe, see https://github.com/git/git/commit/6348624010888bd2353e5cebdc2b5329490b0f6d
238 return false;
239 if (branchname.FindOneOf(_T("\"|<>")) >= 0) // not valid on Windows
240 return false;
241 CStringA branchA = CUnicodeUtils::GetUTF8(_T("refs/heads/") + branchname);
242 return !!git_reference_is_valid_name(branchA);
245 static bool IsPowerShell(CString cmd)
247 cmd.MakeLower();
248 int powerShellPos = cmd.Find(_T("powershell"));
249 if (powerShellPos < 0)
250 return false;
252 // found the word powershell, check that it is the command and not any parameter
253 int end = cmd.GetLength();
254 if (cmd.Find(_T('"')) == 0)
256 int secondDoubleQuote = cmd.Find(_T('"'), 1);
257 if (secondDoubleQuote > 0)
258 end = secondDoubleQuote;
260 else
262 int firstSpace = cmd.Find(_T(' '));
263 if (firstSpace > 0)
264 end = firstSpace;
267 return (end - 4 - 10 == powerShellPos || end - 10 == powerShellPos); // len(".exe")==4, len("powershell")==10
270 int CGit::RunAsync(CString cmd, PROCESS_INFORMATION *piOut, HANDLE *hReadOut, HANDLE *hErrReadOut, CString *StdioFile)
272 SECURITY_ATTRIBUTES sa;
273 CAutoGeneralHandle hRead, hWrite, hReadErr, hWriteErr;
274 CAutoGeneralHandle hStdioFile;
276 sa.nLength = sizeof(SECURITY_ATTRIBUTES);
277 sa.lpSecurityDescriptor=NULL;
278 sa.bInheritHandle=TRUE;
279 if (!CreatePipe(hRead.GetPointer(), hWrite.GetPointer(), &sa, 0))
281 CString err = CFormatMessageWrapper();
282 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), err.Trim());
283 return TGIT_GIT_ERROR_OPEN_PIP;
285 if (hErrReadOut && !CreatePipe(hReadErr.GetPointer(), hWriteErr.GetPointer(), &sa, 0))
287 CString err = CFormatMessageWrapper();
288 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), err.Trim());
289 return TGIT_GIT_ERROR_OPEN_PIP;
292 if(StdioFile)
294 hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
295 &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
298 STARTUPINFO si = { 0 };
299 PROCESS_INFORMATION pi;
300 si.cb=sizeof(STARTUPINFO);
302 if (hErrReadOut)
303 si.hStdError = hWriteErr;
304 else
305 si.hStdError = hWrite;
306 if(StdioFile)
307 si.hStdOutput=hStdioFile;
308 else
309 si.hStdOutput=hWrite;
311 si.wShowWindow=SW_HIDE;
312 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
314 LPTSTR pEnv = (!m_Environment.empty()) ? &m_Environment[0]: NULL;
315 DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;
317 dwFlags |= CREATE_NEW_PROCESS_GROUP;
319 // CREATE_NEW_CONSOLE makes git (but not ssh.exe, see issue #2257) recognize that it has no console in order to launch askpass to ask for the password,
320 // DETACHED_PROCESS which was originally used here has the same effect (but works with git.exe AND ssh.exe), however, it prevents PowerShell from working (cf. issue #2143)
321 // => we keep using DETACHED_PROCESS as the default, but if cmd contains pwershell we use CREATE_NEW_CONSOLE
322 if (IsPowerShell(cmd))
323 dwFlags |= CREATE_NEW_CONSOLE;
324 else
325 dwFlags |= DETACHED_PROCESS;
327 memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));
328 memset(&pi, 0, sizeof(PROCESS_INFORMATION));
330 if (ms_bCygwinGit && cmd.Find(_T("git")) == 0)
332 cmd.Replace(_T('\\'), _T('/'));
333 cmd.Replace(_T("\""), _T("\\\""));
334 cmd = _T('"') + CGit::ms_LastMsysGitDir + _T("\\bash.exe\" -c \"/bin/") + cmd + _T('"');
336 else if(cmd.Find(_T("git")) == 0)
338 int firstSpace = cmd.Find(_T(" "));
339 if (firstSpace > 0)
340 cmd = _T('"')+CGit::ms_LastMsysGitDir+_T("\\")+ cmd.Left(firstSpace) + _T('"')+ cmd.Mid(firstSpace);
341 else
342 cmd=_T('"')+CGit::ms_LastMsysGitDir+_T("\\")+cmd+_T('"');
345 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), cmd);
346 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
348 CString err = CFormatMessageWrapper();
349 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": error while executing command: %s\n"), err.Trim());
350 return TGIT_GIT_ERROR_CREATE_PROCESS;
353 m_CurrentGitPi = pi;
355 if(piOut)
356 *piOut=pi;
357 if(hReadOut)
358 *hReadOut = hRead.Detach();
359 if(hErrReadOut)
360 *hErrReadOut = hReadErr.Detach();
361 return 0;
364 //Must use sperate function to convert ANSI str to union code string
365 //Becuase A2W use stack as internal convert buffer.
366 void CGit::StringAppend(CString *str, const BYTE *p, int code,int length)
368 if(str == NULL)
369 return ;
371 int len ;
372 if(length<0)
373 len = (int)strlen((const char*)p);
374 else
375 len=length;
376 if (len == 0)
377 return;
378 int currentContentLen = str->GetLength();
379 WCHAR * buf = str->GetBuffer(len * 4 + 1 + currentContentLen) + currentContentLen;
380 int appendedLen = MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len * 4);
381 str->ReleaseBuffer(currentContentLen + appendedLen); // no - 1 because MultiByteToWideChar is called with a fixed length (thus no nul char included)
384 // This method was originally used to check for orphaned branches
385 BOOL CGit::CanParseRev(CString ref)
387 if (ref.IsEmpty())
388 ref = _T("HEAD");
390 CString cmdout;
391 if (Run(_T("git.exe rev-parse --revs-only ") + ref, &cmdout, CP_UTF8))
393 return FALSE;
395 if(cmdout.IsEmpty())
396 return FALSE;
398 return TRUE;
401 // Checks if we have an orphaned HEAD
402 BOOL CGit::IsInitRepos()
404 CGitHash hash;
405 // handle error on reading HEAD hash as init repo
406 if (GetHash(hash, _T("HEAD")) != 0)
407 return TRUE;
408 return hash.IsEmpty() ? TRUE : FALSE;
411 DWORD WINAPI CGit::AsyncReadStdErrThread(LPVOID lpParam)
413 PASYNCREADSTDERRTHREADARGS pDataArray;
414 pDataArray = (PASYNCREADSTDERRTHREADARGS)lpParam;
416 DWORD readnumber;
417 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
418 while (ReadFile(pDataArray->fileHandle, data, CALL_OUTPUT_READ_CHUNK_SIZE, &readnumber, NULL))
420 if (pDataArray->pcall->OnOutputErrData(data,readnumber))
421 break;
424 return 0;
427 int CGit::Run(CGitCall* pcall)
429 PROCESS_INFORMATION pi;
430 CAutoGeneralHandle hRead, hReadErr;
431 if (RunAsync(pcall->GetCmd(), &pi, hRead.GetPointer(), hReadErr.GetPointer()))
432 return TGIT_GIT_ERROR_CREATE_PROCESS;
434 CAutoGeneralHandle piThread(pi.hThread);
435 CAutoGeneralHandle piProcess(pi.hProcess);
437 ASYNCREADSTDERRTHREADARGS threadArguments;
438 threadArguments.fileHandle = hReadErr;
439 threadArguments.pcall = pcall;
440 CAutoGeneralHandle thread = CreateThread(NULL, 0, AsyncReadStdErrThread, &threadArguments, 0, NULL);
442 DWORD readnumber;
443 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
444 bool bAborted=false;
445 while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
447 // TODO: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
448 if(!bAborted)//For now, flush output when command aborted.
449 if(pcall->OnOutputData(data,readnumber))
450 bAborted=true;
452 if(!bAborted)
453 pcall->OnEnd();
455 if (thread)
456 WaitForSingleObject(thread, INFINITE);
458 WaitForSingleObject(pi.hProcess, INFINITE);
459 DWORD exitcode =0;
461 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
463 CString err = CFormatMessageWrapper();
464 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), err.Trim());
465 return TGIT_GIT_ERROR_GET_EXIT_CODE;
467 else
468 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);
470 return exitcode;
472 class CGitCall_ByteVector : public CGitCall
474 public:
475 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector, BYTE_VECTOR* pvectorErr = NULL):CGitCall(cmd),m_pvector(pvector),m_pvectorErr(pvectorErr){}
476 virtual bool OnOutputData(const BYTE* data, size_t size)
478 if (!m_pvector || size == 0)
479 return false;
480 size_t oldsize=m_pvector->size();
481 m_pvector->resize(m_pvector->size()+size);
482 memcpy(&*(m_pvector->begin()+oldsize),data,size);
483 return false;
485 virtual bool OnOutputErrData(const BYTE* data, size_t size)
487 if (!m_pvectorErr || size == 0)
488 return false;
489 size_t oldsize = m_pvectorErr->size();
490 m_pvectorErr->resize(m_pvectorErr->size() + size);
491 memcpy(&*(m_pvectorErr->begin() + oldsize), data, size);
492 return false;
494 BYTE_VECTOR* m_pvector;
495 BYTE_VECTOR* m_pvectorErr;
498 int CGit::Run(CString cmd,BYTE_VECTOR *vector, BYTE_VECTOR *vectorErr)
500 CGitCall_ByteVector call(cmd, vector, vectorErr);
501 return Run(&call);
503 int CGit::Run(CString cmd, CString* output, int code)
505 CString err;
506 int ret;
507 ret = Run(cmd, output, &err, code);
509 if (output && !err.IsEmpty())
511 if (!output->IsEmpty())
512 *output += _T("\n");
513 *output += err;
516 return ret;
518 int CGit::Run(CString cmd, CString* output, CString* outputErr, int code)
520 BYTE_VECTOR vector, vectorErr;
521 int ret;
522 if (outputErr)
523 ret = Run(cmd, &vector, &vectorErr);
524 else
525 ret = Run(cmd, &vector);
527 vector.push_back(0);
528 StringAppend(output, &(vector[0]), code);
530 if (outputErr)
532 vectorErr.push_back(0);
533 StringAppend(outputErr, &(vectorErr[0]), code);
536 return ret;
539 class CGitCallCb : public CGitCall
541 public:
542 CGitCallCb(CString cmd, const GitReceiverFunc& recv): CGitCall(cmd), m_recv(recv) {}
544 virtual bool OnOutputData(const BYTE* data, size_t size) override
546 // Add data
547 if (size == 0)
548 return false;
549 int oldEndPos = m_buffer.GetLength();
550 memcpy(m_buffer.GetBufferSetLength(oldEndPos + (int)size) + oldEndPos, data, size);
551 m_buffer.ReleaseBuffer(oldEndPos + (int)size);
553 // Break into lines and feed to m_recv
554 int eolPos;
555 while ((eolPos = m_buffer.Find('\n')) >= 0)
557 m_recv(m_buffer.Left(eolPos));
558 m_buffer = m_buffer.Mid(eolPos + 1);
560 return false;
563 virtual bool OnOutputErrData(const BYTE*, size_t) override
565 return false; // Ignore error output for now
568 virtual void OnEnd() override
570 if (!m_buffer.IsEmpty())
571 m_recv(m_buffer);
572 m_buffer.Empty(); // Just for sure
575 private:
576 GitReceiverFunc m_recv;
577 CStringA m_buffer;
580 int CGit::Run(CString cmd, const GitReceiverFunc& recv)
582 CGitCallCb call(cmd, recv);
583 return Run(&call);
586 CString CGit::GetUserName(void)
588 CEnvironment env;
589 env.CopyProcessEnvironment();
590 CString envname = env.GetEnv(_T("GIT_AUTHOR_NAME"));
591 if (!envname.IsEmpty())
592 return envname;
593 return GetConfigValue(L"user.name");
595 CString CGit::GetUserEmail(void)
597 CEnvironment env;
598 env.CopyProcessEnvironment();
599 CString envmail = env.GetEnv(_T("GIT_AUTHOR_EMAIL"));
600 if (!envmail.IsEmpty())
601 return envmail;
603 return GetConfigValue(L"user.email");
606 CString CGit::GetConfigValue(const CString& name)
608 CString configValue;
609 int start = 0;
610 if(this->m_IsUseGitDLL)
612 CAutoLocker lock(g_Git.m_critGitDllSec);
616 CheckAndInitDll();
617 }catch(...)
620 CStringA key, value;
621 key = CUnicodeUtils::GetUTF8(name);
625 if (git_get_config(key, value.GetBufferSetLength(4096), 4096))
626 return CString();
628 catch (const char *msg)
630 ::MessageBox(NULL, _T("Could not get config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
631 return CString();
634 StringAppend(&configValue, (BYTE*)(LPCSTR)value);
635 return configValue.Tokenize(_T("\n"),start);
637 else
639 CString cmd;
640 cmd.Format(L"git.exe config %s", name);
641 Run(cmd, &configValue, nullptr, CP_UTF8);
642 return configValue.Tokenize(_T("\n"),start);
646 bool CGit::GetConfigValueBool(const CString& name)
648 CString configValue = GetConfigValue(name);
649 configValue.MakeLower();
650 configValue.Trim();
651 if(configValue == _T("true") || configValue == _T("on") || configValue == _T("yes") || StrToInt(configValue) != 0)
652 return true;
653 else
654 return false;
657 int CGit::GetConfigValueInt32(const CString& name, int def)
659 CString configValue = GetConfigValue(name);
660 int value = def;
661 if (!git_config_parse_int32(&value, CUnicodeUtils::GetUTF8(configValue)))
662 return value;
663 return def;
666 int CGit::SetConfigValue(const CString& key, const CString& value, CONFIG_TYPE type)
668 if(this->m_IsUseGitDLL)
670 CAutoLocker lock(g_Git.m_critGitDllSec);
674 CheckAndInitDll();
676 }catch(...)
679 CStringA keya, valuea;
680 keya = CUnicodeUtils::GetMulti(key, CP_UTF8);
681 valuea = CUnicodeUtils::GetUTF8(value);
685 return [=]() { return get_set_config(keya, valuea, type); }();
687 catch (const char *msg)
689 ::MessageBox(NULL, _T("Could not set config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
690 return -1;
693 else
695 CString cmd;
696 CString option;
697 switch(type)
699 case CONFIG_GLOBAL:
700 option = _T("--global");
701 break;
702 case CONFIG_SYSTEM:
703 option = _T("--system");
704 break;
705 default:
706 break;
708 cmd.Format(_T("git.exe config %s %s \"%s\""), option, key, value);
709 CString out;
710 if (Run(cmd, &out, nullptr, CP_UTF8))
712 return -1;
715 return 0;
718 int CGit::UnsetConfigValue(const CString& key, CONFIG_TYPE type)
720 if(this->m_IsUseGitDLL)
722 CAutoLocker lock(g_Git.m_critGitDllSec);
726 CheckAndInitDll();
727 }catch(...)
730 CStringA keya;
731 keya = CUnicodeUtils::GetMulti(key, CP_UTF8);
735 return [=]() { return get_set_config(keya, nullptr, type); }();
737 catch (const char *msg)
739 ::MessageBox(NULL, _T("Could not unset config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
740 return -1;
743 else
745 CString cmd;
746 CString option;
747 switch(type)
749 case CONFIG_GLOBAL:
750 option = _T("--global");
751 break;
752 case CONFIG_SYSTEM:
753 option = _T("--system");
754 break;
755 default:
756 break;
758 cmd.Format(_T("git.exe config %s --unset %s"), option, key);
759 CString out;
760 if (Run(cmd, &out, nullptr, CP_UTF8))
762 return -1;
765 return 0;
768 CString CGit::GetCurrentBranch(bool fallback)
770 CString output;
771 //Run(_T("git.exe branch"),&branch);
773 int result = GetCurrentBranchFromFile(m_CurrentDir, output, fallback);
774 if (result != 0 && ((result == 1 && !fallback) || result != 1))
776 return _T("(no branch)");
778 else
779 return output;
783 void CGit::GetRemoteTrackedBranch(const CString& localBranch, CString& pullRemote, CString& pullBranch)
785 if (localBranch.IsEmpty())
786 return;
788 CString configName;
789 configName.Format(L"branch.%s.remote", localBranch);
790 pullRemote = GetConfigValue(configName);
792 //Select pull-branch from current branch
793 configName.Format(L"branch.%s.merge", localBranch);
794 pullBranch = StripRefName(GetConfigValue(configName));
797 void CGit::GetRemoteTrackedBranchForHEAD(CString& remote, CString& branch)
799 CString refName;
800 if (GetCurrentBranchFromFile(m_CurrentDir, refName))
801 return;
802 GetRemoteTrackedBranch(StripRefName(refName), remote, branch);
805 CString CGit::GetFullRefName(const CString& shortRefName)
807 CString refName;
808 CString cmd;
809 cmd.Format(L"git.exe rev-parse --symbolic-full-name %s", shortRefName);
810 if (Run(cmd, &refName, NULL, CP_UTF8) != 0)
811 return CString();//Error
812 int iStart = 0;
813 return refName.Tokenize(L"\n", iStart);
816 CString CGit::StripRefName(CString refName)
818 if(wcsncmp(refName, L"refs/heads/", 11) == 0)
819 refName = refName.Mid(11);
820 else if(wcsncmp(refName, L"refs/", 5) == 0)
821 refName = refName.Mid(5);
822 int start =0;
823 return refName.Tokenize(_T("\n"),start);
826 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut, bool fallback)
828 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
830 if ( sProjectRoot.IsEmpty() )
831 return -1;
833 CString sDotGitPath;
834 if (!GitAdminDir::GetAdminDirPath(sProjectRoot, sDotGitPath))
835 return -1;
837 CString sHeadFile = sDotGitPath + _T("HEAD");
839 FILE *pFile;
840 _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));
842 if (!pFile)
844 return -1;
847 char s[256] = {0};
848 fgets(s, sizeof(s), pFile);
850 fclose(pFile);
852 const char *pfx = "ref: refs/heads/";
853 const int len = 16;//strlen(pfx)
855 if ( !strncmp(s, pfx, len) )
857 //# We're on a branch. It might not exist. But
858 //# HEAD looks good enough to be a branch.
859 CStringA utf8Branch(s + len);
860 sBranchOut = CUnicodeUtils::GetUnicode(utf8Branch);
861 sBranchOut.TrimRight(_T(" \r\n\t"));
863 if ( sBranchOut.IsEmpty() )
864 return -1;
866 else if (fallback)
868 CStringA utf8Hash(s);
869 CString unicodeHash = CUnicodeUtils::GetUnicode(utf8Hash);
870 unicodeHash.TrimRight(_T(" \r\n\t"));
871 if (CGitHash::IsValidSHA1(unicodeHash))
872 sBranchOut = unicodeHash;
873 else
874 //# Assume this is a detached head.
875 sBranchOut = _T("HEAD");
876 return 1;
878 else
880 //# Assume this is a detached head.
881 sBranchOut = "HEAD";
883 return 1;
886 return 0;
889 int CGit::BuildOutputFormat(CString &format,bool IsFull)
891 CString log;
892 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
893 format += log;
894 if(IsFull)
896 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
897 format += log;
898 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
899 format += log;
900 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
901 format += log;
902 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
903 format += log;
904 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
905 format += log;
906 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
907 format += log;
908 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
909 format += log;
912 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
913 format += log;
914 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
915 format += log;
916 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
917 format += log;
919 if(IsFull)
921 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
922 format += log;
924 return 0;
927 CString CGit::GetLogCmd(const CString &range, const CTGitPath *path, int count, int mask, bool paramonly,
928 CFilterData *Filter)
930 CString cmd;
931 CString num;
932 CString since;
934 CString file = _T(" --");
936 if(path)
937 file.Format(_T(" -- \"%s\""),path->GetGitPathString());
939 if(count>0)
940 num.Format(_T("-n%d"),count);
942 CString param;
944 if(mask& LOG_INFO_STAT )
945 param += _T(" --numstat ");
946 if(mask& LOG_INFO_FILESTATE)
947 param += _T(" --raw ");
949 if(mask& LOG_INFO_FULLHISTORY)
950 param += _T(" --full-history ");
952 if(mask& LOG_INFO_BOUNDARY)
953 param += _T(" --left-right --boundary ");
955 if(mask& CGit::LOG_INFO_ALL_BRANCH)
956 param += _T(" --all ");
958 if(mask & CGit::LOG_INFO_LOCAL_BRANCHES)
959 param += _T(" --branches ");
961 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
962 param += _T(" -C ");
964 if(mask& CGit::LOG_INFO_DETECT_RENAME )
965 param += _T(" -M ");
967 if(mask& CGit::LOG_INFO_FIRST_PARENT )
968 param += _T(" --first-parent ");
970 if(mask& CGit::LOG_INFO_NO_MERGE )
971 param += _T(" --no-merges ");
973 if(mask& CGit::LOG_INFO_FOLLOW)
974 param += _T(" --follow ");
976 if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
977 param += _T(" -c ");
979 if(mask& CGit::LOG_INFO_FULL_DIFF)
980 param += _T(" --full-diff ");
982 if(mask& CGit::LOG_INFO_SIMPILFY_BY_DECORATION)
983 param += _T(" --simplify-by-decoration ");
985 param += range;
987 CString st1,st2;
989 if( Filter && (Filter->m_From != -1))
991 st1.Format(_T(" --max-age=%I64u "), Filter->m_From);
992 param += st1;
995 if( Filter && (Filter->m_To != -1))
997 st2.Format(_T(" --min-age=%I64u "), Filter->m_To);
998 param += st2;
1001 bool isgrep = false;
1002 if( Filter && (!Filter->m_Author.IsEmpty()))
1004 st1.Format(_T(" --author=\"%s\"" ),Filter->m_Author);
1005 param += st1;
1006 isgrep = true;
1009 if( Filter && (!Filter->m_Committer.IsEmpty()))
1011 st1.Format(_T(" --committer=\"%s\"" ),Filter->m_Author);
1012 param += st1;
1013 isgrep = true;
1016 if( Filter && (!Filter->m_MessageFilter.IsEmpty()))
1018 st1.Format(_T(" --grep=\"%s\"" ),Filter->m_MessageFilter);
1019 param += st1;
1020 isgrep = true;
1023 if(Filter && isgrep)
1025 if(!Filter->m_IsRegex)
1026 param += _T(" --fixed-strings ");
1028 param += _T(" --regexp-ignore-case --extended-regexp ");
1031 DWORD logOrderBy = CRegDWORD(_T("Software\\TortoiseGit\\LogOrderBy"), LOG_ORDER_TOPOORDER);
1032 if (logOrderBy == LOG_ORDER_TOPOORDER)
1033 param += _T(" --topo-order");
1034 else if (logOrderBy == LOG_ORDER_DATEORDER)
1035 param += _T(" --date-order");
1037 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
1038 cmd.Format(_T("--ignore-this-parameter %s -z %s --parents "), num, param);
1039 else
1041 CString log;
1042 BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
1043 cmd.Format(_T("git.exe log %s -z %s --parents --pretty=format:\"%s\""),
1044 num,param,log);
1047 cmd += file;
1049 return cmd;
1051 #define BUFSIZE 512
1052 void GetTempPath(CString &path)
1054 TCHAR lpPathBuffer[BUFSIZE] = { 0 };
1055 DWORD dwRetVal;
1056 DWORD dwBufSize=BUFSIZE;
1057 dwRetVal = GetTortoiseGitTempPath(dwBufSize, // length of the buffer
1058 lpPathBuffer); // buffer for path
1059 if (dwRetVal > dwBufSize || (dwRetVal == 0))
1061 path=_T("");
1063 path.Format(_T("%s"),lpPathBuffer);
1065 CString GetTempFile()
1067 TCHAR lpPathBuffer[BUFSIZE] = { 0 };
1068 DWORD dwRetVal;
1069 DWORD dwBufSize=BUFSIZE;
1070 TCHAR szTempName[BUFSIZE] = { 0 };
1071 UINT uRetVal;
1073 dwRetVal = GetTortoiseGitTempPath(dwBufSize, // length of the buffer
1074 lpPathBuffer); // buffer for path
1075 if (dwRetVal > dwBufSize || (dwRetVal == 0))
1077 return _T("");
1079 // Create a temporary file.
1080 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
1081 TEXT("Patch"), // temp file name prefix
1082 0, // create unique name
1083 szTempName); // buffer for name
1086 if (uRetVal == 0)
1088 return _T("");
1091 return CString(szTempName);
1095 DWORD GetTortoiseGitTempPath(DWORD nBufferLength, LPTSTR lpBuffer)
1097 DWORD result = ::GetTempPath(nBufferLength, lpBuffer);
1098 if (result == 0) return 0;
1099 if (lpBuffer == NULL || (result + 13 > nBufferLength))
1101 if (lpBuffer)
1102 lpBuffer[0] = '\0';
1103 return result + 13;
1106 _tcscat_s(lpBuffer, nBufferLength, _T("TortoiseGit\\"));
1107 CreateDirectory(lpBuffer, NULL);
1109 return result + 13;
1112 int CGit::RunLogFile(CString cmd, const CString &filename, CString *stdErr)
1114 STARTUPINFO si;
1115 PROCESS_INFORMATION pi;
1116 si.cb=sizeof(STARTUPINFO);
1117 GetStartupInfo(&si);
1119 SECURITY_ATTRIBUTES psa={sizeof(psa),NULL,TRUE};;
1120 psa.bInheritHandle=TRUE;
1122 HANDLE hReadErr, hWriteErr;
1123 if (!CreatePipe(&hReadErr, &hWriteErr, &psa, 0))
1125 CString err = CFormatMessageWrapper();
1126 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), err.Trim());
1127 return TGIT_GIT_ERROR_OPEN_PIP;
1130 HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
1131 &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
1133 if (houtfile == INVALID_HANDLE_VALUE)
1135 CString err = CFormatMessageWrapper();
1136 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), err.Trim());
1137 CloseHandle(hReadErr);
1138 CloseHandle(hWriteErr);
1139 return TGIT_GIT_ERROR_OPEN_PIP;
1142 si.wShowWindow = SW_HIDE;
1143 si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
1144 si.hStdOutput = houtfile;
1145 si.hStdError = hWriteErr;
1147 LPTSTR pEnv = (!m_Environment.empty()) ? &m_Environment[0]: NULL;
1148 DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;
1150 if(cmd.Find(_T("git")) == 0)
1151 cmd=CGit::ms_LastMsysGitDir+_T("\\")+cmd;
1153 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), cmd);
1154 if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
1156 CString err = CFormatMessageWrapper();
1157 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": failed to create Process: %s\n"), err.Trim());
1158 stdErr = &err;
1159 CloseHandle(hReadErr);
1160 CloseHandle(hWriteErr);
1161 CloseHandle(houtfile);
1162 return TGIT_GIT_ERROR_CREATE_PROCESS;
1165 BYTE_VECTOR stderrVector;
1166 CGitCall_ByteVector pcall(L"", nullptr, &stderrVector);
1167 HANDLE thread;
1168 ASYNCREADSTDERRTHREADARGS threadArguments;
1169 threadArguments.fileHandle = hReadErr;
1170 threadArguments.pcall = &pcall;
1171 thread = CreateThread(nullptr, 0, AsyncReadStdErrThread, &threadArguments, 0, nullptr);
1173 WaitForSingleObject(pi.hProcess,INFINITE);
1175 CloseHandle(hWriteErr);
1176 CloseHandle(hReadErr);
1178 if (thread)
1179 WaitForSingleObject(thread, INFINITE);
1181 stderrVector.push_back(0);
1182 StringAppend(stdErr, &(stderrVector[0]), CP_UTF8);
1184 DWORD exitcode = 0;
1185 if (!GetExitCodeProcess(pi.hProcess, &exitcode))
1187 CString err = CFormatMessageWrapper();
1188 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), err.Trim());
1189 return TGIT_GIT_ERROR_GET_EXIT_CODE;
1191 else
1192 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);
1194 CloseHandle(pi.hThread);
1195 CloseHandle(pi.hProcess);
1196 CloseHandle(houtfile);
1197 return exitcode;
1200 git_repository * CGit::GetGitRepository() const
1202 git_repository * repo = nullptr;
1203 git_repository_open(&repo, GetGitPathStringA(m_CurrentDir));
1204 return repo;
1207 int CGit::GetHash(git_repository * repo, CGitHash &hash, const CString& friendname, bool skipFastCheck /* = false */)
1209 ATLASSERT(repo);
1211 // no need to parse a ref if it's already a 40-byte hash
1212 if (!skipFastCheck && CGitHash::IsValidSHA1(friendname))
1214 hash = CGitHash(friendname);
1215 return 0;
1218 int isHeadOrphan = git_repository_head_unborn(repo);
1219 if (isHeadOrphan != 0)
1221 hash.Empty();
1222 if (isHeadOrphan == 1)
1223 return 0;
1224 else
1225 return -1;
1228 CAutoObject gitObject;
1229 if (git_revparse_single(gitObject.GetPointer(), repo, CUnicodeUtils::GetUTF8(friendname)))
1230 return -1;
1232 const git_oid * oid = git_object_id(gitObject);
1233 if (!oid)
1234 return -1;
1236 hash = CGitHash((char *)oid->id);
1238 return 0;
1241 int CGit::GetHash(CGitHash &hash, const CString& friendname)
1243 // no need to parse a ref if it's already a 40-byte hash
1244 if (CGitHash::IsValidSHA1(friendname))
1246 hash = CGitHash(friendname);
1247 return 0;
1250 if (m_IsUseLibGit2)
1252 CAutoRepository repo(GetGitRepository());
1253 if (!repo)
1254 return -1;
1256 return GetHash(repo, hash, friendname, true);
1258 else
1260 CString cmd;
1261 cmd.Format(_T("git.exe rev-parse %s" ),FixBranchName(friendname));
1262 gitLastErr.Empty();
1263 int ret = Run(cmd, &gitLastErr, NULL, CP_UTF8);
1264 hash = CGitHash(gitLastErr.Trim());
1265 if (ret == 0)
1266 gitLastErr.Empty();
1267 return ret;
1271 int CGit::GetInitAddList(CTGitPathList &outputlist)
1273 CString cmd;
1274 BYTE_VECTOR cmdout;
1276 cmd=_T("git.exe ls-files -s -t -z");
1277 outputlist.Clear();
1278 if (Run(cmd, &cmdout))
1279 return -1;
1281 if (outputlist.ParserFromLsFile(cmdout))
1282 return -1;
1283 for(int i = 0; i < outputlist.GetCount(); ++i)
1284 const_cast<CTGitPath&>(outputlist[i]).m_Action = CTGitPath::LOGACTIONS_ADDED;
1286 return 0;
1288 int CGit::GetCommitDiffList(const CString &rev1, const CString &rev2, CTGitPathList &outputlist, bool ignoreSpaceAtEol, bool ignoreSpaceChange, bool ignoreAllSpace , bool ignoreBlankLines)
1290 CString cmd;
1291 CString ignore;
1292 if (ignoreSpaceAtEol)
1293 ignore += _T(" --ignore-space-at-eol");
1294 if (ignoreSpaceChange)
1295 ignore += _T(" --ignore-space-change");
1296 if (ignoreAllSpace)
1297 ignore += _T(" --ignore-all-space");
1298 if (ignoreBlankLines)
1299 ignore += _T(" --ignore-blank-lines");
1301 if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
1303 //rev1=+_T("");
1304 if(rev1 == GIT_REV_ZERO)
1305 cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s %s --"), ignore, rev2);
1306 else
1307 cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s %s --"), ignore, rev1);
1309 else
1311 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s %s --"), ignore, rev2, rev1);
1314 BYTE_VECTOR out;
1315 if (Run(cmd, &out))
1316 return -1;
1318 outputlist.ParserFromLog(out);
1320 return 0;
1323 int addto_list_each_ref_fn(const char *refname, const unsigned char * /*sha1*/, int /*flags*/, void *cb_data)
1325 STRING_VECTOR *list = (STRING_VECTOR*)cb_data;
1326 list->push_back(CUnicodeUtils::GetUnicode(refname));
1327 return 0;
1330 int CGit::GetTagList(STRING_VECTOR &list)
1332 if (this->m_IsUseLibGit2)
1334 CAutoRepository repo(GetGitRepository());
1335 if (!repo)
1336 return -1;
1338 CAutoStrArray tag_names;
1340 if (git_tag_list(tag_names, repo))
1341 return -1;
1343 for (size_t i = 0; i < tag_names->count; ++i)
1345 CStringA tagName(tag_names->strings[i]);
1346 list.push_back(CUnicodeUtils::GetUnicode(tagName));
1349 std::sort(list.begin(), list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1351 return 0;
1353 else
1355 CString cmd, output;
1356 cmd=_T("git.exe tag -l");
1357 int ret = Run(cmd, &output, NULL, CP_UTF8);
1358 if(!ret)
1360 int pos=0;
1361 CString one;
1362 while( pos>=0 )
1364 one=output.Tokenize(_T("\n"),pos);
1365 if (!one.IsEmpty())
1366 list.push_back(one);
1368 std::sort(list.begin(), list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1370 return ret;
1374 CString CGit::GetGitLastErr(const CString& msg)
1376 if (this->m_IsUseLibGit2)
1377 return GetLibGit2LastErr(msg);
1378 else if (gitLastErr.IsEmpty())
1379 return msg + _T("\nUnknown git.exe error.");
1380 else
1382 CString lastError = gitLastErr;
1383 gitLastErr.Empty();
1384 return msg + _T("\n") + lastError;
1388 CString CGit::GetGitLastErr(const CString& msg, LIBGIT2_CMD cmd)
1390 if (UsingLibGit2(cmd))
1391 return GetLibGit2LastErr(msg);
1392 else if (gitLastErr.IsEmpty())
1393 return msg + _T("\nUnknown git.exe error.");
1394 else
1396 CString lastError = gitLastErr;
1397 gitLastErr.Empty();
1398 return msg + _T("\n") + lastError;
1402 CString CGit::GetLibGit2LastErr()
1404 const git_error *libgit2err = giterr_last();
1405 if (libgit2err)
1407 CString lastError = CUnicodeUtils::GetUnicode(CStringA(libgit2err->message));
1408 giterr_clear();
1409 return _T("libgit2 returned: ") + lastError;
1411 else
1412 return _T("An error occoured in libgit2, but no message is available.");
1415 CString CGit::GetLibGit2LastErr(const CString& msg)
1417 if (!msg.IsEmpty())
1418 return msg + _T("\n") + GetLibGit2LastErr();
1419 return GetLibGit2LastErr();
1422 CString CGit::FixBranchName_Mod(CString& branchName)
1424 if(branchName == "FETCH_HEAD")
1425 branchName = DerefFetchHead();
1426 return branchName;
1429 CString CGit::FixBranchName(const CString& branchName)
1431 CString tempBranchName = branchName;
1432 FixBranchName_Mod(tempBranchName);
1433 return tempBranchName;
1436 bool CGit::IsBranchTagNameUnique(const CString& name)
1438 if (m_IsUseLibGit2)
1440 CAutoRepository repo(GetGitRepository());
1441 if (!repo)
1442 return true; // TODO: optimize error reporting
1444 CAutoReference tagRef;
1445 if (git_reference_lookup(tagRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/tags/" + name)))
1446 return true;
1448 CAutoReference branchRef;
1449 if (git_reference_lookup(branchRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/heads/" + name)))
1450 return true;
1452 return false;
1454 // else
1455 CString output;
1457 CString cmd;
1458 cmd.Format(_T("git.exe show-ref --tags --heads refs/heads/%s refs/tags/%s"), name, name);
1459 int ret = Run(cmd, &output, NULL, CP_UTF8);
1460 if (!ret)
1462 int i = 0, pos = 0;
1463 while (pos >= 0)
1465 if (!output.Tokenize(_T("\n"), pos).IsEmpty())
1466 ++i;
1468 if (i >= 2)
1469 return false;
1472 return true;
1475 bool CGit::BranchTagExists(const CString& name, bool isBranch /*= true*/)
1477 if (m_IsUseLibGit2)
1479 CAutoRepository repo(GetGitRepository());
1480 if (!repo)
1481 return false; // TODO: optimize error reporting
1483 CString prefix;
1484 if (isBranch)
1485 prefix = _T("refs/heads/");
1486 else
1487 prefix = _T("refs/tags/");
1489 CAutoReference ref;
1490 if (git_reference_lookup(ref.GetPointer(), repo, CUnicodeUtils::GetUTF8(prefix + name)))
1491 return false;
1493 return true;
1495 // else
1496 CString cmd, output;
1498 cmd = _T("git.exe show-ref ");
1499 if (isBranch)
1500 cmd += _T("--heads ");
1501 else
1502 cmd += _T("--tags ");
1504 cmd += _T("refs/heads/") + name;
1505 cmd += _T(" refs/tags/") + name;
1507 int ret = Run(cmd, &output, NULL, CP_UTF8);
1508 if (!ret)
1510 if (!output.IsEmpty())
1511 return true;
1514 return false;
1517 CString CGit::DerefFetchHead()
1519 CString dotGitPath;
1520 GitAdminDir::GetAdminDirPath(m_CurrentDir, dotGitPath);
1521 std::ifstream fetchHeadFile((dotGitPath + L"FETCH_HEAD").GetString(), std::ios::in | std::ios::binary);
1522 int forMergeLineCount = 0;
1523 std::string line;
1524 std::string hashToReturn;
1525 while(getline(fetchHeadFile, line))
1527 //Tokenize this line
1528 std::string::size_type prevPos = 0;
1529 std::string::size_type pos = line.find('\t');
1530 if(pos == std::string::npos) continue; //invalid line
1532 std::string hash = line.substr(0, pos);
1533 ++pos; prevPos = pos; pos = line.find('\t', pos); if(pos == std::string::npos) continue;
1535 bool forMerge = pos == prevPos;
1536 ++pos; prevPos = pos; pos = line.size(); if(pos == std::string::npos) continue;
1538 std::string remoteBranch = line.substr(prevPos, pos - prevPos);
1540 //Process this line
1541 if(forMerge)
1543 hashToReturn = hash;
1544 ++forMergeLineCount;
1545 if(forMergeLineCount > 1)
1546 return L""; //More then 1 branch to merge found. Octopus merge needed. Cannot pick single ref from FETCH_HEAD
1550 return CUnicodeUtils::GetUnicode(hashToReturn.c_str());
1553 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
1555 int ret = 0;
1556 CString cur;
1557 if (m_IsUseLibGit2)
1559 CAutoRepository repo(GetGitRepository());
1560 if (!repo)
1561 return -1;
1563 if (git_repository_head_detached(repo) == 1)
1564 cur = _T("(detached from ");
1566 if ((type & (BRANCH_LOCAL | BRANCH_REMOTE)) != 0)
1568 git_branch_t flags = GIT_BRANCH_LOCAL;
1569 if ((type & BRANCH_LOCAL) && (type & BRANCH_REMOTE))
1570 flags = GIT_BRANCH_ALL;
1571 else if (type & BRANCH_REMOTE)
1572 flags = GIT_BRANCH_REMOTE;
1574 CAutoBranchIterator it;
1575 if (git_branch_iterator_new(it.GetPointer(), repo, flags))
1576 return -1;
1578 git_reference * ref = nullptr;
1579 git_branch_t branchType;
1580 while (git_branch_next(&ref, &branchType, it) == 0)
1582 CAutoReference autoRef(ref);
1583 const char * name = nullptr;
1584 if (git_branch_name(&name, ref))
1585 continue;
1587 CString branchname = CUnicodeUtils::GetUnicode(name);
1588 if (branchType & GIT_BRANCH_REMOTE)
1589 list.push_back(_T("remotes/") + branchname);
1590 else
1592 if (git_branch_is_head(ref))
1593 cur = branchname;
1594 list.push_back(branchname);
1599 else
1601 CString cmd, output;
1602 cmd = _T("git.exe branch --no-color");
1604 if ((type & BRANCH_ALL) == BRANCH_ALL)
1605 cmd += _T(" -a");
1606 else if (type & BRANCH_REMOTE)
1607 cmd += _T(" -r");
1609 ret = Run(cmd, &output, nullptr, CP_UTF8);
1610 if (!ret)
1612 int pos = 0;
1613 CString one;
1614 while (pos >= 0)
1616 one = output.Tokenize(_T("\n"), pos);
1617 one.Trim(L" \r\n\t");
1618 if (one.Find(L" -> ") >= 0 || one.IsEmpty())
1619 continue; // skip something like: refs/origin/HEAD -> refs/origin/master
1620 if (one[0] == _T('*'))
1622 one = one.Mid(2);
1623 cur = one;
1625 if (one.Left(10) != _T("(no branch") && one.Left(15) != _T("(detached from "))
1626 list.push_back(one);
1631 if(type & BRANCH_FETCH_HEAD && !DerefFetchHead().IsEmpty())
1632 list.push_back(L"FETCH_HEAD");
1634 std::sort(list.begin(), list.end(), LogicalCompareBranchesPredicate);
1636 if (current && cur.Left(10) != _T("(no branch") && cur.Left(15) != _T("(detached from "))
1638 for (unsigned int i = 0; i < list.size(); ++i)
1640 if (list[i] == cur)
1642 *current = i;
1643 break;
1648 return ret;
1651 int CGit::GetRemoteList(STRING_VECTOR &list)
1653 if (this->m_IsUseLibGit2)
1655 CAutoRepository repo(GetGitRepository());
1656 if (!repo)
1657 return -1;
1659 CAutoStrArray remotes;
1660 if (git_remote_list(remotes, repo))
1661 return -1;
1663 for (size_t i = 0; i < remotes->count; ++i)
1665 CStringA remote(remotes->strings[i]);
1666 list.push_back(CUnicodeUtils::GetUnicode(remote));
1669 std::sort(list.begin(), list.end());
1671 return 0;
1673 else
1675 int ret;
1676 CString cmd, output;
1677 cmd=_T("git.exe remote");
1678 ret = Run(cmd, &output, NULL, CP_UTF8);
1679 if(!ret)
1681 int pos=0;
1682 CString one;
1683 while( pos>=0 )
1685 one=output.Tokenize(_T("\n"),pos);
1686 if (!one.IsEmpty())
1687 list.push_back(one);
1690 return ret;
1694 int CGit::GetRemoteTags(const CString& remote, STRING_VECTOR& list)
1696 if (UsingLibGit2(GIT_CMD_FETCH))
1698 CAutoRepository repo(GetGitRepository());
1699 if (!repo)
1700 return -1;
1702 CStringA remoteA = CUnicodeUtils::GetUTF8(remote);
1703 CAutoRemote remote;
1704 if (git_remote_lookup(remote.GetPointer(), repo, remoteA) < 0)
1705 return -1;
1707 git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
1708 callbacks.credentials = g_Git2CredCallback;
1709 callbacks.certificate_check = g_Git2CheckCertificateCallback;
1710 git_remote_set_callbacks(remote, &callbacks);
1711 if (git_remote_connect(remote, GIT_DIRECTION_FETCH) < 0)
1712 return -1;
1714 const git_remote_head** heads = nullptr;
1715 size_t size = 0;
1716 if (git_remote_ls(&heads, &size, remote) < 0)
1717 return -1;
1719 for (size_t i = 0; i < size; i++)
1721 CString ref = CUnicodeUtils::GetUnicode(heads[i]->name);
1722 CString shortname;
1723 if (!GetShortName(ref, shortname, _T("refs/tags/")))
1724 continue;
1725 // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1726 if (shortname.Find(_T("^{}")) >= 1)
1727 continue;
1728 list.push_back(shortname);
1730 std::sort(list.begin(), list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1731 return 0;
1734 CString cmd, out, err;
1735 cmd.Format(_T("git.exe ls-remote -t \"%s\""), remote);
1736 if (Run(cmd, &out, &err, CP_UTF8))
1738 MessageBox(NULL, err, _T("TortoiseGit"), MB_ICONERROR);
1739 return -1;
1742 int pos = 0;
1743 while (pos >= 0)
1745 CString one = out.Tokenize(_T("\n"), pos).Mid(51).Trim(); // sha1, tab + refs/tags/
1746 // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1747 if (one.Find(_T("^{}")) >= 1)
1748 continue;
1749 if (!one.IsEmpty())
1750 list.push_back(one);
1752 std::sort(list.begin(), list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1753 return 0;
1756 int CGit::DeleteRemoteRefs(const CString& sRemote, const STRING_VECTOR& list)
1758 if (UsingLibGit2(GIT_CMD_PUSH))
1760 CAutoRepository repo(GetGitRepository());
1761 if (!repo)
1762 return -1;
1764 CStringA remoteA = CUnicodeUtils::GetUTF8(sRemote);
1765 CAutoRemote remote;
1766 if (git_remote_lookup(remote.GetPointer(), repo, remoteA) < 0)
1767 return -1;
1769 git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
1770 callbacks.credentials = g_Git2CredCallback;
1771 callbacks.certificate_check = g_Git2CheckCertificateCallback;
1772 git_remote_set_callbacks(remote, &callbacks);
1773 if (git_remote_connect(remote, GIT_DIRECTION_PUSH) < 0)
1774 return -1;
1776 std::vector<CStringA> refspecs;
1777 for (auto ref : list)
1778 refspecs.push_back(CUnicodeUtils::GetUTF8(_T(":") + ref));
1780 std::vector<char*> vc;
1781 vc.reserve(refspecs.size());
1782 std::transform(refspecs.begin(), refspecs.end(), std::back_inserter(vc), [](CStringA& s) -> char* { return s.GetBuffer(); });
1783 git_strarray specs = { &vc[0], vc.size() };
1785 if (git_remote_push(remote, &specs, nullptr, nullptr, nullptr) < 0)
1786 return -1;
1788 else
1790 CMassiveGitTaskBase mgtPush(_T("push ") + sRemote, FALSE);
1791 for (auto ref : list)
1793 CString refspec = _T(":") + ref;
1794 mgtPush.AddFile(refspec);
1797 BOOL cancel = FALSE;
1798 mgtPush.Execute(cancel);
1801 return 0;
1804 int libgit2_addto_list_each_ref_fn(git_reference *ref, void *payload)
1806 STRING_VECTOR *list = (STRING_VECTOR*)payload;
1807 list->push_back(CUnicodeUtils::GetUnicode(git_reference_name(ref)));
1808 return 0;
1811 int CGit::GetRefList(STRING_VECTOR &list)
1813 if (this->m_IsUseLibGit2)
1815 CAutoRepository repo(GetGitRepository());
1816 if (!repo)
1817 return -1;
1819 if (git_reference_foreach(repo, libgit2_addto_list_each_ref_fn, &list))
1820 return -1;
1822 std::sort(list.begin(), list.end(), LogicalComparePredicate);
1824 return 0;
1826 else
1828 CString cmd, output;
1829 cmd=_T("git.exe show-ref -d");
1830 int ret = Run(cmd, &output, NULL, CP_UTF8);
1831 if(!ret)
1833 int pos=0;
1834 CString one;
1835 while( pos>=0 )
1837 one=output.Tokenize(_T("\n"),pos);
1838 int start=one.Find(_T(" "),0);
1839 if(start>0)
1841 CString name;
1842 name=one.Right(one.GetLength()-start-1);
1843 list.push_back(name);
1846 std::sort(list.begin(), list.end(), LogicalComparePredicate);
1848 return ret;
1852 typedef struct map_each_ref_payload {
1853 git_repository * repo;
1854 MAP_HASH_NAME * map;
1855 } map_each_ref_payload;
1857 int libgit2_addto_map_each_ref_fn(git_reference *ref, void *payload)
1859 map_each_ref_payload *payloadContent = (map_each_ref_payload*)payload;
1861 CString str = CUnicodeUtils::GetUnicode(git_reference_name(ref));
1863 CAutoObject gitObject;
1864 if (git_revparse_single(gitObject.GetPointer(), payloadContent->repo, git_reference_name(ref)))
1865 return 1;
1867 if (git_object_type(gitObject) == GIT_OBJ_TAG)
1869 str += _T("^{}"); // deref tag
1870 CAutoObject derefedTag;
1871 if (git_object_peel(derefedTag.GetPointer(), gitObject, GIT_OBJ_ANY))
1872 return 1;
1873 gitObject.Swap(derefedTag);
1876 const git_oid * oid = git_object_id(gitObject);
1877 if (oid == NULL)
1878 return 1;
1880 CGitHash hash((char *)oid->id);
1881 (*payloadContent->map)[hash].push_back(str);
1883 return 0;
1885 int CGit::GetMapHashToFriendName(git_repository* repo, MAP_HASH_NAME &map)
1887 ATLASSERT(repo);
1889 map_each_ref_payload payloadContent = { repo, &map };
1891 if (git_reference_foreach(repo, libgit2_addto_map_each_ref_fn, &payloadContent))
1892 return -1;
1894 for (auto it = map.begin(); it != map.end(); ++it)
1896 std::sort(it->second.begin(), it->second.end());
1899 return 0;
1902 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
1904 if (this->m_IsUseLibGit2)
1906 CAutoRepository repo(GetGitRepository());
1907 if (!repo)
1908 return -1;
1910 return GetMapHashToFriendName(repo, map);
1912 else
1914 CString cmd, output;
1915 cmd=_T("git.exe show-ref -d");
1916 int ret = Run(cmd, &output, NULL, CP_UTF8);
1917 if(!ret)
1919 int pos=0;
1920 CString one;
1921 while( pos>=0 )
1923 one=output.Tokenize(_T("\n"),pos);
1924 int start=one.Find(_T(" "),0);
1925 if(start>0)
1927 CString name;
1928 name=one.Right(one.GetLength()-start-1);
1930 CString hash;
1931 hash=one.Left(start);
1933 map[CGitHash(hash)].push_back(name);
1937 return ret;
1941 static void SetLibGit2SearchPath(int level, const CString &value)
1943 CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
1944 git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, level, valueA);
1947 static void SetLibGit2TemplatePath(const CString &value)
1949 CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
1950 git_libgit2_opts(GIT_OPT_SET_TEMPLATE_PATH, valueA);
1953 BOOL CGit::CheckMsysGitDir(BOOL bFallback)
1955 if (m_bInitialized)
1957 return TRUE;
1960 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": CheckMsysGitDir(%d)\n"), bFallback);
1961 this->m_Environment.clear();
1962 m_Environment.CopyProcessEnvironment();
1963 m_Environment.SetEnv(_T("GIT_DIR"), nullptr); // Remove %GIT_DIR% before executing git.exe
1965 TCHAR *oldpath;
1966 size_t homesize,size;
1968 // set HOME if not set already
1969 _tgetenv_s(&homesize, NULL, 0, _T("HOME"));
1970 if (!homesize)
1971 m_Environment.SetEnv(_T("HOME"), GetHomeDirectory());
1973 //setup ssh client
1974 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
1975 if (sshclient.IsEmpty())
1976 sshclient = CRegString(_T("Software\\TortoiseGit\\SSH"), _T(""), FALSE, HKEY_LOCAL_MACHINE);
1978 if(!sshclient.IsEmpty())
1980 m_Environment.SetEnv(_T("GIT_SSH"), sshclient);
1981 m_Environment.SetEnv(_T("SVN_SSH"), sshclient);
1983 else
1985 TCHAR sPlink[MAX_PATH] = {0};
1986 GetModuleFileName(NULL, sPlink, _countof(sPlink));
1987 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
1988 if (ptr) {
1989 _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sPlink + 1), _T("TortoiseGitPLink.exe"));
1990 m_Environment.SetEnv(_T("GIT_SSH"), sPlink);
1991 m_Environment.SetEnv(_T("SVN_SSH"), sPlink);
1996 TCHAR sAskPass[MAX_PATH] = {0};
1997 GetModuleFileName(NULL, sAskPass, _countof(sAskPass));
1998 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
1999 if (ptr)
2001 _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sAskPass + 1), _T("SshAskPass.exe"));
2002 m_Environment.SetEnv(_T("DISPLAY"),_T(":9999"));
2003 m_Environment.SetEnv(_T("SSH_ASKPASS"),sAskPass);
2004 m_Environment.SetEnv(_T("GIT_ASKPASS"),sAskPass);
2008 // add git/bin path to PATH
2010 CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);
2011 CString str = msysdir;
2012 if(str.IsEmpty() || !FileExists(str + _T("\\git.exe")))
2014 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": git.exe not exists: %s\n"), CGit::ms_LastMsysGitDir);
2015 if (!bFallback)
2016 return FALSE;
2018 CRegString msyslocalinstalldir = CRegString(REG_MSYSGIT_INSTALL_LOCAL, _T(""), FALSE, HKEY_CURRENT_USER);
2019 str = msyslocalinstalldir;
2020 str.TrimRight(_T("\\"));
2021 if (str.IsEmpty())
2023 CRegString msysinstalldir = CRegString(REG_MSYSGIT_INSTALL, _T(""), FALSE, HKEY_LOCAL_MACHINE);
2024 str = msysinstalldir;
2025 str.TrimRight(_T("\\"));
2027 if ( !str.IsEmpty() )
2029 str += "\\bin";
2030 msysdir=str;
2031 CGit::ms_LastMsysGitDir = str;
2032 msysdir.write();
2034 else
2036 // search PATH if git/bin directory is already present
2037 if ( FindGitPath() )
2039 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": FindGitPath() => %s\n"), CGit::ms_LastMsysGitDir);
2040 m_bInitialized = TRUE;
2041 msysdir = CGit::ms_LastMsysGitDir;
2042 msysdir.write();
2043 return TRUE;
2046 return FALSE;
2049 else
2051 CGit::ms_LastMsysGitDir = str;
2054 // check for git.exe existance (maybe it was deinstalled in the meantime)
2055 if (!FileExists(CGit::ms_LastMsysGitDir + _T("\\git.exe")))
2057 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": git.exe not exists: %s\n"), CGit::ms_LastMsysGitDir);
2058 return FALSE;
2061 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": ms_LastMsysGitDir = %s\n"), CGit::ms_LastMsysGitDir);
2062 // Configure libgit2 search paths
2063 CString msysGitDir;
2064 PathCanonicalize(msysGitDir.GetBufferSetLength(MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\etc"));
2065 msysGitDir.ReleaseBuffer();
2066 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_SYSTEM, msysGitDir);
2067 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_GLOBAL, g_Git.GetHomeDirectory());
2068 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_XDG, g_Git.GetGitGlobalXDGConfigPath());
2069 static git_smart_subtransport_definition ssh_wintunnel_subtransport_definition = { [](git_smart_subtransport **out, git_transport* owner) -> int { return git_smart_subtransport_ssh_wintunnel(out, owner, FindExecutableOnPath(g_Git.m_Environment.GetEnv(_T("GIT_SSH")), g_Git.m_Environment.GetEnv(_T("PATH"))), &g_Git.m_Environment[0]); }, 0 };
2070 git_transport_register("ssh", git_transport_smart, &ssh_wintunnel_subtransport_definition);
2071 CString msysGitTemplateDir;
2072 if (!ms_bCygwinGit)
2073 PathCanonicalize(msysGitTemplateDir.GetBufferSetLength(MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\share\\git-core\\templates"));
2074 else
2075 PathCanonicalize(msysGitTemplateDir.GetBufferSetLength(MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\usr\\share\\git-core\\templates"));
2076 msysGitTemplateDir.ReleaseBuffer();
2077 SetLibGit2TemplatePath(msysGitTemplateDir);
2079 //set path
2080 _tdupenv_s(&oldpath,&size,_T("PATH"));
2082 CString path;
2083 path.Format(_T("%s;%s"),oldpath,str + _T(";")+ (CString)CRegString(REG_MSYSGIT_EXTRA_PATH,_T(""),FALSE));
2085 m_Environment.SetEnv(_T("PATH"), path);
2087 CString str1 = m_Environment.GetEnv(_T("PATH"));
2089 CString sOldPath = oldpath;
2090 free(oldpath);
2092 #if !defined(TGITCACHE) && !defined(TORTOISESHELL)
2093 // register filter only once
2094 if (!git_filter_lookup("filter"))
2096 if (git_filter_register("filter", git_filter_filter_new(_T("\"") + CGit::ms_LastMsysGitDir + L"\\sh.exe\"", &m_Environment[0]), GIT_FILTER_DRIVER_PRIORITY))
2097 return FALSE;
2099 #endif
2101 m_bInitialized = TRUE;
2102 return true;
2105 CString CGit::GetHomeDirectory() const
2107 const wchar_t * homeDir = wget_windows_home_directory();
2108 return CString(homeDir, (int)wcslen(homeDir));
2111 CString CGit::GetGitLocalConfig() const
2113 CString path;
2114 GitAdminDir::GetAdminDirPath(m_CurrentDir, path);
2115 path += _T("config");
2116 return path;
2119 CStringA CGit::GetGitPathStringA(const CString &path)
2121 return CUnicodeUtils::GetUTF8(CTGitPath(path).GetGitPathString());
2124 CString CGit::GetGitGlobalConfig() const
2126 return g_Git.GetHomeDirectory() + _T("\\.gitconfig");
2129 CString CGit::GetGitGlobalXDGConfigPath() const
2131 return g_Git.GetHomeDirectory() + _T("\\.config\\git");
2134 CString CGit::GetGitGlobalXDGConfig() const
2136 return g_Git.GetGitGlobalXDGConfigPath() + _T("\\config");
2139 CString CGit::GetGitSystemConfig() const
2141 const wchar_t * systemConfig = wget_msysgit_etc();
2142 return CString(systemConfig, (int)wcslen(systemConfig));
2145 BOOL CGit::CheckCleanWorkTree(bool stagedOk /* false */)
2147 CString out;
2148 CString cmd;
2149 cmd=_T("git.exe rev-parse --verify HEAD");
2151 if(Run(cmd,&out,CP_UTF8))
2152 return FALSE;
2154 cmd=_T("git.exe update-index --ignore-submodules --refresh");
2155 if(Run(cmd,&out,CP_UTF8))
2156 return FALSE;
2158 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
2159 if(Run(cmd,&out,CP_UTF8))
2160 return FALSE;
2162 cmd = _T("git.exe diff-index --cached --quiet HEAD --ignore-submodules --");
2163 if (!stagedOk && Run(cmd, &out, CP_UTF8))
2164 return FALSE;
2166 return TRUE;
2168 int CGit::Revert(const CString& commit, const CTGitPathList &list, CString& err)
2170 int ret;
2171 for (int i = 0; i < list.GetCount(); ++i)
2173 ret = Revert(commit, (CTGitPath&)list[i], err);
2174 if(ret)
2175 return ret;
2177 return 0;
2179 int CGit::Revert(const CString& commit, const CTGitPath &path, CString& err)
2181 CString cmd;
2183 if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED && !path.GetGitOldPathString().IsEmpty())
2185 if (CTGitPath(path.GetGitOldPathString()).IsDirectory())
2187 err.Format(_T("Cannot revert renaming of \"%s\". A directory with the old name \"%s\" exists."), path.GetGitPathString(), path.GetGitOldPathString());
2188 return -1;
2190 CString force;
2191 // if the filenames only differ in case, we have to pass "-f"
2192 if (path.GetGitPathString().CompareNoCase(path.GetGitOldPathString()) == 0)
2193 force = _T("-f ");
2194 cmd.Format(_T("git.exe mv %s-- \"%s\" \"%s\""), force, path.GetGitPathString(), path.GetGitOldPathString());
2195 if (Run(cmd, &err, CP_UTF8))
2196 return -1;
2198 cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), commit, path.GetGitOldPathString());
2199 if (Run(cmd, &err, CP_UTF8))
2200 return -1;
2202 else if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
2203 { //To init git repository, there are not HEAD, so we can use git reset command
2204 cmd.Format(_T("git.exe rm -f --cached -- \"%s\""),path.GetGitPathString());
2206 if (Run(cmd, &err, CP_UTF8))
2207 return -1;
2209 else
2211 cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), commit, path.GetGitPathString());
2212 if (Run(cmd, &err, CP_UTF8))
2213 return -1;
2216 if (path.m_Action & CTGitPath::LOGACTIONS_DELETED)
2218 cmd.Format(_T("git.exe add -f -- \"%s\""), path.GetGitPathString());
2219 if (Run(cmd, &err, CP_UTF8))
2220 return -1;
2223 return 0;
2226 int CGit::ListConflictFile(CTGitPathList &list, const CTGitPath *path)
2228 BYTE_VECTOR vector;
2230 CString cmd;
2231 if(path)
2232 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
2233 else
2234 cmd=_T("git.exe ls-files -u -t -z");
2236 if (Run(cmd, &vector))
2238 return -1;
2241 if (list.ParserFromLsFile(vector))
2242 return -1;
2244 return 0;
2247 bool CGit::IsFastForward(const CString &from, const CString &to, CGitHash * commonAncestor)
2249 if (UsingLibGit2(GIT_CMD_MERGE_BASE))
2251 CAutoRepository repo(GetGitRepository());
2252 if (!repo)
2253 return false;
2255 CGitHash fromHash, toHash, baseHash;
2256 if (GetHash(repo, toHash, FixBranchName(to)))
2257 return false;
2259 if (GetHash(repo, fromHash, FixBranchName(from)))
2260 return false;
2262 git_oid baseOid;
2263 if (git_merge_base(&baseOid, repo, (const git_oid*)toHash.m_hash, (const git_oid*)fromHash.m_hash))
2264 return false;
2266 baseHash = baseOid.id;
2268 if (commonAncestor)
2269 *commonAncestor = baseHash;
2271 return fromHash == baseHash;
2273 // else
2274 CString base;
2275 CGitHash basehash,hash;
2276 CString cmd, err;
2277 cmd.Format(_T("git.exe merge-base %s %s"), FixBranchName(to), FixBranchName(from));
2279 if (Run(cmd, &base, &err, CP_UTF8))
2281 return false;
2283 basehash = base.Trim();
2285 GetHash(hash, from);
2287 if (commonAncestor)
2288 *commonAncestor = basehash;
2290 return hash == basehash;
2293 unsigned int CGit::Hash2int(const CGitHash &hash)
2295 int ret=0;
2296 for (int i = 0; i < 4; ++i)
2298 ret = ret << 8;
2299 ret |= hash.m_hash[i];
2301 return ret;
2304 int CGit::RefreshGitIndex()
2306 if(g_Git.m_IsUseGitDLL)
2308 CAutoLocker lock(g_Git.m_critGitDllSec);
2311 return [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
2313 }catch(...)
2315 return -1;
2319 else
2321 CString cmd,output;
2322 cmd=_T("git.exe update-index --refresh");
2323 return Run(cmd, &output, CP_UTF8);
2327 int CGit::GetOneFile(const CString &Refname, const CTGitPath &path, const CString &outputfile)
2329 if (UsingLibGit2(GIT_CMD_GETONEFILE))
2331 CAutoRepository repo(GetGitRepository());
2332 if (!repo)
2333 return -1;
2335 CGitHash hash;
2336 if (GetHash(repo, hash, Refname))
2337 return -1;
2339 CAutoCommit commit;
2340 if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
2341 return -1;
2343 CAutoTree tree;
2344 if (git_commit_tree(tree.GetPointer(), commit))
2345 return -1;
2347 CAutoTreeEntry entry;
2348 if (git_tree_entry_bypath(entry.GetPointer(), tree, CUnicodeUtils::GetUTF8(path.GetGitPathString())))
2349 return -1;
2351 CAutoBlob blob;
2352 if (git_tree_entry_to_object((git_object**)blob.GetPointer(), repo, entry))
2353 return -1;
2355 FILE *file = nullptr;
2356 _tfopen_s(&file, outputfile, _T("w"));
2357 if (file == nullptr)
2359 giterr_set_str(GITERR_NONE, "Could not create file.");
2360 return -1;
2362 CAutoBuf buf;
2363 if (git_blob_filtered_content(buf, blob, CUnicodeUtils::GetUTF8(path.GetGitPathString()), 0))
2365 fclose(file);
2366 return -1;
2368 if (fwrite(buf->ptr, sizeof(char), buf->size, file) != buf->size)
2370 giterr_set_str(GITERR_OS, "Could not write to file.");
2371 fclose(file);
2373 return -1;
2375 fclose(file);
2377 return 0;
2379 else if (g_Git.m_IsUseGitDLL)
2381 CAutoLocker lock(g_Git.m_critGitDllSec);
2384 g_Git.CheckAndInitDll();
2385 CStringA ref, patha, outa;
2386 ref = CUnicodeUtils::GetMulti(Refname, CP_UTF8);
2387 patha = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
2388 outa = CUnicodeUtils::GetMulti(outputfile, CP_UTF8);
2389 ::DeleteFile(outputfile);
2390 return git_checkout_file(ref, patha, outa);
2393 catch (const char * msg)
2395 gitLastErr = L"gitdll.dll reports: " + CString(msg);
2396 return -1;
2398 catch (...)
2400 gitLastErr = L"An unknown gitdll.dll error occurred.";
2401 return -1;
2404 else
2406 CString cmd;
2407 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""), Refname, path.GetGitPathString());
2408 return RunLogFile(cmd, outputfile, &gitLastErr);
2411 void CEnvironment::CopyProcessEnvironment()
2413 TCHAR *porig = GetEnvironmentStrings();
2414 TCHAR *p = porig;
2415 while(*p !=0 || *(p+1) !=0)
2416 this->push_back(*p++);
2418 push_back(_T('\0'));
2419 push_back(_T('\0'));
2421 FreeEnvironmentStrings(porig);
2424 CString CEnvironment::GetEnv(const TCHAR *name)
2426 CString str;
2427 for (size_t i = 0; i < size(); ++i)
2429 str = &(*this)[i];
2430 int start =0;
2431 CString sname = str.Tokenize(_T("="),start);
2432 if(sname.CompareNoCase(name) == 0)
2434 return &(*this)[i+start];
2436 i+=str.GetLength();
2438 return _T("");
2441 void CEnvironment::SetEnv(const TCHAR *name, const TCHAR* value)
2443 unsigned int i;
2444 for (i = 0; i < size(); ++i)
2446 CString str = &(*this)[i];
2447 int start =0;
2448 CString sname = str.Tokenize(_T("="),start);
2449 if(sname.CompareNoCase(name) == 0)
2451 break;
2453 i+=str.GetLength();
2456 if(i == size())
2458 if (!value) // as we haven't found the variable we want to remove, just return
2459 return;
2460 i -= 1; // roll back terminate \0\0
2461 this->push_back(_T('\0'));
2464 CEnvironment::iterator it;
2465 it=this->begin();
2466 it += i;
2468 while(*it && i<size())
2470 this->erase(it);
2471 it=this->begin();
2472 it += i;
2475 if (value == nullptr) // remove the variable
2477 this->erase(it);
2478 return;
2481 while(*name)
2483 this->insert(it,*name++);
2484 ++i;
2485 it= begin()+i;
2488 this->insert(it, _T('='));
2489 ++i;
2490 it= begin()+i;
2492 while(*value)
2494 this->insert(it,*value++);
2495 ++i;
2496 it= begin()+i;
2501 int CGit::GetGitEncode(TCHAR* configkey)
2503 CString str=GetConfigValue(configkey);
2505 if(str.IsEmpty())
2506 return CP_UTF8;
2508 return CUnicodeUtils::GetCPCode(str);
2512 int CGit::GetDiffPath(CTGitPathList *PathList, CGitHash *hash1, CGitHash *hash2, char *arg)
2514 GIT_FILE file=0;
2515 int ret=0;
2516 GIT_DIFF diff=0;
2518 CAutoLocker lock(g_Git.m_critGitDllSec);
2522 if(!arg)
2523 diff = GetGitDiff();
2524 else
2525 git_open_diff(&diff, arg);
2527 catch (char* e)
2529 MessageBox(nullptr, _T("Could not get diff.\nlibgit reported:\n") + CString(e), _T("TortoiseGit"), MB_OK);
2530 return -1;
2533 if(diff ==NULL)
2534 return -1;
2536 bool isStat = 0;
2537 if(arg == NULL)
2538 isStat = true;
2539 else
2540 isStat = !!strstr(arg, "stat");
2542 int count=0;
2544 if(hash2 == NULL)
2545 ret = git_root_diff(diff, hash1->m_hash, &file, &count,isStat);
2546 else
2547 ret = git_do_diff(diff,hash2->m_hash,hash1->m_hash,&file,&count,isStat);
2549 if(ret)
2550 return -1;
2552 CTGitPath path;
2553 CString strnewname;
2554 CString stroldname;
2556 for (int j = 0; j < count; ++j)
2558 path.Reset();
2559 char *newname;
2560 char *oldname;
2562 strnewname.Empty();
2563 stroldname.Empty();
2565 int mode=0,IsBin=0,inc=0,dec=0;
2566 git_get_diff_file(diff,file,j,&newname,&oldname,
2567 &mode,&IsBin,&inc,&dec);
2569 StringAppend(&strnewname, (BYTE*)newname, CP_UTF8);
2570 StringAppend(&stroldname, (BYTE*)oldname, CP_UTF8);
2572 path.SetFromGit(strnewname,&stroldname);
2573 path.ParserAction((BYTE)mode);
2575 if(IsBin)
2577 path.m_StatAdd=_T("-");
2578 path.m_StatDel=_T("-");
2580 else
2582 path.m_StatAdd.Format(_T("%d"),inc);
2583 path.m_StatDel.Format(_T("%d"),dec);
2585 PathList->AddPath(path);
2587 git_diff_flush(diff);
2589 if(arg)
2590 git_close_diff(diff);
2592 return 0;
2595 int CGit::GetShortHASHLength() const
2597 return 7;
2600 CString CGit::GetShortName(const CString& ref, REF_TYPE *out_type)
2602 CString str=ref;
2603 CString shortname;
2604 REF_TYPE type = CGit::UNKNOWN;
2606 if (CGit::GetShortName(str, shortname, _T("refs/heads/")))
2608 type = CGit::LOCAL_BRANCH;
2611 else if (CGit::GetShortName(str, shortname, _T("refs/remotes/")))
2613 type = CGit::REMOTE_BRANCH;
2615 else if (CGit::GetShortName(str, shortname, _T("refs/tags/")))
2617 type = CGit::TAG;
2619 else if (CGit::GetShortName(str, shortname, _T("refs/stash")))
2621 type = CGit::STASH;
2622 shortname=_T("stash");
2624 else if (CGit::GetShortName(str, shortname, _T("refs/bisect/")))
2626 if (shortname.Find(_T("good")) == 0)
2628 type = CGit::BISECT_GOOD;
2629 shortname = _T("good");
2632 if (shortname.Find(_T("bad")) == 0)
2634 type = CGit::BISECT_BAD;
2635 shortname = _T("bad");
2638 else if (CGit::GetShortName(str, shortname, _T("refs/notes/")))
2640 type = CGit::NOTES;
2642 else if (CGit::GetShortName(str, shortname, _T("refs/")))
2644 type = CGit::UNKNOWN;
2646 else
2648 type = CGit::UNKNOWN;
2649 shortname = ref;
2652 if(out_type)
2653 *out_type = type;
2655 return shortname;
2658 bool CGit::UsingLibGit2(LIBGIT2_CMD cmd) const
2660 return m_IsUseLibGit2 && ((1 << cmd) & m_IsUseLibGit2_mask) ? true : false;
2663 void CGit::SetGit2CredentialCallback(void* callback)
2665 g_Git2CredCallback = (git_cred_acquire_cb)callback;
2668 void CGit::SetGit2CertificateCheckCertificate(void* callback)
2670 g_Git2CheckCertificateCallback = (git_transport_certificate_check_cb)callback;
2673 CString CGit::GetUnifiedDiffCmd(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, bool bMerge, bool bCombine, int diffContext)
2675 CString cmd;
2676 if (rev2 == GitRev::GetWorkingCopy())
2677 cmd.Format(_T("git.exe diff --stat -p %s --"), rev1);
2678 else if (rev1 == GitRev::GetWorkingCopy())
2679 cmd.Format(_T("git.exe diff -R --stat -p %s --"), rev2);
2680 else
2682 CString merge;
2683 if (bMerge)
2684 merge += _T(" -m");
2686 if (bCombine)
2687 merge += _T(" -c");
2689 CString unified;
2690 if (diffContext >= 0)
2691 unified.Format(_T(" --unified=%d"), diffContext);
2692 cmd.Format(_T("git.exe diff-tree -r -p %s %s --stat %s %s --"), merge, unified, rev1, rev2);
2695 if (!path.IsEmpty())
2697 cmd += _T(" \"");
2698 cmd += path.GetGitPathString();
2699 cmd += _T("\"");
2702 return cmd;
2705 static void UnifiedDiffStatToFile(const git_buf* text, void* payload)
2707 ATLASSERT(payload && text);
2708 fwrite(text->ptr, 1, text->size, (FILE *)payload);
2709 fwrite("\n", 1, 1, (FILE *)payload);
2712 static int UnifiedDiffToFile(const git_diff_delta * /* delta */, const git_diff_hunk * /* hunk */, const git_diff_line * line, void *payload)
2714 ATLASSERT(payload && line);
2715 if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
2716 fwrite(&line->origin, 1, 1, (FILE *)payload);
2717 fwrite(line->content, 1, line->content_len, (FILE *)payload);
2718 return 0;
2721 static int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tree)
2723 ATLASSERT(repo && identifier && tree);
2725 /* try to resolve identifier */
2726 CAutoObject obj;
2727 if (git_revparse_single(obj.GetPointer(), repo, identifier))
2728 return -1;
2730 if (obj == nullptr)
2731 return GIT_ENOTFOUND;
2733 int err = 0;
2734 switch (git_object_type(obj))
2736 case GIT_OBJ_TREE:
2737 *tree = (git_tree *)obj.Detach();
2738 break;
2739 case GIT_OBJ_COMMIT:
2740 err = git_commit_tree(tree, (git_commit *)(git_object*)obj);
2741 break;
2742 default:
2743 err = GIT_ENOTFOUND;
2746 return err;
2749 /* use libgit2 get unified diff */
2750 static int GetUnifiedDiffLibGit2(const CTGitPath& path, const git_revnum_t& revOld, const git_revnum_t& revNew, std::function<void(const git_buf*, void*)> statCallback, git_diff_line_cb callback, void *data, bool /* bMerge */)
2752 CStringA tree1 = CUnicodeUtils::GetMulti(revNew, CP_UTF8);
2753 CStringA tree2 = CUnicodeUtils::GetMulti(revOld, CP_UTF8);
2755 CAutoRepository repo(g_Git.GetGitRepository());
2756 if (!repo)
2757 return -1;
2759 int isHeadOrphan = git_repository_head_unborn(repo);
2760 if (isHeadOrphan == 1)
2761 return 0;
2762 else if (isHeadOrphan != 0)
2763 return -1;
2765 git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
2766 CStringA pathA = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
2767 char *buf = pathA.GetBuffer();
2768 if (!pathA.IsEmpty())
2770 opts.pathspec.strings = &buf;
2771 opts.pathspec.count = 1;
2773 CAutoDiff diff;
2775 if (revNew == GitRev::GetWorkingCopy() || revOld == GitRev::GetWorkingCopy())
2777 CAutoTree t1;
2778 CAutoDiff diff2;
2780 if (revNew != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree1, t1.GetPointer()))
2781 return -1;
2783 if (revOld != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree2, t1.GetPointer()))
2784 return -1;
2786 if (git_diff_tree_to_index(diff.GetPointer(), repo, t1, nullptr, &opts))
2787 return -1;
2789 if (git_diff_index_to_workdir(diff2.GetPointer(), repo, nullptr, &opts))
2790 return -1;
2792 if (git_diff_merge(diff, diff2))
2793 return -1;
2795 else
2797 if (tree1.IsEmpty() && tree2.IsEmpty())
2798 return -1;
2800 if (tree1.IsEmpty())
2802 tree1 = tree2;
2803 tree2.Empty();
2806 CAutoTree t1;
2807 CAutoTree t2;
2808 if (!tree1.IsEmpty() && resolve_to_tree(repo, tree1, t1.GetPointer()))
2809 return -1;
2811 if (tree2.IsEmpty())
2813 /* don't check return value, there are not parent commit at first commit*/
2814 resolve_to_tree(repo, tree1 + "~1", t2.GetPointer());
2816 else if (resolve_to_tree(repo, tree2, t2.GetPointer()))
2817 return -1;
2818 if (git_diff_tree_to_tree(diff.GetPointer(), repo, t2, t1, &opts))
2819 return -1;
2822 CAutoDiffStats stats;
2823 if (git_diff_get_stats(stats.GetPointer(), diff))
2824 return -1;
2825 CAutoBuf statBuf;
2826 if (git_diff_stats_to_buf(statBuf, stats, GIT_DIFF_STATS_FULL, 0))
2827 return -1;
2828 statCallback(statBuf, data);
2830 for (size_t i = 0; i < git_diff_num_deltas(diff); ++i)
2832 CAutoPatch patch;
2833 if (git_patch_from_diff(patch.GetPointer(), diff, i))
2834 return -1;
2836 if (git_patch_print(patch, callback, data))
2837 return -1;
2840 pathA.ReleaseBuffer();
2842 return 0;
2845 int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CString patchfile, bool bMerge, bool bCombine, int diffContext)
2847 if (UsingLibGit2(GIT_CMD_DIFF))
2849 FILE *file = nullptr;
2850 _tfopen_s(&file, patchfile, _T("w"));
2851 if (file == nullptr)
2852 return -1;
2853 int ret = GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffStatToFile, UnifiedDiffToFile, file, bMerge);
2854 fclose(file);
2855 return ret;
2857 else
2859 CString cmd;
2860 cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext);
2861 return RunLogFile(cmd, patchfile, &gitLastErr);
2865 static void UnifiedDiffStatToStringA(const git_buf* text, void* payload)
2867 ATLASSERT(payload && text);
2868 CStringA *str = (CStringA*) payload;
2869 str->Append(text->ptr, (int)text->size);
2870 str->AppendChar('\n');
2873 static int UnifiedDiffToStringA(const git_diff_delta * /*delta*/, const git_diff_hunk * /*hunk*/, const git_diff_line *line, void *payload)
2875 ATLASSERT(payload && line);
2876 CStringA *str = (CStringA*) payload;
2877 if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
2878 str->Append(&line->origin, 1);
2879 str->Append(line->content, (int)line->content_len);
2880 return 0;
2883 int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CStringA * buffer, bool bMerge, bool bCombine, int diffContext)
2885 if (UsingLibGit2(GIT_CMD_DIFF))
2886 return GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffStatToStringA, UnifiedDiffToStringA, buffer, bMerge);
2887 else
2889 CString cmd;
2890 cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext);
2891 BYTE_VECTOR vector;
2892 int ret = Run(cmd, &vector);
2893 if (!vector.empty())
2895 vector.push_back(0); // vector is not NUL terminated
2896 buffer->Append((char *)&vector[0]);
2898 return ret;
2902 int CGit::GitRevert(int parent, const CGitHash &hash)
2904 if (UsingLibGit2(GIT_CMD_REVERT))
2906 CAutoRepository repo(GetGitRepository());
2907 if (!repo)
2908 return -1;
2910 CAutoCommit commit;
2911 if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
2912 return -1;
2914 git_revert_options revert_opts = GIT_REVERT_OPTIONS_INIT;
2915 revert_opts.mainline = parent;
2916 int result = git_revert(repo, commit, &revert_opts);
2918 return !result ? 0 : -1;
2920 else
2922 CString cmd, merge;
2923 if (parent)
2924 merge.Format(_T("-m %d "), parent);
2925 cmd.Format(_T("git.exe revert --no-edit --no-commit %s%s"), merge, hash.ToString());
2926 gitLastErr = cmd + _T("\n");
2927 if (Run(cmd, &gitLastErr, CP_UTF8))
2929 return -1;
2931 else
2933 gitLastErr.Empty();
2934 return 0;
2939 int CGit::DeleteRef(const CString& reference)
2941 if (UsingLibGit2(GIT_CMD_DELETETAGBRANCH))
2943 CAutoRepository repo(GetGitRepository());
2944 if (!repo)
2945 return -1;
2947 CStringA refA;
2948 if (reference.Right(3) == _T("^{}"))
2949 refA = CUnicodeUtils::GetUTF8(reference.Left(reference.GetLength() - 3));
2950 else
2951 refA = CUnicodeUtils::GetUTF8(reference);
2953 CAutoReference ref;
2954 if (git_reference_lookup(ref.GetPointer(), repo, refA))
2955 return -1;
2957 int result = -1;
2958 if (git_reference_is_tag(ref))
2959 result = git_tag_delete(repo, git_reference_shorthand(ref));
2960 else if (git_reference_is_branch(ref))
2961 result = git_branch_delete(ref);
2962 else if (git_reference_is_remote(ref))
2963 result = git_branch_delete(ref);
2964 else
2965 giterr_set_str(GITERR_REFERENCE, CUnicodeUtils::GetUTF8(L"unsupported reference type: " + reference));
2967 return result;
2969 else
2971 CString cmd, shortname;
2972 if (GetShortName(reference, shortname, _T("refs/heads/")))
2973 cmd.Format(_T("git.exe branch -D -- %s"), shortname);
2974 else if (GetShortName(reference, shortname, _T("refs/tags/")))
2975 cmd.Format(_T("git.exe tag -d -- %s"), shortname);
2976 else if (GetShortName(reference, shortname, _T("refs/remotes/")))
2977 cmd.Format(_T("git.exe branch -r -D -- %s"), shortname);
2978 else
2980 gitLastErr = L"unsupported reference type: " + reference;
2981 return -1;
2984 if (Run(cmd, &gitLastErr, CP_UTF8))
2985 return -1;
2987 gitLastErr.Empty();
2988 return 0;
2992 bool CGit::LoadTextFile(const CString &filename, CString &msg)
2994 if (PathFileExists(filename))
2996 FILE *pFile = nullptr;
2997 _tfopen_s(&pFile, filename, _T("r"));
2998 if (pFile)
3000 CStringA str;
3003 char s[8196] = { 0 };
3004 int read = (int)fread(s, sizeof(char), sizeof(s), pFile);
3005 if (read == 0)
3006 break;
3007 str += CStringA(s, read);
3008 } while (true);
3009 fclose(pFile);
3010 msg = CUnicodeUtils::GetUnicode(str);
3011 msg.Replace(_T("\r\n"), _T("\n"));
3012 msg.TrimRight(_T("\n"));
3013 msg += _T("\n");
3015 else
3016 ::MessageBox(nullptr, _T("Could not open ") + filename, _T("TortoiseGit"), MB_ICONERROR);
3017 return true; // load no further files
3019 return false;