?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Use wcsncmp instead of Find for StartsWith checks
[TortoiseGit.git] / src / Git / Git.cpp
blob83d952961d9a06fde136f569962c2c266a8cc1d1
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2016 - TortoiseGit
4
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.
9
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.
14
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.
18 //
19
20 #include "stdafx.h"
21 #include "Git.h"
22 #include "registry.h"
23 #include "GitForWindows.h"
24 #include "UnicodeUtils.h"
25 #include "gitdll.h"
26 #include <fstream>
27 #include <iterator>
28 #include "FormatMessageWrapper.h"
29 #include "SmartHandle.h"
30 #include "MassiveGitTaskBase.h"
31 #include "git2/sys/filter.h"
32 #include "git2/sys/transport.h"
33 #include "../libgit2/filter-filter.h"
34 #include "../libgit2/ssh-wintunnel.h"
35
36 bool CGit::ms_bCygwinGit = (CRegDWORD(_T("Software\\TortoiseGit\\CygwinHack"), FALSE) == TRUE);
37 bool CGit::ms_bMsys2Git = (CRegDWORD(_T("Software\\TortoiseGit\\Msys2Hack"), FALSE) == TRUE);
38 int CGit::m_LogEncode=CP_UTF8;
39 typedef CComCritSecLock<CComCriticalSection> CAutoLocker;
40
41 static LPCTSTR nextpath(const wchar_t* path, wchar_t* buf, size_t buflen)
42 {
43 if (!path || !buf || buflen == 0)
44 return nullptr;
45
46 const wchar_t* base = path;
47 wchar_t term = (*path == L'"') ? *path++ : L';';
48
49 for (buflen--; *path && *path != term && buflen; buflen--)
50 *buf++ = *path++;
51
52 *buf = L'\0'; /* reserved a byte via initial subtract */
53
54 while (*path == term || *path == L';')
55 ++path;
56
57 return (path != base) ? path : nullptr;
58 }
59
60 static CString FindFileOnPath(const CString& filename, LPCTSTR env, bool wantDirectory = false)
61 {
62 TCHAR buf[MAX_PATH] = { 0 };
63
64 // search in all paths defined in PATH
65 while ((env = nextpath(env, buf, MAX_PATH - 1)) != nullptr && *buf)
66 {
67 TCHAR *pfin = buf + _tcslen(buf) - 1;
68
69 // ensure trailing slash
70 if (*pfin != _T('/') && *pfin != _T('\\'))
71 _tcscpy_s(++pfin, 2, _T("\\")); // we have enough space left, MAX_PATH-1 is used in nextpath above
72
73 const size_t len = _tcslen(buf);
74
75 if ((len + filename.GetLength()) < MAX_PATH)
76 _tcscpy_s(pfin + 1, MAX_PATH - len, filename);
77 else
78 break;
79
80 if (PathFileExists(buf))
81 {
82 if (wantDirectory)
83 pfin[1] = 0;
84 return buf;
85 }
86 }
87
88 return _T("");
89 }
90
91 static BOOL FindGitPath()
92 {
93 size_t size;
94 _tgetenv_s(&size, nullptr, 0, _T("PATH"));
95 if (!size)
96 return FALSE;
97
98 TCHAR* env = (TCHAR*)alloca(size * sizeof(TCHAR));
99 if (!env)
100 return FALSE;
101 _tgetenv_s(&size, env, size, _T("PATH"));
102
103 CString gitExeDirectory = FindFileOnPath(_T("git.exe"), env, true);
104 if (!gitExeDirectory.IsEmpty())
105 {
106 CGit::ms_LastMsysGitDir = gitExeDirectory;
107 CGit::ms_LastMsysGitDir.TrimRight(_T("\\"));
108 if (CGit::ms_LastMsysGitDir.GetLength() > 12 && (CGit::ms_LastMsysGitDir.Right(12) == _T("\\mingw32\\bin") || CGit::ms_LastMsysGitDir.Right(12) == _T("\\mingw64\\bin")))
109 {
110 // prefer cmd directory as early Git for Windows 2.x releases only had this
111 CString installRoot = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 12) + _T("\\cmd\\git.exe");
112 if (PathFileExists(installRoot))
113 CGit::ms_LastMsysGitDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 12) + _T("\\cmd");
114 }
115 if (CGit::ms_LastMsysGitDir.GetLength() > 4 && CGit::ms_LastMsysGitDir.Right(4) == _T("\\cmd"))
116 {
117 // often the msysgit\cmd folder is on the %PATH%, but
118 // that git.exe does not work, so try to guess the bin folder
119 CString binDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin\\git.exe");
120 if (PathFileExists(binDir))
121 CGit::ms_LastMsysGitDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin");
122 }
123 return TRUE;
124 }
125
126 return FALSE;
127 }
128
129 static CString FindExecutableOnPath(const CString& executable, LPCTSTR env)
130 {
131 CString filename = executable;
132
133 if (executable.GetLength() < 4 || executable.Find(_T(".exe"), executable.GetLength() - 4) != executable.GetLength() - 4)
134 filename += _T(".exe");
135
136 if (PathFileExists(filename))
137 return filename;
138
139 filename = FindFileOnPath(filename, env);
140 if (!filename.IsEmpty())
141 return filename;
142
143 return executable;
144 }
145
146 static bool g_bSortLogical;
147 static bool g_bSortLocalBranchesFirst;
148 static bool g_bSortTagsReversed;
149 static git_cred_acquire_cb g_Git2CredCallback;
150 static git_transport_certificate_check_cb g_Git2CheckCertificateCallback;
151
152 static void GetSortOptions()
153 {
154 g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_CURRENT_USER);
155 if (g_bSortLogical)
156 g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_LOCAL_MACHINE);
157 g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_CURRENT_USER);
158 if (g_bSortLocalBranchesFirst)
159 g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_LOCAL_MACHINE);
160 g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_LOCAL_MACHINE);
161 if (!g_bSortTagsReversed)
162 g_bSortTagsReversed = !!CRegDWORD(L"Software\\TortoiseGit\\SortTagsReversed", 0, false, HKEY_CURRENT_USER);
163 }
164
165 static int LogicalComparePredicate(const CString &left, const CString &right)
166 {
167 if (g_bSortLogical)
168 return StrCmpLogicalW(left, right) < 0;
169 return StrCmpI(left, right) < 0;
170 }
171
172 static int LogicalCompareReversedPredicate(const CString &left, const CString &right)
173 {
174 if (g_bSortLogical)
175 return StrCmpLogicalW(left, right) > 0;
176 return StrCmpI(left, right) > 0;
177 }
178
179 static int LogicalCompareBranchesPredicate(const CString &left, const CString &right)
180 {
181 if (g_bSortLocalBranchesFirst)
182 {
183 int leftIsRemote = left.Find(_T("remotes/"));
184 int rightIsRemote = right.Find(_T("remotes/"));
185
186 if (leftIsRemote == 0 && rightIsRemote < 0)
187 return false;
188 else if (leftIsRemote < 0 && rightIsRemote == 0)
189 return true;
190 }
191 if (g_bSortLogical)
192 return StrCmpLogicalW(left, right) < 0;
193 return StrCmpI(left, right) < 0;
194 }
195
196 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024
197
198 CString CGit::ms_LastMsysGitDir;
199 CString CGit::ms_MsysGitRootDir;
200 int CGit::ms_LastMsysGitVersion = 0;
201 CGit g_Git;
202
203
204 CGit::CGit(void)
205 {
206 git_libgit2_init();
207 GetCurrentDirectory(MAX_PATH, CStrBuf(m_CurrentDir, MAX_PATH));
208 m_IsGitDllInited = false;
209 m_GitDiff=0;
210 m_GitSimpleListDiff=0;
211 m_IsUseGitDLL = !!CRegDWORD(_T("Software\\TortoiseGit\\UsingGitDLL"),1);
212 m_IsUseLibGit2 = !!CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE);
213 m_IsUseLibGit2_mask = CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2_mask"), DEFAULT_USE_LIBGIT2_MASK);
214
215 SecureZeroMemory(&m_CurrentGitPi, sizeof(PROCESS_INFORMATION));
216
217 GetSortOptions();
218 this->m_bInitialized =false;
219 CheckMsysGitDir();
220 m_critGitDllSec.Init();
221 m_critSecThreadMap.Init();
222 }
223
224 CGit::~CGit(void)
225 {
226 if(this->m_GitDiff)
227 {
228 git_close_diff(m_GitDiff);
229 m_GitDiff=0;
230 }
231 if(this->m_GitSimpleListDiff)
232 {
233 git_close_diff(m_GitSimpleListDiff);
234 m_GitSimpleListDiff=0;
235 }
236 git_libgit2_shutdown();
237 m_critSecThreadMap.Term();
238 m_critGitDllSec.Term();
239 }
240
241 bool CGit::IsBranchNameValid(const CString& branchname)
242 {
243 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
244 return false;
245 if (branchname.FindOneOf(_T("\"|<>")) >= 0) // not valid on Windows
246 return false;
247 CStringA branchA = CUnicodeUtils::GetUTF8(_T("refs/heads/") + branchname);
248 return !!git_reference_is_valid_name(branchA);
249 }
250
251 static bool IsPowerShell(CString cmd)
252 {
253 cmd.MakeLower();
254 int powerShellPos = cmd.Find(_T("powershell"));
255 if (powerShellPos < 0)
256 return false;
257
258 // found the word powershell, check that it is the command and not any parameter
259 int end = cmd.GetLength();
260 if (end > 0 && cmd[0] == L'"')
261 {
262 int secondDoubleQuote = cmd.Find(_T('"'), 1);
263 if (secondDoubleQuote > 0)
264 end = secondDoubleQuote;
265 }
266 else
267 {
268 int firstSpace = cmd.Find(_T(' '));
269 if (firstSpace > 0)
270 end = firstSpace;
271 }
272
273 return (end - 4 - 10 == powerShellPos || end - 10 == powerShellPos); // len(".exe")==4, len("powershell")==10
274 }
275
276 int CGit::RunAsync(CString cmd, PROCESS_INFORMATION *piOut, HANDLE *hReadOut, HANDLE *hErrReadOut, CString *StdioFile)
277 {
278 CAutoGeneralHandle hRead, hWrite, hReadErr, hWriteErr;
279 CAutoGeneralHandle hStdioFile;
280
281 SECURITY_ATTRIBUTES sa = { 0 };
282 sa.nLength = sizeof(SECURITY_ATTRIBUTES);
283 sa.bInheritHandle=TRUE;
284 if (!CreatePipe(hRead.GetPointer(), hWrite.GetPointer(), &sa, 0))
285 {
286 CString err = CFormatMessageWrapper();
287 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), (LPCTSTR)err.Trim());
288 return TGIT_GIT_ERROR_OPEN_PIP;
289 }
290 if (hErrReadOut && !CreatePipe(hReadErr.GetPointer(), hWriteErr.GetPointer(), &sa, 0))
291 {
292 CString err = CFormatMessageWrapper();
293 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), (LPCTSTR)err.Trim());
294 return TGIT_GIT_ERROR_OPEN_PIP;
295 }
296
297 if(StdioFile)
298 hStdioFile = CreateFile(*StdioFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
299
300 STARTUPINFO si = { 0 };
301 PROCESS_INFORMATION pi = { 0 };
302 si.cb=sizeof(STARTUPINFO);
303
304 if (hErrReadOut)
305 si.hStdError = hWriteErr;
306 else
307 si.hStdError = hWrite;
308 if(StdioFile)
309 si.hStdOutput=hStdioFile;
310 else
311 si.hStdOutput=hWrite;
312
313 si.wShowWindow=SW_HIDE;
314 si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
315
316 LPTSTR pEnv = m_Environment;
317 DWORD dwFlags = CREATE_UNICODE_ENVIRONMENT;
318
319 dwFlags |= CREATE_NEW_PROCESS_GROUP;
320
321 // 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,
322 // 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)
323 // => we keep using DETACHED_PROCESS as the default, but if cmd contains pwershell we use CREATE_NEW_CONSOLE
324 if (IsPowerShell(cmd))
325 dwFlags |= CREATE_NEW_CONSOLE;
326 else
327 dwFlags |= DETACHED_PROCESS;
328
329 memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));
330
331 bool startsWithGit = wcsncmp(cmd, L"git", 3) == 0;
332 if (ms_bMsys2Git && startsWithGit && wcsncmp(cmd, L"git.exe config ", 15) != 0)
333 {
334 cmd.Replace(_T("\\"), _T("\\\\\\\\"));
335 cmd.Replace(_T("\""), _T("\\\""));
336 cmd = _T('"') + CGit::ms_LastMsysGitDir + _T("\\bash.exe\" -c \"/usr/bin/") + cmd + _T('"');
337 }
338 else if (ms_bCygwinGit && startsWithGit && wcsncmp(cmd, L"git.exe config ", 15) != 0)
339 {
340 cmd.Replace(_T('\\'), _T('/'));
341 cmd.Replace(_T("\""), _T("\\\""));
342 cmd = _T('"') + CGit::ms_LastMsysGitDir + _T("\\bash.exe\" -c \"/bin/") + cmd + _T('"');
343 }
344 else if (startsWithGit || wcsncmp(cmd, L"bash", 4) == 0)
345 {
346 int firstSpace = cmd.Find(_T(" "));
347 if (firstSpace > 0)
348 cmd = _T('"')+CGit::ms_LastMsysGitDir+_T("\\")+ cmd.Left(firstSpace) + _T('"')+ cmd.Mid(firstSpace);
349 else
350 cmd=_T('"')+CGit::ms_LastMsysGitDir+_T("\\")+cmd+_T('"');
351 }
352
353 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), (LPCTSTR)cmd);
354 if(!CreateProcess(nullptr, cmd.GetBuffer(), nullptr, nullptr, TRUE, dwFlags, pEnv, m_CurrentDir.GetBuffer(), &si, &pi))
355 {
356 CString err = CFormatMessageWrapper();
357 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": error while executing command: %s\n"), (LPCTSTR)err.Trim());
358 return TGIT_GIT_ERROR_CREATE_PROCESS;
359 }
360
361 m_CurrentGitPi = pi;
362
363 if(piOut)
364 *piOut=pi;
365 if(hReadOut)
366 *hReadOut = hRead.Detach();
367 if(hErrReadOut)
368 *hErrReadOut = hReadErr.Detach();
369 return 0;
370 }
371 //Must use sperate function to convert ANSI str to union code string
372 //Becuase A2W use stack as internal convert buffer.
373 void CGit::StringAppend(CString *str, const BYTE *p, int code,int length)
374 {
375 if (!str)
376 return ;
377
378 int len ;
379 if(length<0)
380 len = (int)strlen((const char*)p);
381 else
382 len=length;
383 if (len == 0)
384 return;
385 int currentContentLen = str->GetLength();
386 WCHAR * buf = str->GetBuffer(len * 4 + 1 + currentContentLen) + currentContentLen;
387 int appendedLen = MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len * 4);
388 str->ReleaseBuffer(currentContentLen + appendedLen); // no - 1 because MultiByteToWideChar is called with a fixed length (thus no nul char included)
389 }
390
391 // This method was originally used to check for orphaned branches
392 BOOL CGit::CanParseRev(CString ref)
393 {
394 if (ref.IsEmpty())
395 ref = _T("HEAD");
396
397 CString cmdout;
398 if (Run(_T("git.exe rev-parse --revs-only ") + ref, &cmdout, CP_UTF8))
399 return FALSE;
400 if(cmdout.IsEmpty())
401 return FALSE;
402
403 return TRUE;
404 }
405
406 // Checks if we have an orphaned HEAD
407 BOOL CGit::IsInitRepos()
408 {
409 CGitHash hash;
410 if (GetHash(hash, _T("HEAD")) != 0)
411 return FALSE;
412 return hash.IsEmpty() ? TRUE : FALSE;
413 }
414
415 DWORD WINAPI CGit::AsyncReadStdErrThread(LPVOID lpParam)
416 {
417 PASYNCREADSTDERRTHREADARGS pDataArray;
418 pDataArray = (PASYNCREADSTDERRTHREADARGS)lpParam;
419
420 DWORD readnumber;
421 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
422 while (ReadFile(pDataArray->fileHandle, data, CALL_OUTPUT_READ_CHUNK_SIZE, &readnumber, nullptr))
423 {
424 if (pDataArray->pcall->OnOutputErrData(data,readnumber))
425 break;
426 }
427
428 return 0;
429 }
430
431 #ifdef _MFC_VER
432 void CGit::KillRelatedThreads(CWinThread* thread)
433 {
434 CAutoLocker lock(m_critSecThreadMap);
435 auto it = m_AsyncReadStdErrThreadMap.find(thread->m_nThreadID);
436 if (it != m_AsyncReadStdErrThreadMap.cend())
437 {
438 TerminateThread(it->second, (DWORD)-1);
439 m_AsyncReadStdErrThreadMap.erase(it);
440 }
441 TerminateThread(thread->m_hThread, (DWORD)-1);
442 }
443 #endif
444
445 int CGit::Run(CGitCall* pcall)
446 {
447 PROCESS_INFORMATION pi;
448 CAutoGeneralHandle hRead, hReadErr;
449 if (RunAsync(pcall->GetCmd(), &pi, hRead.GetPointer(), hReadErr.GetPointer()))
450 return TGIT_GIT_ERROR_CREATE_PROCESS;
451
452 CAutoGeneralHandle piThread(pi.hThread);
453 CAutoGeneralHandle piProcess(pi.hProcess);
454
455 ASYNCREADSTDERRTHREADARGS threadArguments;
456 threadArguments.fileHandle = hReadErr;
457 threadArguments.pcall = pcall;
458 CAutoGeneralHandle thread = CreateThread(nullptr, 0, AsyncReadStdErrThread, &threadArguments, 0, nullptr);
459
460 if (thread)
461 {
462 CAutoLocker lock(m_critSecThreadMap);
463 m_AsyncReadStdErrThreadMap[GetCurrentThreadId()] = thread;
464 }
465
466 DWORD readnumber;
467 BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
468 bool bAborted=false;
469 while (ReadFile(hRead, data, CALL_OUTPUT_READ_CHUNK_SIZE, &readnumber, nullptr))
470 {
471 // TODO: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
472 if(!bAborted)//For now, flush output when command aborted.
473 if(pcall->OnOutputData(data,readnumber))
474 bAborted=true;
475 }
476 if(!bAborted)
477 pcall->OnEnd();
478
479 if (thread)
480 {
481 WaitForSingleObject(thread, INFINITE);
482
483 CAutoLocker lock(m_critSecThreadMap);
484 m_AsyncReadStdErrThreadMap.erase(GetCurrentThreadId());
485 }
486
487 WaitForSingleObject(pi.hProcess, INFINITE);
488 DWORD exitcode =0;
489
490 if(!GetExitCodeProcess(pi.hProcess,&exitcode))
491 {
492 CString err = CFormatMessageWrapper();
493 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), (LPCTSTR)err.Trim());
494 return TGIT_GIT_ERROR_GET_EXIT_CODE;
495 }
496 else
497 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);
498
499 return exitcode;
500 }
501 class CGitCall_ByteVector : public CGitCall
502 {
503 public:
504 CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector, BYTE_VECTOR* pvectorErr = nullptr) : CGitCall(cmd),m_pvector(pvector), m_pvectorErr(pvectorErr) {}
505 virtual bool OnOutputData(const BYTE* data, size_t size)
506 {
507 if (!m_pvector || size == 0)
508 return false;
509 size_t oldsize=m_pvector->size();
510 m_pvector->resize(m_pvector->size()+size);
511 memcpy(&*(m_pvector->begin()+oldsize),data,size);
512 return false;
513 }
514 virtual bool OnOutputErrData(const BYTE* data, size_t size)
515 {
516 if (!m_pvectorErr || size == 0)
517 return false;
518 size_t oldsize = m_pvectorErr->size();
519 m_pvectorErr->resize(m_pvectorErr->size() + size);
520 memcpy(&*(m_pvectorErr->begin() + oldsize), data, size);
521 return false;
522 }
523 BYTE_VECTOR* m_pvector;
524 BYTE_VECTOR* m_pvectorErr;
525 };
526 int CGit::Run(CString cmd,BYTE_VECTOR *vector, BYTE_VECTOR *vectorErr)
527 {
528 CGitCall_ByteVector call(cmd, vector, vectorErr);
529 return Run(&call);
530 }
531 int CGit::Run(CString cmd, CString* output, int code)
532 {
533 CString err;
534 int ret;
535 ret = Run(cmd, output, &err, code);
536
537 if (output && !err.IsEmpty())
538 {
539 if (!output->IsEmpty())
540 *output += _T("\n");
541 *output += err;
542 }
543
544 return ret;
545 }
546 int CGit::Run(CString cmd, CString* output, CString* outputErr, int code)
547 {
548 BYTE_VECTOR vector, vectorErr;
549 int ret;
550 if (outputErr)
551 ret = Run(cmd, &vector, &vectorErr);
552 else
553 ret = Run(cmd, &vector);
554
555 vector.push_back(0);
556 StringAppend(output, &(vector[0]), code);
557
558 if (outputErr)
559 {
560 vectorErr.push_back(0);
561 StringAppend(outputErr, &(vectorErr[0]), code);
562 }
563
564 return ret;
565 }
566
567 class CGitCallCb : public CGitCall
568 {
569 public:
570 CGitCallCb(CString cmd, const GitReceiverFunc& recv, BYTE_VECTOR* pvectorErr = nullptr)
571 : CGitCall(cmd)
572 , m_recv(recv)
573 , m_pvectorErr(pvectorErr)
574 {}
575
576 virtual bool OnOutputData(const BYTE* data, size_t size) override
577 {
578 // Add data
579 if (size == 0)
580 return false;
581 int oldEndPos = m_buffer.GetLength();
582 memcpy(m_buffer.GetBuffer(oldEndPos + (int)size) + oldEndPos, data, size);
583 m_buffer.ReleaseBuffer(oldEndPos + (int)size);
584
585 // Break into lines and feed to m_recv
586 int eolPos;
587 while ((eolPos = m_buffer.Find('\n')) >= 0)
588 {
589 m_recv(m_buffer.Left(eolPos));
590 m_buffer = m_buffer.Mid(eolPos + 1);
591 }
592 return false;
593 }
594
595 virtual bool OnOutputErrData(const BYTE* data, size_t size) override
596 {
597 if (!m_pvectorErr || size == 0)
598 return false;
599 size_t oldsize = m_pvectorErr->size();
600 m_pvectorErr->resize(m_pvectorErr->size() + size);
601 memcpy(&*(m_pvectorErr->begin() + oldsize), data, size);
602 return false;
603 }
604
605 virtual void OnEnd() override
606 {
607 if (!m_buffer.IsEmpty())
608 m_recv(m_buffer);
609 m_buffer.Empty(); // Just for sure
610 }
611
612 private:
613 GitReceiverFunc m_recv;
614 CStringA m_buffer;
615 BYTE_VECTOR* m_pvectorErr;
616 };
617
618 int CGit::Run(CString cmd, const GitReceiverFunc& recv, CString* outputErr)
619 {
620 if (outputErr)
621 {
622 BYTE_VECTOR vectorErr;
623 CGitCallCb call(cmd, recv, &vectorErr);
624 int ret = Run(&call);
625 vectorErr.push_back(0);
626 StringAppend(outputErr, &(vectorErr[0]));
627 return ret;
628 }
629
630 CGitCallCb call(cmd, recv);
631 return Run(&call);
632 }
633
634 CString CGit::GetUserName(void)
635 {
636 CEnvironment env;
637 env.CopyProcessEnvironment();
638 CString envname = env.GetEnv(_T("GIT_AUTHOR_NAME"));
639 if (!envname.IsEmpty())
640 return envname;
641 return GetConfigValue(L"user.name");
642 }
643 CString CGit::GetUserEmail(void)
644 {
645 CEnvironment env;
646 env.CopyProcessEnvironment();
647 CString envmail = env.GetEnv(_T("GIT_AUTHOR_EMAIL"));
648 if (!envmail.IsEmpty())
649 return envmail;
650
651 return GetConfigValue(L"user.email");
652 }
653
654 CString CGit::GetConfigValue(const CString& name, const CString& def, bool wantBool)
655 {
656 CString configValue;
657 if(this->m_IsUseGitDLL)
658 {
659 CAutoLocker lock(g_Git.m_critGitDllSec);
660
661 try
662 {
663 CheckAndInitDll();
664 }catch(...)
665 {
666 }
667 CStringA key, value;
668 key = CUnicodeUtils::GetUTF8(name);
669
670 try
671 {
672 if (git_get_config(key, CStrBufA(value, 4096), 4096))
673 return def;
674 }
675 catch (const char *msg)
676 {
677 ::MessageBox(nullptr, _T("Could not get config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
678 return def;
679 }
680
681 StringAppend(&configValue, (BYTE*)(LPCSTR)value);
682 return configValue;
683 }
684 else
685 {
686 CString cmd;
687 cmd.Format(L"git.exe config%s %s", wantBool ? _T(" --bool") : _T(""), (LPCTSTR)name);
688 if (Run(cmd, &configValue, nullptr, CP_UTF8))
689 return def;
690 if (configValue.IsEmpty())
691 return configValue;
692 return configValue.Left(configValue.GetLength() - 1); // strip last newline character
693 }
694 }
695
696 bool CGit::GetConfigValueBool(const CString& name, const bool def)
697 {
698 CString configValue = GetConfigValue(name, def ? _T("true") : _T("false"), true);
699 configValue.MakeLower();
700 configValue.Trim();
701 if(configValue == _T("true") || configValue == _T("on") || configValue == _T("yes") || StrToInt(configValue) != 0)
702 return true;
703 else
704 return false;
705 }
706
707 int CGit::GetConfigValueInt32(const CString& name, const int def)
708 {
709 CString configValue = GetConfigValue(name);
710 int value = def;
711 if (!git_config_parse_int32(&value, CUnicodeUtils::GetUTF8(configValue)))
712 return value;
713 return def;
714 }
715
716 int CGit::SetConfigValue(const CString& key, const CString& value, CONFIG_TYPE type)
717 {
718 if(this->m_IsUseGitDLL)
719 {
720 CAutoLocker lock(g_Git.m_critGitDllSec);
721
722 try
723 {
724 CheckAndInitDll();
725 }catch(...)
726 {
727 }
728 CStringA keya, valuea;
729 keya = CUnicodeUtils::GetMulti(key, CP_UTF8);
730 valuea = CUnicodeUtils::GetUTF8(value);
731
732 try
733 {
734 return [=]() { return get_set_config(keya, valuea, type); }();
735 }
736 catch (const char *msg)
737 {
738 ::MessageBox(nullptr, _T("Could not set config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
739 return -1;
740 }
741 }
742 else
743 {
744 CString cmd;
745 CString option;
746 switch(type)
747 {
748 case CONFIG_GLOBAL:
749 option = _T("--global");
750 break;
751 case CONFIG_SYSTEM:
752 option = _T("--system");
753 break;
754 default:
755 break;
756 }
757 CString mangledValue = value;
758 mangledValue.Replace(_T("\\\""), _T("\\\\\""));
759 mangledValue.Replace(_T("\""), _T("\\\""));
760 cmd.Format(_T("git.exe config %s %s \"%s\""), (LPCTSTR)option, (LPCTSTR)key, (LPCTSTR)mangledValue);
761 CString out;
762 if (Run(cmd, &out, nullptr, CP_UTF8))
763 return -1;
764 }
765 return 0;
766 }
767
768 int CGit::UnsetConfigValue(const CString& key, CONFIG_TYPE type)
769 {
770 if(this->m_IsUseGitDLL)
771 {
772 CAutoLocker lock(g_Git.m_critGitDllSec);
773
774 try
775 {
776 CheckAndInitDll();
777 }catch(...)
778 {
779 }
780 CStringA keya;
781 keya = CUnicodeUtils::GetMulti(key, CP_UTF8);
782
783 try
784 {
785 return [=]() { return get_set_config(keya, nullptr, type); }();
786 }
787 catch (const char *msg)
788 {
789 ::MessageBox(nullptr, _T("Could not unset config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
790 return -1;
791 }
792 }
793 else
794 {
795 CString cmd;
796 CString option;
797 switch(type)
798 {
799 case CONFIG_GLOBAL:
800 option = _T("--global");
801 break;
802 case CONFIG_SYSTEM:
803 option = _T("--system");
804 break;
805 default:
806 break;
807 }
808 cmd.Format(_T("git.exe config %s --unset %s"), (LPCTSTR)option, (LPCTSTR)key);
809 CString out;
810 if (Run(cmd, &out, nullptr, CP_UTF8))
811 return -1;
812 }
813 return 0;
814 }
815
816 CString CGit::GetCurrentBranch(bool fallback)
817 {
818 CString output;
819 //Run(_T("git.exe branch"),&branch);
820
821 int result = GetCurrentBranchFromFile(m_CurrentDir, output, fallback);
822 if (result != 0 && ((result == 1 && !fallback) || result != 1))
823 return _T("(no branch)");
824 else
825 return output;
826 }
827
828 void CGit::GetRemoteTrackedBranch(const CString& localBranch, CString& pullRemote, CString& pullBranch)
829 {
830 if (localBranch.IsEmpty())
831 return;
832
833 CString configName;
834 configName.Format(L"branch.%s.remote", (LPCTSTR)localBranch);
835 pullRemote = GetConfigValue(configName);
836
837 //Select pull-branch from current branch
838 configName.Format(L"branch.%s.merge", (LPCTSTR)localBranch);
839 pullBranch = StripRefName(GetConfigValue(configName));
840 }
841
842 void CGit::GetRemoteTrackedBranchForHEAD(CString& remote, CString& branch)
843 {
844 CString refName;
845 if (GetCurrentBranchFromFile(m_CurrentDir, refName))
846 return;
847 GetRemoteTrackedBranch(StripRefName(refName), remote, branch);
848 }
849
850 void CGit::GetRemotePushBranch(const CString& localBranch, CString& pushRemote, CString& pushBranch)
851 {
852 if (localBranch.IsEmpty())
853 return;
854
855 CString configName;
856
857 configName.Format(L"branch.%s.pushremote", (LPCTSTR)localBranch);
858 pushRemote = g_Git.GetConfigValue(configName);
859 if (pushRemote.IsEmpty())
860 {
861 pushRemote = g_Git.GetConfigValue(L"remote.pushdefault");
862 if (pushRemote.IsEmpty())
863 {
864 configName.Format(L"branch.%s.remote", (LPCTSTR)localBranch);
865 pushRemote = g_Git.GetConfigValue(configName);
866 }
867 }
868
869 configName.Format(L"branch.%s.pushbranch", (LPCTSTR)localBranch);
870 pushBranch = g_Git.GetConfigValue(configName); // do not strip branch name (for gerrit), see issue #1609)
871 if (pushBranch.IsEmpty())
872 {
873 configName.Format(L"branch.%s.merge", (LPCTSTR)localBranch);
874 pushBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
875 }
876 }
877
878 CString CGit::GetFullRefName(const CString& shortRefName)
879 {
880 CString refName;
881 CString cmd;
882 cmd.Format(L"git.exe rev-parse --symbolic-full-name %s", (LPCTSTR)shortRefName);
883 if (Run(cmd, &refName, nullptr, CP_UTF8) != 0)
884 return CString();//Error
885 return refName.TrimRight();
886 }
887
888 CString CGit::StripRefName(CString refName)
889 {
890 if(wcsncmp(refName, L"refs/heads/", 11) == 0)
891 refName = refName.Mid(11);
892 else if(wcsncmp(refName, L"refs/", 5) == 0)
893 refName = refName.Mid(5);
894 return refName.TrimRight();
895 }
896
897 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut, bool fallback)
898 {
899 // read current branch name like git-gui does, by parsing the .git/HEAD file directly
900
901 if ( sProjectRoot.IsEmpty() )
902 return -1;
903
904 CString sDotGitPath;
905 if (!GitAdminDir::GetAdminDirPath(sProjectRoot, sDotGitPath))
906 return -1;
907
908 CString sHeadFile = sDotGitPath + _T("HEAD");
909
910 CAutoFILE pFile = _tfsopen(sHeadFile.GetString(), _T("r"), SH_DENYWR);
911 if (!pFile)
912 return -1;
913
914 char s[256] = {0};
915 fgets(s, sizeof(s), pFile);
916
917 const char *pfx = "ref: refs/heads/";
918 const int len = 16;//strlen(pfx)
919
920 if ( !strncmp(s, pfx, len) )
921 {
922 //# We're on a branch. It might not exist. But
923 //# HEAD looks good enough to be a branch.
924 CStringA utf8Branch(s + len);
925 sBranchOut = CUnicodeUtils::GetUnicode(utf8Branch);
926 sBranchOut.TrimRight(_T(" \r\n\t"));
927
928 if ( sBranchOut.IsEmpty() )
929 return -1;
930 }
931 else if (fallback)
932 {
933 CStringA utf8Hash(s);
934 CString unicodeHash = CUnicodeUtils::GetUnicode(utf8Hash);
935 unicodeHash.TrimRight(_T(" \r\n\t"));
936 if (CGitHash::IsValidSHA1(unicodeHash))
937 sBranchOut = unicodeHash;
938 else
939 //# Assume this is a detached head.
940 sBranchOut = _T("HEAD");
941 return 1;
942 }
943 else
944 {
945 //# Assume this is a detached head.
946 sBranchOut = "HEAD";
947
948 return 1;
949 }
950
951 return 0;
952 }
953
954 int CGit::BuildOutputFormat(CString &format,bool IsFull)
955 {
956 CString log;
957 log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
958 format += log;
959 if(IsFull)
960 {
961 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
962 format += log;
963 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
964 format += log;
965 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
966 format += log;
967 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
968 format += log;
969 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
970 format += log;
971 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
972 format += log;
973 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
974 format += log;
975 }
976
977 log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
978 format += log;
979 log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
980 format += log;
981 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
982 format += log;
983
984 if(IsFull)
985 {
986 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
987 format += log;
988 }
989 return 0;
990 }
991
992 CString CGit::GetLogCmd(const CString& range, const CTGitPath* path, int mask, CFilterData* Filter, int logOrderBy)
993 {
994 CString param;
995
996 if(mask& LOG_INFO_STAT )
997 param += _T(" --numstat");
998 if(mask& LOG_INFO_FILESTATE)
999 param += _T(" --raw");
1000
1001 if(mask& LOG_INFO_FULLHISTORY)
1002 param += _T(" --full-history");
1003
1004 if(mask& LOG_INFO_BOUNDARY)
1005 param += _T(" --left-right --boundary");
1006
1007 if(mask& CGit::LOG_INFO_ALL_BRANCH)
1008 param += _T(" --all");
1009
1010 if (mask& CGit::LOG_INFO_BASIC_REFS)
1011 {
1012 param += _T(" --branches");
1013 param += _T(" --tags");
1014 param += _T(" --remotes");
1015 param += _T(" --glob=stas[h]"); // require at least one glob operator
1016 param += _T(" --glob=bisect");
1017 }
1018
1019 if(mask & CGit::LOG_INFO_LOCAL_BRANCHES)
1020 param += _T(" --branches");
1021
1022 if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
1023 param += _T(" -C");
1024
1025 if(mask& CGit::LOG_INFO_DETECT_RENAME )
1026 param += _T(" -M");
1027
1028 if(mask& CGit::LOG_INFO_FIRST_PARENT )
1029 param += _T(" --first-parent");
1030
1031 if(mask& CGit::LOG_INFO_NO_MERGE )
1032 param += _T(" --no-merges");
1033
1034 if(mask& CGit::LOG_INFO_FOLLOW)
1035 param += _T(" --follow");
1036
1037 if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
1038 param += _T(" -c");
1039
1040 if(mask& CGit::LOG_INFO_FULL_DIFF)
1041 param += _T(" --full-diff");
1042
1043 if(mask& CGit::LOG_INFO_SIMPILFY_BY_DECORATION)
1044 param += _T(" --simplify-by-decoration");
1045
1046 if (Filter)
1047 {
1048 if (Filter->m_NumberOfLogsScale >= CFilterData::SHOW_LAST_N_YEARS)
1049 {
1050 CTime now = CTime::GetCurrentTime();
1051 CTime time = CTime(now.GetYear(), now.GetMonth(), now.GetDay(), 0, 0, 0);
1052 __time64_t substract = 86400;
1053 CString scale;
1054 switch (Filter->m_NumberOfLogsScale)
1055 {
1056 case CFilterData::SHOW_LAST_N_YEARS:
1057 substract *= 365;
1058 break;
1059 case CFilterData::SHOW_LAST_N_MONTHS:
1060 substract *= 30;
1061 break;
1062 case CFilterData::SHOW_LAST_N_WEEKS:
1063 substract *= 7;
1064 break;
1065 }
1066 Filter->m_From = (DWORD)time.GetTime() - (Filter->m_NumberOfLogs * substract);
1067 }
1068 if (Filter->m_NumberOfLogsScale == CFilterData::SHOW_LAST_N_COMMITS)
1069 param.AppendFormat(L" -n%ld", Filter->m_NumberOfLogs);
1070 else if (Filter->m_NumberOfLogsScale >= CFilterData::SHOW_LAST_SEL_DATE && Filter->m_From > 0)
1071 param.AppendFormat(L" --max-age=%I64u", Filter->m_From);
1072 }
1073
1074 if( Filter && (Filter->m_To != -1))
1075 param.AppendFormat(L" --min-age=%I64u", Filter->m_To);
1076
1077 bool isgrep = false;
1078 if( Filter && (!Filter->m_Author.IsEmpty()))
1079 {
1080 param.AppendFormat(L" --author=\"%s\"", (LPCTSTR)Filter->m_Author);
1081 isgrep = true;
1082 }
1083
1084 if( Filter && (!Filter->m_Committer.IsEmpty()))
1085 {
1086 param.AppendFormat(L" --committer=\"%s\"", (LPCTSTR)Filter->m_Author);
1087 isgrep = true;
1088 }
1089
1090 if( Filter && (!Filter->m_MessageFilter.IsEmpty()))
1091 {
1092 param.AppendFormat(L" --grep=\"%s\"", (LPCTSTR)Filter->m_MessageFilter);
1093 isgrep = true;
1094 }
1095
1096 if(Filter && isgrep)
1097 {
1098 if(!Filter->m_IsRegex)
1099 param += _T(" --fixed-strings");
1100
1101 param += _T(" --regexp-ignore-case --extended-regexp");
1102 }
1103
1104 if (logOrderBy == LOG_ORDER_TOPOORDER || (mask & CGit::LOG_ORDER_TOPOORDER))
1105 param += _T(" --topo-order");
1106 else if (logOrderBy == LOG_ORDER_DATEORDER)
1107 param += _T(" --date-order");
1108
1109 CString cmd;
1110 CString file;
1111 if (path)
1112 file.Format(_T(" \"%s\""), (LPCTSTR)path->GetGitPathString());
1113 // gitdll.dll:setup_revisions() only looks at args[1] and greater. To account for this, pass a dummy parameter in the 0th place
1114 cmd.Format(_T("--ignore-this-parameter -z%s %s --parents --%s"), (LPCTSTR)param, (LPCTSTR)range, (LPCTSTR)file);
1115
1116 return cmd;
1117 }
1118 #define BUFSIZE 512
1119 void GetTempPath(CString &path)
1120 {
1121 TCHAR lpPathBuffer[BUFSIZE] = { 0 };
1122 DWORD dwRetVal;
1123 DWORD dwBufSize=BUFSIZE;
1124 dwRetVal = GetTortoiseGitTempPath(dwBufSize, // length of the buffer
1125 lpPathBuffer); // buffer for path
1126 if (dwRetVal > dwBufSize || (dwRetVal == 0))
1127 path.Empty();
1128 path.Format(_T("%s"),lpPathBuffer);
1129 }
1130 CString GetTempFile()
1131 {
1132 TCHAR lpPathBuffer[BUFSIZE] = { 0 };
1133 DWORD dwRetVal;
1134 DWORD dwBufSize=BUFSIZE;
1135 TCHAR szTempName[BUFSIZE] = { 0 };
1136 UINT uRetVal;
1137
1138 dwRetVal = GetTortoiseGitTempPath(dwBufSize, // length of the buffer
1139 lpPathBuffer); // buffer for path
1140 if (dwRetVal > dwBufSize || (dwRetVal == 0))
1141 return _T("");
1142 // Create a temporary file.
1143 uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
1144 TEXT("Patch"), // temp file name prefix
1145 0, // create unique name
1146 szTempName); // buffer for name
1147
1148 if (uRetVal == 0)
1149 return _T("");
1150
1151 return CString(szTempName);
1152 }
1153
1154 DWORD GetTortoiseGitTempPath(DWORD nBufferLength, LPTSTR lpBuffer)
1155 {
1156 DWORD result = ::GetTempPath(nBufferLength, lpBuffer);
1157 if (result == 0) return 0;
1158 if (!lpBuffer || (result + 13 > nBufferLength))
1159 {
1160 if (lpBuffer)
1161 lpBuffer[0] = '\0';
1162 return result + 13;
1163 }
1164
1165 _tcscat_s(lpBuffer, nBufferLength, _T("TortoiseGit\\"));
1166 CreateDirectory(lpBuffer, nullptr);
1167
1168 return result + 13;
1169 }
1170
1171 int CGit::RunLogFile(CString cmd, const CString &filename, CString *stdErr)
1172 {
1173 STARTUPINFO si;
1174 PROCESS_INFORMATION pi;
1175 si.cb=sizeof(STARTUPINFO);
1176 GetStartupInfo(&si);
1177
1178 SECURITY_ATTRIBUTES psa = {sizeof(psa), nullptr, TRUE};
1179 psa.bInheritHandle=TRUE;
1180
1181 CAutoGeneralHandle hReadErr, hWriteErr;
1182 if (!CreatePipe(hReadErr.GetPointer(), hWriteErr.GetPointer(), &psa, 0))
1183 {
1184 CString err = CFormatMessageWrapper();
1185 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), (LPCTSTR)err.Trim());
1186 return TGIT_GIT_ERROR_OPEN_PIP;
1187 }
1188
1189 CAutoFile houtfile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &psa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
1190 if (!houtfile)
1191 {
1192 CString err = CFormatMessageWrapper();
1193 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), (LPCTSTR)err.Trim());
1194 return TGIT_GIT_ERROR_OPEN_PIP;
1195 }
1196
1197 si.wShowWindow = SW_HIDE;
1198 si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
1199 si.hStdOutput = houtfile;
1200 si.hStdError = hWriteErr;
1201
1202 LPTSTR pEnv = m_Environment;
1203 DWORD dwFlags = CREATE_UNICODE_ENVIRONMENT;
1204
1205 if (wcsncmp(cmd, L"git", 3) == 0)
1206 cmd=CGit::ms_LastMsysGitDir+_T("\\")+cmd;
1207
1208 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), (LPCTSTR)cmd);
1209 if (!CreateProcess(nullptr, (LPWSTR)cmd.GetString(), nullptr, nullptr, TRUE, dwFlags, pEnv, (LPWSTR)m_CurrentDir.GetString(), &si, &pi))
1210 {
1211 CString err = CFormatMessageWrapper();
1212 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": failed to create Process: %s\n"), (LPCTSTR)err.Trim());
1213 stdErr = &err;
1214 return TGIT_GIT_ERROR_CREATE_PROCESS;
1215 }
1216
1217 CAutoGeneralHandle piThread(pi.hThread);
1218 CAutoGeneralHandle piProcess(pi.hProcess);
1219
1220 BYTE_VECTOR stderrVector;
1221 CGitCall_ByteVector pcall(L"", nullptr, &stderrVector);
1222 ASYNCREADSTDERRTHREADARGS threadArguments;
1223 threadArguments.fileHandle = hReadErr;
1224 threadArguments.pcall = &pcall;
1225 CAutoGeneralHandle thread = CreateThread(nullptr, 0, AsyncReadStdErrThread, &threadArguments, 0, nullptr);
1226
1227 if (thread)
1228 {
1229 CAutoLocker lock(m_critSecThreadMap);
1230 m_AsyncReadStdErrThreadMap[GetCurrentThreadId()] = thread;
1231 }
1232
1233 WaitForSingleObject(pi.hProcess,INFINITE);
1234
1235 hWriteErr.CloseHandle();
1236 hReadErr.CloseHandle();
1237
1238 if (thread)
1239 {
1240 WaitForSingleObject(thread, INFINITE);
1241
1242 CAutoLocker lock(m_critSecThreadMap);
1243 m_AsyncReadStdErrThreadMap.erase(GetCurrentThreadId());
1244 }
1245
1246 stderrVector.push_back(0);
1247 StringAppend(stdErr, &(stderrVector[0]), CP_UTF8);
1248
1249 DWORD exitcode = 0;
1250 if (!GetExitCodeProcess(pi.hProcess, &exitcode))
1251 {
1252 CString err = CFormatMessageWrapper();
1253 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), (LPCTSTR)err.Trim());
1254 return TGIT_GIT_ERROR_GET_EXIT_CODE;
1255 }
1256 else
1257 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);
1258
1259 return exitcode;
1260 }
1261
1262 CAutoRepository CGit::GetGitRepository() const
1263 {
1264 return CAutoRepository(GetGitPathStringA(m_CurrentDir));
1265 }
1266
1267 int CGit::GetHash(git_repository * repo, CGitHash &hash, const CString& friendname, bool skipFastCheck /* = false */)
1268 {
1269 ATLASSERT(repo);
1270
1271 // no need to parse a ref if it's already a 40-byte hash
1272 if (!skipFastCheck && CGitHash::IsValidSHA1(friendname))
1273 {
1274 hash = CGitHash(friendname);
1275 return 0;
1276 }
1277
1278 int isHeadOrphan = git_repository_head_unborn(repo);
1279 if (isHeadOrphan != 0)
1280 {
1281 hash.Empty();
1282 if (isHeadOrphan == 1)
1283 return 0;
1284 else
1285 return -1;
1286 }
1287
1288 CAutoObject gitObject;
1289 if (git_revparse_single(gitObject.GetPointer(), repo, CUnicodeUtils::GetUTF8(friendname)))
1290 return -1;
1291
1292 const git_oid * oid = git_object_id(gitObject);
1293 if (!oid)
1294 return -1;
1295
1296 hash = CGitHash((char *)oid->id);
1297
1298 return 0;
1299 }
1300
1301 int CGit::GetHash(CGitHash &hash, const CString& friendname)
1302 {
1303 // no need to parse a ref if it's already a 40-byte hash
1304 if (CGitHash::IsValidSHA1(friendname))
1305 {
1306 hash = CGitHash(friendname);
1307 return 0;
1308 }
1309
1310 if (m_IsUseLibGit2)
1311 {
1312 CAutoRepository repo(GetGitRepository());
1313 if (!repo)
1314 return -1;
1315
1316 return GetHash(repo, hash, friendname, true);
1317 }
1318 else
1319 {
1320 CString branch = FixBranchName(friendname);
1321 if (friendname == _T("FETCH_HEAD") && branch.IsEmpty())
1322 branch = friendname;
1323 CString cmd;
1324 cmd.Format(_T("git.exe rev-parse %s"), (LPCTSTR)branch);
1325 gitLastErr.Empty();
1326 int ret = Run(cmd, &gitLastErr, nullptr, CP_UTF8);
1327 hash = CGitHash(gitLastErr.Trim());
1328 if (ret == 0)
1329 gitLastErr.Empty();
1330 else if (friendname == _T("HEAD")) // special check for unborn branch
1331 {
1332 CString currentbranch;
1333 if (GetCurrentBranchFromFile(m_CurrentDir, currentbranch))
1334 return -1;
1335 gitLastErr.Empty();
1336 return 0;
1337 }
1338 return ret;
1339 }
1340 }
1341
1342 int CGit::GetInitAddList(CTGitPathList &outputlist)
1343 {
1344 CString cmd;
1345 BYTE_VECTOR cmdout;
1346
1347 cmd=_T("git.exe ls-files -s -t -z");
1348 outputlist.Clear();
1349 if (Run(cmd, &cmdout))
1350 return -1;
1351
1352 if (outputlist.ParserFromLsFile(cmdout))
1353 return -1;
1354 for(int i = 0; i < outputlist.GetCount(); ++i)
1355 const_cast<CTGitPath&>(outputlist[i]).m_Action = CTGitPath::LOGACTIONS_ADDED;
1356
1357 return 0;
1358 }
1359 int CGit::GetCommitDiffList(const CString &rev1, const CString &rev2, CTGitPathList &outputlist, bool ignoreSpaceAtEol, bool ignoreSpaceChange, bool ignoreAllSpace , bool ignoreBlankLines)
1360 {
1361 CString cmd;
1362 CString ignore;
1363 if (ignoreSpaceAtEol)
1364 ignore += _T(" --ignore-space-at-eol");
1365 if (ignoreSpaceChange)
1366 ignore += _T(" --ignore-space-change");
1367 if (ignoreAllSpace)
1368 ignore += _T(" --ignore-all-space");
1369 if (ignoreBlankLines)
1370 ignore += _T(" --ignore-blank-lines");
1371
1372 if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
1373 {
1374 //rev1=+_T("");
1375 if(rev1 == GIT_REV_ZERO)
1376 cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s %s --"), (LPCTSTR)ignore, (LPCTSTR)rev2);
1377 else
1378 cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s %s --"), (LPCTSTR)ignore, (LPCTSTR)rev1);
1379 }
1380 else
1381 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s %s --"), (LPCTSTR)ignore, (LPCTSTR)rev2, (LPCTSTR)rev1);
1382
1383 BYTE_VECTOR out;
1384 if (Run(cmd, &out))
1385 return -1;
1386
1387 return outputlist.ParserFromLog(out);
1388 }
1389
1390 int addto_list_each_ref_fn(const char *refname, const unsigned char * /*sha1*/, int /*flags*/, void *cb_data)
1391 {
1392 STRING_VECTOR *list = (STRING_VECTOR*)cb_data;
1393 list->push_back(CUnicodeUtils::GetUnicode(refname));
1394 return 0;
1395 }
1396
1397 int CGit::GetTagList(STRING_VECTOR &list)
1398 {
1399 size_t prevCount = list.size();
1400 if (this->m_IsUseLibGit2)
1401 {
1402 CAutoRepository repo(GetGitRepository());
1403 if (!repo)
1404 return -1;
1405
1406 CAutoStrArray tag_names;
1407
1408 if (git_tag_list(tag_names, repo))
1409 return -1;
1410
1411 for (size_t i = 0; i < tag_names->count; ++i)
1412 {
1413 CStringA tagName(tag_names->strings[i]);
1414 list.push_back(CUnicodeUtils::GetUnicode(tagName));
1415 }
1416
1417 std::sort(list.begin() + prevCount, list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1418
1419 return 0;
1420 }
1421 else
1422 {
1423 int ret = Run(L"git.exe tag -l", [&](const CStringA& lineA)
1424 {
1425 if (lineA.IsEmpty())
1426 return;
1427 list.push_back(CUnicodeUtils::GetUnicode(lineA));
1428 });
1429 if (!ret)
1430 std::sort(list.begin() + prevCount, list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1431 else if (ret == 1 && IsInitRepos())
1432 return 0;
1433 return ret;
1434 }
1435 }
1436
1437 CString CGit::GetGitLastErr(const CString& msg)
1438 {
1439 if (this->m_IsUseLibGit2)
1440 return GetLibGit2LastErr(msg);
1441 else if (gitLastErr.IsEmpty())
1442 return msg + _T("\nUnknown git.exe error.");
1443 else
1444 {
1445 CString lastError = gitLastErr;
1446 gitLastErr.Empty();
1447 return msg + _T("\n") + lastError;
1448 }
1449 }
1450
1451 CString CGit::GetGitLastErr(const CString& msg, LIBGIT2_CMD cmd)
1452 {
1453 if (UsingLibGit2(cmd))
1454 return GetLibGit2LastErr(msg);
1455 else if (gitLastErr.IsEmpty())
1456 return msg + _T("\nUnknown git.exe error.");
1457 else
1458 {
1459 CString lastError = gitLastErr;
1460 gitLastErr.Empty();
1461 return msg + _T("\n") + lastError;
1462 }
1463 }
1464
1465 CString CGit::GetLibGit2LastErr()
1466 {
1467 const git_error *libgit2err = giterr_last();
1468 if (libgit2err)
1469 {
1470 CString lastError = CUnicodeUtils::GetUnicode(CStringA(libgit2err->message));
1471 giterr_clear();
1472 return _T("libgit2 returned: ") + lastError;
1473 }
1474 else
1475 return _T("An error occoured in libgit2, but no message is available.");
1476 }
1477
1478 CString CGit::GetLibGit2LastErr(const CString& msg)
1479 {
1480 if (!msg.IsEmpty())
1481 return msg + _T("\n") + GetLibGit2LastErr();
1482 return GetLibGit2LastErr();
1483 }
1484
1485 CString CGit::FixBranchName_Mod(CString& branchName)
1486 {
1487 if(branchName == "FETCH_HEAD")
1488 branchName = DerefFetchHead();
1489 return branchName;
1490 }
1491
1492 CString CGit::FixBranchName(const CString& branchName)
1493 {
1494 CString tempBranchName = branchName;
1495 FixBranchName_Mod(tempBranchName);
1496 return tempBranchName;
1497 }
1498
1499 bool CGit::IsBranchTagNameUnique(const CString& name)
1500 {
1501 if (m_IsUseLibGit2)
1502 {
1503 CAutoRepository repo(GetGitRepository());
1504 if (!repo)
1505 return true; // TODO: optimize error reporting
1506
1507 CAutoReference tagRef;
1508 if (git_reference_lookup(tagRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/tags/" + name)))
1509 return true;
1510
1511 CAutoReference branchRef;
1512 if (git_reference_lookup(branchRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/heads/" + name)))
1513 return true;
1514
1515 return false;
1516 }
1517 // else
1518 CString cmd;
1519 cmd.Format(_T("git.exe show-ref --tags --heads refs/heads/%s refs/tags/%s"), (LPCTSTR)name, (LPCTSTR)name);
1520
1521 int refCnt = 0;
1522 Run(cmd, [&](const CStringA& lineA)
1523 {
1524 if (lineA.IsEmpty())
1525 return;
1526 ++refCnt;
1527 });
1528
1529 return (refCnt <= 1);
1530 }
1531
1532 bool CGit::BranchTagExists(const CString& name, bool isBranch /*= true*/)
1533 {
1534 if (m_IsUseLibGit2)
1535 {
1536 CAutoRepository repo(GetGitRepository());
1537 if (!repo)
1538 return false; // TODO: optimize error reporting
1539
1540 CString prefix;
1541 if (isBranch)
1542 prefix = _T("refs/heads/");
1543 else
1544 prefix = _T("refs/tags/");
1545
1546 CAutoReference ref;
1547 if (git_reference_lookup(ref.GetPointer(), repo, CUnicodeUtils::GetUTF8(prefix + name)))
1548 return false;
1549
1550 return true;
1551 }
1552 // else
1553 CString cmd, output;
1554
1555 cmd = _T("git.exe show-ref ");
1556 if (isBranch)
1557 cmd += _T("--heads ");
1558 else
1559 cmd += _T("--tags ");
1560
1561 cmd += _T("refs/heads/") + name;
1562 cmd += _T(" refs/tags/") + name;
1563
1564 int ret = Run(cmd, &output, nullptr, CP_UTF8);
1565 if (!ret)
1566 {
1567 if (!output.IsEmpty())
1568 return true;
1569 }
1570
1571 return false;
1572 }
1573
1574 CString CGit::DerefFetchHead()
1575 {
1576 CString dotGitPath;
1577 GitAdminDir::GetAdminDirPath(m_CurrentDir, dotGitPath);
1578 std::ifstream fetchHeadFile((dotGitPath + L"FETCH_HEAD").GetString(), std::ios::in | std::ios::binary);
1579 int forMergeLineCount = 0;
1580 std::string line;
1581 std::string hashToReturn;
1582 while(getline(fetchHeadFile, line))
1583 {
1584 //Tokenize this line
1585 std::string::size_type prevPos = 0;
1586 std::string::size_type pos = line.find('\t');
1587 if(pos == std::string::npos) continue; //invalid line
1588
1589 std::string hash = line.substr(0, pos);
1590 ++pos; prevPos = pos; pos = line.find('\t', pos); if(pos == std::string::npos) continue;
1591
1592 bool forMerge = pos == prevPos;
1593 ++pos; prevPos = pos; pos = line.size(); if(pos == std::string::npos) continue;
1594
1595 std::string remoteBranch = line.substr(prevPos, pos - prevPos);
1596
1597 //Process this line
1598 if(forMerge)
1599 {
1600 hashToReturn = hash;
1601 ++forMergeLineCount;
1602 if(forMergeLineCount > 1)
1603 return L""; //More then 1 branch to merge found. Octopus merge needed. Cannot pick single ref from FETCH_HEAD
1604 }
1605 }
1606
1607 return CUnicodeUtils::GetUnicode(hashToReturn.c_str());
1608 }
1609
1610 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
1611 {
1612 size_t prevCount = list.size();
1613 int ret = 0;
1614 CString cur;
1615 bool headIsDetached = false;
1616 if (m_IsUseLibGit2)
1617 {
1618 CAutoRepository repo(GetGitRepository());
1619 if (!repo)
1620 return -1;
1621
1622 if (git_repository_head_detached(repo) == 1)
1623 headIsDetached = true;
1624
1625 if ((type & (BRANCH_LOCAL | BRANCH_REMOTE)) != 0)
1626 {
1627 git_branch_t flags = GIT_BRANCH_LOCAL;
1628 if ((type & BRANCH_LOCAL) && (type & BRANCH_REMOTE))
1629 flags = GIT_BRANCH_ALL;
1630 else if (type & BRANCH_REMOTE)
1631 flags = GIT_BRANCH_REMOTE;
1632
1633 CAutoBranchIterator it;
1634 if (git_branch_iterator_new(it.GetPointer(), repo, flags))
1635 return -1;
1636
1637 git_reference * ref = nullptr;
1638 git_branch_t branchType;
1639 while (git_branch_next(&ref, &branchType, it) == 0)
1640 {
1641 CAutoReference autoRef(ref);
1642 const char * name = nullptr;
1643 if (git_branch_name(&name, ref))
1644 continue;
1645
1646 CString branchname = CUnicodeUtils::GetUnicode(name);
1647 if (branchType & GIT_BRANCH_REMOTE)
1648 list.push_back(_T("remotes/") + branchname);
1649 else
1650 {
1651 if (git_branch_is_head(ref))
1652 cur = branchname;
1653 list.push_back(branchname);
1654 }
1655 }
1656 }
1657 }
1658 else
1659 {
1660 CString cmd = L"git.exe branch --no-color";
1661
1662 if ((type & BRANCH_ALL) == BRANCH_ALL)
1663 cmd += _T(" -a");
1664 else if (type & BRANCH_REMOTE)
1665 cmd += _T(" -r");
1666
1667 ret = Run(cmd, [&](CStringA lineA)
1668 {
1669 lineA.Trim(" \r\n\t");
1670 if (lineA.IsEmpty())
1671 return;
1672 if (lineA.Find(" -> ") >= 0)
1673 return; // skip something like: refs/origin/HEAD -> refs/origin/master
1674
1675 CString branch = CUnicodeUtils::GetUnicode(lineA);
1676 if (lineA[0] == '*')
1677 {
1678 branch = branch.Mid(2);
1679 cur = branch;
1680
1681 // check whether HEAD is detached
1682 CString currentHead;
1683 if (branch[0] == L'(' && GetCurrentBranchFromFile(m_CurrentDir, currentHead) == 1)
1684 {
1685 headIsDetached = true;
1686 return;
1687 }
1688 }
1689 if ((type & BRANCH_REMOTE) != 0 && (type & BRANCH_LOCAL) == 0)
1690 branch = L"remotes/" + branch;
1691 list.push_back(branch);
1692 });
1693 if (ret == 1 && IsInitRepos())
1694 return 0;
1695 }
1696
1697 if(type & BRANCH_FETCH_HEAD && !DerefFetchHead().IsEmpty())
1698 list.push_back(L"FETCH_HEAD");
1699
1700 std::sort(list.begin() + prevCount, list.end(), LogicalCompareBranchesPredicate);
1701
1702 if (current && !headIsDetached)
1703 {
1704 for (unsigned int i = 0; i < list.size(); ++i)
1705 {
1706 if (list[i] == cur)
1707 {
1708 *current = i;
1709 break;
1710 }
1711 }
1712 }
1713
1714 return ret;
1715 }
1716
1717 int CGit::GetRemoteList(STRING_VECTOR &list)
1718 {
1719 size_t prevCount = list.size();
1720 if (this->m_IsUseLibGit2)
1721 {
1722 CAutoRepository repo(GetGitRepository());
1723 if (!repo)
1724 return -1;
1725
1726 CAutoStrArray remotes;
1727 if (git_remote_list(remotes, repo))
1728 return -1;
1729
1730 for (size_t i = 0; i < remotes->count; ++i)
1731 {
1732 CStringA remote(remotes->strings[i]);
1733 list.push_back(CUnicodeUtils::GetUnicode(remote));
1734 }
1735
1736 std::sort(list.begin() + prevCount, list.end(), LogicalComparePredicate);
1737
1738 return 0;
1739 }
1740
1741 return Run(L"git.exe remote", [&](const CStringA& lineA)
1742 {
1743 if (lineA.IsEmpty())
1744 return;
1745 list.push_back(CUnicodeUtils::GetUnicode(lineA));
1746 });
1747 }
1748
1749 int CGit::GetRemoteTags(const CString& remote, STRING_VECTOR& list)
1750 {
1751 size_t prevCount = list.size();
1752 if (UsingLibGit2(GIT_CMD_FETCH))
1753 {
1754 CAutoRepository repo(GetGitRepository());
1755 if (!repo)
1756 return -1;
1757
1758 CStringA remoteA = CUnicodeUtils::GetUTF8(remote);
1759 CAutoRemote gitremote;
1760 if (git_remote_lookup(gitremote.GetPointer(), repo, remoteA) < 0)
1761 return -1;
1762
1763 git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
1764 callbacks.credentials = g_Git2CredCallback;
1765 callbacks.certificate_check = g_Git2CheckCertificateCallback;
1766 git_proxy_options proxy = GIT_PROXY_OPTIONS_INIT;
1767 proxy.type = GIT_PROXY_AUTO;
1768 if (git_remote_connect(gitremote, GIT_DIRECTION_FETCH, &callbacks, &proxy, nullptr) < 0)
1769 return -1;
1770
1771 const git_remote_head** heads = nullptr;
1772 size_t size = 0;
1773 if (git_remote_ls(&heads, &size, gitremote) < 0)
1774 return -1;
1775
1776 for (size_t i = 0; i < size; i++)
1777 {
1778 CString ref = CUnicodeUtils::GetUnicode(heads[i]->name);
1779 CString shortname;
1780 if (!GetShortName(ref, shortname, _T("refs/tags/")))
1781 continue;
1782 // do not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1783 if (ref.Find(_T("^{}")) >= 1)
1784 continue;
1785 list.push_back(shortname);
1786 }
1787 std::sort(list.begin() + prevCount, list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1788 return 0;
1789 }
1790
1791 CString cmd;
1792 cmd.Format(_T("git.exe ls-remote -t \"%s\""), (LPCTSTR)remote);
1793 gitLastErr = cmd + L'\n';
1794 if (Run(cmd, [&](CStringA lineA)
1795 {
1796 lineA = lineA.Mid(51); // sha1, tab + refs/tags/
1797 // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
1798 if (lineA.Find("^{}") >= 1)
1799 return;
1800 if (!lineA.IsEmpty())
1801 list.push_back(CUnicodeUtils::GetUnicode(lineA));
1802 }, &gitLastErr))
1803 return -1;
1804 std::sort(list.begin() + prevCount, list.end(), g_bSortTagsReversed ? LogicalCompareReversedPredicate : LogicalComparePredicate);
1805 return 0;
1806 }
1807
1808 int CGit::DeleteRemoteRefs(const CString& sRemote, const STRING_VECTOR& list)
1809 {
1810 if (UsingLibGit2(GIT_CMD_PUSH))
1811 {
1812 CAutoRepository repo(GetGitRepository());
1813 if (!repo)
1814 return -1;
1815
1816 CStringA remoteA = CUnicodeUtils::GetUTF8(sRemote);
1817 CAutoRemote remote;
1818 if (git_remote_lookup(remote.GetPointer(), repo, remoteA) < 0)
1819 return -1;
1820
1821 git_push_options pushOpts = GIT_PUSH_OPTIONS_INIT;
1822 git_remote_callbacks& callbacks = pushOpts.callbacks;
1823 callbacks.credentials = g_Git2CredCallback;
1824 callbacks.certificate_check = g_Git2CheckCertificateCallback;
1825 std::vector<CStringA> refspecs;
1826 for (const auto& ref : list)
1827 refspecs.push_back(CUnicodeUtils::GetUTF8(_T(":") + ref));
1828
1829 std::vector<char*> vc;
1830 vc.reserve(refspecs.size());
1831 std::transform(refspecs.begin(), refspecs.end(), std::back_inserter(vc), [](CStringA& s) -> char* { return s.GetBuffer(); });
1832 git_strarray specs = { &vc[0], vc.size() };
1833
1834 if (git_remote_push(remote, &specs, &pushOpts) < 0)
1835 return -1;
1836 }
1837 else
1838 {
1839 CMassiveGitTaskBase mgtPush(_T("push ") + sRemote, FALSE);
1840 for (const auto& ref : list)
1841 {
1842 CString refspec = _T(":") + ref;
1843 mgtPush.AddFile(refspec);
1844 }
1845
1846 BOOL cancel = FALSE;
1847 mgtPush.Execute(cancel);
1848 }
1849
1850 return 0;
1851 }
1852
1853 int libgit2_addto_list_each_ref_fn(git_reference *ref, void *payload)
1854 {
1855 STRING_VECTOR *list = (STRING_VECTOR*)payload;
1856 list->push_back(CUnicodeUtils::GetUnicode(git_reference_name(ref)));
1857 return 0;
1858 }
1859
1860 int CGit::GetRefList(STRING_VECTOR &list)
1861 {
1862 size_t prevCount = list.size();
1863 if (this->m_IsUseLibGit2)
1864 {
1865 CAutoRepository repo(GetGitRepository());
1866 if (!repo)
1867 return -1;
1868
1869 if (git_reference_foreach(repo, libgit2_addto_list_each_ref_fn, &list))
1870 return -1;
1871
1872 std::sort(list.begin() + prevCount, list.end(), LogicalComparePredicate);
1873
1874 return 0;
1875 }
1876
1877 int ret = Run(L"git.exe show-ref -d", [&](const CStringA& lineA)
1878 {
1879 int start = lineA.Find(L' ');
1880 ASSERT(start == 40);
1881 if (start <= 0)
1882 return;
1883
1884 CString name = CUnicodeUtils::GetUnicode(lineA.Mid(start + 1));
1885 if (list.empty() || name != *list.crbegin() + _T("^{}"))
1886 list.push_back(name);
1887 });
1888 if (!ret)
1889 std::sort(list.begin() + prevCount, list.end(), LogicalComparePredicate);
1890 else if (ret == 1 && IsInitRepos())
1891 return 0;
1892 return ret;
1893 }
1894
1895 typedef struct map_each_ref_payload {
1896 git_repository * repo;
1897 MAP_HASH_NAME * map;
1898 } map_each_ref_payload;
1899
1900 int libgit2_addto_map_each_ref_fn(git_reference *ref, void *payload)
1901 {
1902 map_each_ref_payload *payloadContent = (map_each_ref_payload*)payload;
1903
1904 CString str = CUnicodeUtils::GetUnicode(git_reference_name(ref));
1905
1906 CAutoObject gitObject;
1907 if (git_revparse_single(gitObject.GetPointer(), payloadContent->repo, git_reference_name(ref)))
1908 return 1;
1909
1910 if (git_object_type(gitObject) == GIT_OBJ_TAG)
1911 {
1912 str += _T("^{}"); // deref tag
1913 CAutoObject derefedTag;
1914 if (git_object_peel(derefedTag.GetPointer(), gitObject, GIT_OBJ_ANY))
1915 return 1;
1916 gitObject.Swap(derefedTag);
1917 }
1918
1919 const git_oid * oid = git_object_id(gitObject);
1920 if (!oid)
1921 return 1;
1922
1923 CGitHash hash((char *)oid->id);
1924 (*payloadContent->map)[hash].push_back(str);
1925
1926 return 0;
1927 }
1928 int CGit::GetMapHashToFriendName(git_repository* repo, MAP_HASH_NAME &map)
1929 {
1930 ATLASSERT(repo);
1931
1932 map_each_ref_payload payloadContent = { repo, &map };
1933
1934 if (git_reference_foreach(repo, libgit2_addto_map_each_ref_fn, &payloadContent))
1935 return -1;
1936
1937 for (auto it = map.begin(); it != map.end(); ++it)
1938 {
1939 std::sort(it->second.begin(), it->second.end());
1940 }
1941
1942 return 0;
1943 }
1944
1945 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
1946 {
1947 if (this->m_IsUseLibGit2)
1948 {
1949 CAutoRepository repo(GetGitRepository());
1950 if (!repo)
1951 return -1;
1952
1953 return GetMapHashToFriendName(repo, map);
1954 }
1955
1956 int ret = Run(L"git.exe show-ref -d", [&](const CStringA& lineA)
1957 {
1958 int start = lineA.Find(L' ');
1959 ASSERT(start == 40);
1960 if (start <= 0)
1961 return;
1962
1963 CGitHash hash;
1964 hash.ConvertFromStrA(lineA.Left(start));
1965 map[hash].push_back(CUnicodeUtils::GetUnicode(lineA.Mid(start + 1)));
1966 });
1967
1968 if (ret == 1 && IsInitRepos())
1969 return 0;
1970 return ret;
1971 }
1972
1973 int CGit::GetBranchDescriptions(MAP_STRING_STRING& map)
1974 {
1975 CAutoConfig config(true);
1976 if (git_config_add_file_ondisk(config, CGit::GetGitPathStringA(GetGitLocalConfig()), GIT_CONFIG_LEVEL_LOCAL, FALSE) < 0)
1977 return -1;
1978 return git_config_foreach_match(config, "^branch\\..*\\.description$", [](const git_config_entry* entry, void* data)
1979 {
1980 MAP_STRING_STRING* descriptions = (MAP_STRING_STRING*)data;
1981 CString key = CUnicodeUtils::GetUnicode(entry->name);
1982 key = key.Mid(7, key.GetLength() - 7 - 12); // 7: branch., 12: .description
1983 descriptions->insert(std::make_pair(key, CUnicodeUtils::GetUnicode(entry->value)));
1984 return 0;
1985 }, &map);
1986 }
1987
1988 static void SetLibGit2SearchPath(int level, const CString &value)
1989 {
1990 CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
1991 git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, level, valueA);
1992 }
1993
1994 static void SetLibGit2TemplatePath(const CString &value)
1995 {
1996 CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
1997 git_libgit2_opts(GIT_OPT_SET_TEMPLATE_PATH, valueA);
1998 }
1999
2000 int CGit::FindAndSetGitExePath(BOOL bFallback)
2001 {
2002 CRegString msysdir = CRegString(REG_MSYSGIT_PATH, _T(""), FALSE);
2003 CString str = msysdir;
2004 if (!str.IsEmpty() && PathFileExists(str + _T("\\git.exe")))
2005 {
2006 CGit::ms_LastMsysGitDir = str;
2007 return TRUE;
2008 }
2009
2010 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": git.exe not exists: %s\n"), (LPCTSTR)CGit::ms_LastMsysGitDir);
2011 if (!bFallback)
2012 return FALSE;
2013
2014 // first, search PATH if git/bin directory is already present
2015 if (FindGitPath())
2016 {
2017 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": FindGitPath() => %s\n"), (LPCTSTR)CGit::ms_LastMsysGitDir);
2018 msysdir = CGit::ms_LastMsysGitDir;
2019 msysdir.write();
2020 return TRUE;
2021 }
2022
2023 CRegString msyslocalinstalldir = CRegString(REG_MSYSGIT_INSTALL_LOCAL, _T(""), FALSE, HKEY_CURRENT_USER);
2024 str = msyslocalinstalldir;
2025 str.TrimRight(_T("\\"));
2026 #ifdef _WIN64
2027 if (str.IsEmpty())
2028 {
2029 CRegString msysinstalldir = CRegString(REG_MSYSGIT_INSTALL_LOCAL, _T(""), FALSE, HKEY_LOCAL_MACHINE);
2030 str = msysinstalldir;
2031 str.TrimRight(_T("\\"));
2032 }
2033 #endif
2034 if (str.IsEmpty())
2035 {
2036 CRegString msysinstalldir = CRegString(REG_MSYSGIT_INSTALL, _T(""), FALSE, HKEY_LOCAL_MACHINE);
2037 str = msysinstalldir;
2038 str.TrimRight(_T("\\"));
2039 }
2040 if (!str.IsEmpty())
2041 {
2042 if (PathFileExists(str + _T("\\bin\\git.exe")))
2043 str += _T("\\bin");
2044 else if (PathFileExists(str + _T("\\cmd\\git.exe"))) // only needed for older Git for Windows 2.x packages
2045 str += _T("\\cmd");
2046 else
2047 {
2048 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Git for Windows installation found, but git.exe not exists in %s\n"), (LPCTSTR)str);
2049 return FALSE;
2050 }
2051 msysdir = str;
2052 CGit::ms_LastMsysGitDir = str;
2053 msysdir.write();
2054 return TRUE;
2055 }
2056
2057 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": Found no git.exe\n"));
2058 return FALSE;
2059 }
2060
2061 BOOL CGit::CheckMsysGitDir(BOOL bFallback)
2062 {
2063 if (m_bInitialized)
2064 return TRUE;
2065
2066 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": CheckMsysGitDir(%d)\n"), bFallback);
2067 this->m_Environment.clear();
2068 m_Environment.CopyProcessEnvironment();
2069
2070 // set HOME if not set already
2071 size_t homesize;
2072 _tgetenv_s(&homesize, nullptr, 0, _T("HOME"));
2073 if (!homesize)
2074 m_Environment.SetEnv(_T("HOME"), GetHomeDirectory());
2075
2076 //setup ssh client
2077 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
2078 if (sshclient.IsEmpty())
2079 sshclient = CRegString(_T("Software\\TortoiseGit\\SSH"), _T(""), FALSE, HKEY_LOCAL_MACHINE);
2080
2081 if(!sshclient.IsEmpty())
2082 {
2083 m_Environment.SetEnv(_T("GIT_SSH"), sshclient);
2084 m_Environment.SetEnv(_T("SVN_SSH"), sshclient);
2085 }
2086 else
2087 {
2088 TCHAR sPlink[MAX_PATH] = {0};
2089 GetModuleFileName(nullptr, sPlink, _countof(sPlink));
2090 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
2091 if (ptr) {
2092 _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sPlink + 1), _T("TortoiseGitPlink.exe"));
2093 m_Environment.SetEnv(_T("GIT_SSH"), sPlink);
2094 m_Environment.SetEnv(_T("SVN_SSH"), sPlink);
2095 }
2096 }
2097
2098 {
2099 TCHAR sAskPass[MAX_PATH] = {0};
2100 GetModuleFileName(nullptr, sAskPass, _countof(sAskPass));
2101 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
2102 if (ptr)
2103 {
2104 _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sAskPass + 1), _T("SshAskPass.exe"));
2105 m_Environment.SetEnv(_T("DISPLAY"),_T(":9999"));
2106 m_Environment.SetEnv(_T("SSH_ASKPASS"),sAskPass);
2107 m_Environment.SetEnv(_T("GIT_ASKPASS"),sAskPass);
2108 }
2109 }
2110
2111 if (!FindAndSetGitExePath(bFallback))
2112 return FALSE;
2113
2114 CString msysGitDir;
2115 PathCanonicalize(CStrBuf(msysGitDir, MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\"));
2116 static const CString prefixes[] = { L"mingw64\\etc", L"mingw32\\etc", L"etc" };
2117 static const int prefixes_len[] = { 8, 8, 0 };
2118 for (int i = 0; i < _countof(prefixes); ++i)
2119 {
2120 #ifndef _WIN64
2121 if (i == 0)
2122 continue;
2123 #endif
2124 if (PathIsDirectory(msysGitDir + prefixes[i])) {
2125 msysGitDir += prefixes[i].Left(prefixes_len[i]);
2126 break;
2127 }
2128 }
2129 if (ms_bMsys2Git) // in Msys2 git.exe is in usr\bin; this also need to be after the check for etc folder, as Msys2 also has mingw64\etc, but uses etc
2130 PathCanonicalize(CStrBuf(msysGitDir, MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\.."));
2131 CGit::ms_MsysGitRootDir = msysGitDir;
2132
2133 if ((CString)CRegString(REG_SYSTEM_GITCONFIGPATH, _T(""), FALSE) != g_Git.GetGitSystemConfig())
2134 CRegString(REG_SYSTEM_GITCONFIGPATH, _T(""), FALSE) = g_Git.GetGitSystemConfig();
2135
2136 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": ms_LastMsysGitDir = %s\n"), (LPCTSTR)CGit::ms_LastMsysGitDir);
2137 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": ms_MsysGitRootDir = %s\n"), (LPCTSTR)CGit::ms_MsysGitRootDir);
2138 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": System config = %s\n"), (LPCTSTR)g_Git.GetGitSystemConfig());
2139 if (!ms_bCygwinGit && !ms_bMsys2Git)
2140 {
2141 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) L": ProgramData config = %s\n", (LPCTSTR)g_Git.GetGitProgramDataConfig());
2142 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_PROGRAMDATA, CTGitPath(g_Git.GetGitProgramDataConfig()).GetContainingDirectory().GetWinPathString());
2143 }
2144 else
2145 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_PROGRAMDATA, CTGitPath(g_Git.GetGitSystemConfig()).GetContainingDirectory().GetWinPathString());
2146
2147 // Configure libgit2 search paths
2148 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_SYSTEM, CTGitPath(g_Git.GetGitSystemConfig()).GetContainingDirectory().GetWinPathString());
2149 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_GLOBAL, g_Git.GetHomeDirectory());
2150 SetLibGit2SearchPath(GIT_CONFIG_LEVEL_XDG, g_Git.GetGitGlobalXDGConfigPath());
2151 static git_smart_subtransport_definition ssh_wintunnel_subtransport_definition = { [](git_smart_subtransport **out, git_transport* owner, void*) -> 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 };
2152 git_transport_register("ssh", git_transport_smart, &ssh_wintunnel_subtransport_definition);
2153 git_transport_register("ssh+git", git_transport_smart, &ssh_wintunnel_subtransport_definition);
2154 git_transport_register("git+ssh", git_transport_smart, &ssh_wintunnel_subtransport_definition);
2155 git_libgit2_opts(GIT_OPT_SET_USER_AGENT, "TortoiseGit libgit2");
2156 if (!(ms_bCygwinGit || ms_bMsys2Git))
2157 SetLibGit2TemplatePath(CGit::ms_MsysGitRootDir + _T("share\\git-core\\templates"));
2158 else
2159 SetLibGit2TemplatePath(CGit::ms_MsysGitRootDir + _T("usr\\share\\git-core\\templates"));
2160
2161 m_Environment.AddToPath(CGit::ms_LastMsysGitDir);
2162 m_Environment.AddToPath((CString)CRegString(REG_MSYSGIT_EXTRA_PATH, _T(""), FALSE));
2163
2164 #if !defined(TGITCACHE) && !defined(TORTOISESHELL)
2165 // register filter only once
2166 if (!git_filter_lookup("filter"))
2167 {
2168 CString sh;
2169 for (const CString& binDirPrefix : { L"\\..\\usr\\bin", L"\\..\\bin", L"" })
2170 {
2171 CString possibleShExe = CGit::ms_LastMsysGitDir + binDirPrefix + L"\\sh.exe";
2172 if (PathFileExists(possibleShExe))
2173 {
2174 CString temp;
2175 PathCanonicalize(CStrBuf(temp, MAX_PATH), possibleShExe);
2176 sh.Format(L"\"%s\"", (LPCTSTR)temp);
2177 // we need to put the usr\bin folder on the path for Git for Windows based on msys2
2178 m_Environment.AddToPath(temp.Left(temp.GetLength() - 7)); // 7 = len("\\sh.exe")
2179 break;
2180 }
2181 }
2182
2183 // Add %GIT_EXEC_PATH% to %PATH% when launching libgit2 filter executable
2184 // It is possible that the filter points to a git subcommand, that is located at libexec\git-core
2185 CString gitExecPath = CGit::ms_MsysGitRootDir;
2186 gitExecPath.Append(_T("libexec\\git-core"));
2187 m_Environment.AddToPath(gitExecPath);
2188
2189 if (git_filter_register("filter", git_filter_filter_new(sh, m_Environment), GIT_FILTER_DRIVER_PRIORITY))
2190 return FALSE;
2191 }
2192 #endif
2193
2194 m_bInitialized = TRUE;
2195 return true;
2196 }
2197
2198 CString CGit::GetHomeDirectory() const
2199 {
2200 const wchar_t * homeDir = wget_windows_home_directory();
2201 return CString(homeDir, (int)wcslen(homeDir));
2202 }
2203
2204 CString CGit::GetGitLocalConfig() const
2205 {
2206 CString path;
2207 GitAdminDir::GetAdminDirPath(m_CurrentDir, path);
2208 path += _T("config");
2209 return path;
2210 }
2211
2212 CStringA CGit::GetGitPathStringA(const CString &path)
2213 {
2214 return CUnicodeUtils::GetUTF8(CTGitPath(path).GetGitPathString());
2215 }
2216
2217 CString CGit::GetGitGlobalConfig() const
2218 {
2219 return g_Git.GetHomeDirectory() + _T("\\.gitconfig");
2220 }
2221
2222 CString CGit::GetGitGlobalXDGConfigPath() const
2223 {
2224 return g_Git.GetHomeDirectory() + _T("\\.config\\git");
2225 }
2226
2227 CString CGit::GetGitGlobalXDGConfig() const
2228 {
2229 return g_Git.GetGitGlobalXDGConfigPath() + _T("\\config");
2230 }
2231
2232 CString CGit::GetGitProgramDataConfig() const
2233 {
2234 const wchar_t* programdataConfig = wget_program_data_config();
2235 return CString(programdataConfig);
2236 }
2237
2238 CString CGit::GetGitSystemConfig() const
2239 {
2240 const wchar_t * systemConfig = wget_msysgit_etc();
2241 return CString(systemConfig, (int)wcslen(systemConfig));
2242 }
2243
2244 BOOL CGit::CheckCleanWorkTree(bool stagedOk /* false */)
2245 {
2246 if (UsingLibGit2(GIT_CMD_CHECK_CLEAN_WT))
2247 {
2248 CAutoRepository repo(GetGitRepository());
2249 if (!repo)
2250 return FALSE;
2251
2252 if (git_repository_head_unborn(repo))
2253 return FALSE;
2254
2255 git_status_options statusopt = GIT_STATUS_OPTIONS_INIT;
2256 statusopt.show = stagedOk ? GIT_STATUS_SHOW_WORKDIR_ONLY : GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
2257 statusopt.flags = GIT_STATUS_OPT_UPDATE_INDEX | GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
2258
2259 CAutoStatusList status;
2260 if (git_status_list_new(status.GetPointer(), repo, &statusopt))
2261 return FALSE;
2262
2263 return (0 == git_status_list_entrycount(status));
2264 }
2265
2266 CString out;
2267 CString cmd;
2268 cmd=_T("git.exe rev-parse --verify HEAD");
2269
2270 if(Run(cmd,&out,CP_UTF8))
2271 return FALSE;
2272
2273 cmd=_T("git.exe update-index --ignore-submodules --refresh");
2274 if(Run(cmd,&out,CP_UTF8))
2275 return FALSE;
2276
2277 cmd=_T("git.exe diff-files --quiet --ignore-submodules");
2278 if(Run(cmd,&out,CP_UTF8))
2279 return FALSE;
2280
2281 cmd = _T("git.exe diff-index --cached --quiet HEAD --ignore-submodules --");
2282 if (!stagedOk && Run(cmd, &out, CP_UTF8))
2283 return FALSE;
2284
2285 return TRUE;
2286 }
2287 int CGit::Revert(const CString& commit, const CTGitPathList &list, CString& err)
2288 {
2289 int ret;
2290 for (int i = 0; i < list.GetCount(); ++i)
2291 {
2292 ret = Revert(commit, (CTGitPath&)list[i], err);
2293 if(ret)
2294 return ret;
2295 }
2296 return 0;
2297 }
2298 int CGit::Revert(const CString& commit, const CTGitPath &path, CString& err)
2299 {
2300 CString cmd;
2301
2302 if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED && !path.GetGitOldPathString().IsEmpty())
2303 {
2304 if (CTGitPath(path.GetGitOldPathString()).IsDirectory())
2305 {
2306 err.Format(_T("Cannot revert renaming of \"%s\". A directory with the old name \"%s\" exists."), (LPCTSTR)path.GetGitPathString(), (LPCTSTR)path.GetGitOldPathString());
2307 return -1;
2308 }
2309 if (path.Exists())
2310 {
2311 CString force;
2312 // if the filenames only differ in case, we have to pass "-f"
2313 if (path.GetGitPathString().CompareNoCase(path.GetGitOldPathString()) == 0)
2314 force = _T("-f ");
2315 cmd.Format(_T("git.exe mv %s-- \"%s\" \"%s\""), (LPCTSTR)force, (LPCTSTR)path.GetGitPathString(), (LPCTSTR)path.GetGitOldPathString());
2316 if (Run(cmd, &err, CP_UTF8))
2317 return -1;
2318 }
2319 else
2320 {
2321 cmd.Format(_T("git.exe rm -f --cached -- \"%s\""), (LPCTSTR)path.GetGitPathString());
2322 if (Run(cmd, &err, CP_UTF8))
2323 return -1;
2324 }
2325
2326 cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), (LPCTSTR)commit, (LPCTSTR)path.GetGitOldPathString());
2327 if (Run(cmd, &err, CP_UTF8))
2328 return -1;
2329 }
2330 else if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
2331 { //To init git repository, there are not HEAD, so we can use git reset command
2332 cmd.Format(_T("git.exe rm -f --cached -- \"%s\""), (LPCTSTR)path.GetGitPathString());
2333
2334 if (Run(cmd, &err, CP_UTF8))
2335 return -1;
2336 }
2337 else
2338 {
2339 cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), (LPCTSTR)commit, (LPCTSTR)path.GetGitPathString());
2340 if (Run(cmd, &err, CP_UTF8))
2341 return -1;
2342 }
2343
2344 if (path.m_Action & CTGitPath::LOGACTIONS_DELETED)
2345 {
2346 cmd.Format(_T("git.exe add -f -- \"%s\""), (LPCTSTR)path.GetGitPathString());
2347 if (Run(cmd, &err, CP_UTF8))
2348 return -1;
2349 }
2350
2351 return 0;
2352 }
2353
2354 int CGit::HasWorkingTreeConflicts(git_repository* repo)
2355 {
2356 ATLASSERT(repo);
2357
2358 CAutoIndex index;
2359 if (git_repository_index(index.GetPointer(), repo))
2360 return -1;
2361
2362 return git_index_has_conflicts(index);
2363 }
2364
2365 int CGit::HasWorkingTreeConflicts()
2366 {
2367 if (UsingLibGit2(GIT_CMD_CHECKCONFLICTS))
2368 {
2369 CAutoRepository repo(GetGitRepository());
2370 if (!repo)
2371 return -1;
2372
2373 return HasWorkingTreeConflicts(repo);
2374 }
2375
2376 CString cmd = _T("git.exe ls-files -u -t -z");
2377
2378 CString output;
2379 if (Run(cmd, &output, &gitLastErr, CP_UTF8))
2380 return -1;
2381
2382 return output.IsEmpty() ? 0 : 1;
2383 }
2384
2385 bool CGit::IsFastForward(const CString &from, const CString &to, CGitHash * commonAncestor)
2386 {
2387 if (UsingLibGit2(GIT_CMD_MERGE_BASE))
2388 {
2389 CAutoRepository repo(GetGitRepository());
2390 if (!repo)
2391 return false;
2392
2393 CGitHash fromHash, toHash, baseHash;
2394 if (GetHash(repo, toHash, FixBranchName(to)))
2395 return false;
2396
2397 if (GetHash(repo, fromHash, FixBranchName(from)))
2398 return false;
2399
2400 git_oid baseOid;
2401 if (git_merge_base(&baseOid, repo, (const git_oid*)toHash.m_hash, (const git_oid*)fromHash.m_hash))
2402 return false;
2403
2404 baseHash = baseOid.id;
2405
2406 if (commonAncestor)
2407 *commonAncestor = baseHash;
2408
2409 return fromHash == baseHash;
2410 }
2411 // else
2412 CString base;
2413 CGitHash basehash,hash;
2414 CString cmd;
2415 cmd.Format(_T("git.exe merge-base %s %s"), (LPCTSTR)FixBranchName(to), (LPCTSTR)FixBranchName(from));
2416
2417 if (Run(cmd, &base, &gitLastErr, CP_UTF8))
2418 return false;
2419 basehash = base.Trim();
2420
2421 GetHash(hash, from);
2422
2423 if (commonAncestor)
2424 *commonAncestor = basehash;
2425
2426 return hash == basehash;
2427 }
2428
2429 unsigned int CGit::Hash2int(const CGitHash &hash)
2430 {
2431 int ret=0;
2432 for (int i = 0; i < 4; ++i)
2433 {
2434 ret = ret << 8;
2435 ret |= hash.m_hash[i];
2436 }
2437 return ret;
2438 }
2439
2440 int CGit::RefreshGitIndex()
2441 {
2442 if(g_Git.m_IsUseGitDLL)
2443 {
2444 CAutoLocker lock(g_Git.m_critGitDllSec);
2445 try
2446 {
2447 int result = [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
2448 git_exit_cleanup();
2449 return result;
2450
2451 }catch(...)
2452 {
2453 git_exit_cleanup();
2454 return -1;
2455 }
2456
2457 }
2458 else
2459 {
2460 CString cmd,output;
2461 cmd=_T("git.exe update-index --refresh");
2462 return Run(cmd, &output, CP_UTF8);
2463 }
2464 }
2465
2466 int CGit::GetOneFile(const CString &Refname, const CTGitPath &path, const CString &outputfile)
2467 {
2468 if (UsingLibGit2(GIT_CMD_GETONEFILE))
2469 {
2470 CAutoRepository repo(GetGitRepository());
2471 if (!repo)
2472 return -1;
2473
2474 CGitHash hash;
2475 if (GetHash(repo, hash, Refname))
2476 return -1;
2477
2478 CAutoCommit commit;
2479 if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
2480 return -1;
2481
2482 CAutoTree tree;
2483 if (git_commit_tree(tree.GetPointer(), commit))
2484 return -1;
2485
2486 CAutoTreeEntry entry;
2487 if (git_tree_entry_bypath(entry.GetPointer(), tree, CUnicodeUtils::GetUTF8(path.GetGitPathString())))
2488 return -1;
2489
2490 CAutoBlob blob;
2491 if (git_tree_entry_to_object((git_object**)blob.GetPointer(), repo, entry))
2492 return -1;
2493
2494 CAutoFILE file = _tfsopen(outputfile, _T("wb"), SH_DENYWR);
2495 if (file == nullptr)
2496 {
2497 giterr_set_str(GITERR_NONE, "Could not create file.");
2498 return -1;
2499 }
2500 CAutoBuf buf;
2501 if (git_blob_filtered_content(buf, blob, CUnicodeUtils::GetUTF8(path.GetGitPathString()), 0))
2502 return -1;
2503 if (fwrite(buf->ptr, sizeof(char), buf->size, file) != buf->size)
2504 {
2505 giterr_set_str(GITERR_OS, "Could not write to file.");
2506 return -1;
2507 }
2508
2509 return 0;
2510 }
2511 else if (g_Git.m_IsUseGitDLL)
2512 {
2513 CAutoLocker lock(g_Git.m_critGitDllSec);
2514 try
2515 {
2516 g_Git.CheckAndInitDll();
2517 CStringA ref, patha, outa;
2518 ref = CUnicodeUtils::GetMulti(Refname, CP_UTF8);
2519 patha = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
2520 outa = CUnicodeUtils::GetMulti(outputfile, CP_UTF8);
2521 ::DeleteFile(outputfile);
2522 int ret = git_checkout_file(ref, patha, outa.GetBuffer());
2523 outa.ReleaseBuffer();
2524 return ret;
2525
2526 }
2527 catch (const char * msg)
2528 {
2529 gitLastErr = L"gitdll.dll reports: " + CString(msg);
2530 return -1;
2531 }
2532 catch (...)
2533 {
2534 gitLastErr = L"An unknown gitdll.dll error occurred.";
2535 return -1;
2536 }
2537 }
2538 else
2539 {
2540 CString cmd;
2541 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""), (LPCTSTR)Refname, (LPCTSTR)path.GetGitPathString());
2542 return RunLogFile(cmd, outputfile, &gitLastErr);
2543 }
2544 }
2545
2546 void CEnvironment::clear()
2547 {
2548 __super::clear();
2549 baseptr = nullptr;
2550 }
2551
2552 bool CEnvironment::empty()
2553 {
2554 return size() < 3; // three is minimum for an empty environment with an empty key and empty value: "=\0\0"
2555 }
2556
2557 CEnvironment::operator LPTSTR()
2558 {
2559 if (empty())
2560 return nullptr;
2561 return &__super::at(0);
2562 }
2563
2564 CEnvironment::operator LPWSTR*()
2565 {
2566 return &baseptr;
2567 }
2568
2569 void CEnvironment::CopyProcessEnvironment()
2570 {
2571 if (!empty())
2572 pop_back();
2573 TCHAR *porig = GetEnvironmentStrings();
2574 TCHAR *p = porig;
2575 while(*p !=0 || *(p+1) !=0)
2576 this->push_back(*p++);
2577
2578 push_back(_T('\0'));
2579 push_back(_T('\0'));
2580 baseptr = &__super::at(0);
2581
2582 FreeEnvironmentStrings(porig);
2583 }
2584
2585 CString CEnvironment::GetEnv(const TCHAR *name)
2586 {
2587 CString str;
2588 for (size_t i = 0; i < size(); ++i)
2589 {
2590 str = &(*this)[i];
2591 int start =0;
2592 CString sname = str.Tokenize(_T("="),start);
2593 if(sname.CompareNoCase(name) == 0)
2594 return &(*this)[i+start];
2595 i+=str.GetLength();
2596 }
2597 return _T("");
2598 }
2599
2600 void CEnvironment::SetEnv(const TCHAR *name, const TCHAR* value)
2601 {
2602 unsigned int i;
2603 for (i = 0; i < size(); ++i)
2604 {
2605 CString str = &(*this)[i];
2606 int start =0;
2607 CString sname = str.Tokenize(_T("="),start);
2608 if(sname.CompareNoCase(name) == 0)
2609 break;
2610 i+=str.GetLength();
2611 }
2612
2613 if(i == size())
2614 {
2615 if (!value) // as we haven't found the variable we want to remove, just return
2616 return;
2617 if (i == 0) // make inserting into an empty environment work
2618 {
2619 this->push_back(_T('\0'));
2620 ++i;
2621 }
2622 i -= 1; // roll back terminate \0\0
2623 this->push_back(_T('\0'));
2624 }
2625
2626 CEnvironment::iterator it;
2627 it=this->begin();
2628 it += i;
2629
2630 while(*it && i<size())
2631 {
2632 this->erase(it);
2633 it=this->begin();
2634 it += i;
2635 }
2636
2637 if (value == nullptr) // remove the variable
2638 {
2639 this->erase(it);
2640 if (empty())
2641 baseptr = nullptr;
2642 else
2643 baseptr = &__super::at(0);
2644 return;
2645 }
2646
2647 while(*name)
2648 {
2649 this->insert(it,*name++);
2650 ++i;
2651 it= begin()+i;
2652 }
2653
2654 this->insert(it, _T('='));
2655 ++i;
2656 it= begin()+i;
2657
2658 while(*value)
2659 {
2660 this->insert(it,*value++);
2661 ++i;
2662 it= begin()+i;
2663 }
2664 baseptr = &__super::at(0);
2665 }
2666
2667 void CEnvironment::AddToPath(CString value)
2668 {
2669 value.TrimRight(L"\\");
2670 if (value.IsEmpty())
2671 return;
2672
2673 CString path = GetEnv(L"PATH").TrimRight(L";") + L";";
2674
2675 // do not double add paths to %PATH%
2676 if (path.Find(value + L";") >= 0 || path.Find(value + L"\\;") >= 0)
2677 return;
2678
2679 path += value;
2680
2681 SetEnv(L"PATH", path);
2682 }
2683
2684 int CGit::GetGitEncode(TCHAR* configkey)
2685 {
2686 CString str=GetConfigValue(configkey);
2687
2688 if(str.IsEmpty())
2689 return CP_UTF8;
2690
2691 return CUnicodeUtils::GetCPCode(str);
2692 }
2693
2694
2695 int CGit::GetDiffPath(CTGitPathList *PathList, CGitHash *hash1, CGitHash *hash2, char *arg)
2696 {
2697 GIT_FILE file=0;
2698 int ret=0;
2699 GIT_DIFF diff=0;
2700
2701 CAutoLocker lock(g_Git.m_critGitDllSec);
2702
2703 try
2704 {
2705 if(!arg)
2706 diff = GetGitDiff();
2707 else
2708 git_open_diff(&diff, arg);
2709 }
2710 catch (char* e)
2711 {
2712 MessageBox(nullptr, _T("Could not get diff.\nlibgit reported:\n") + CString(e), _T("TortoiseGit"), MB_OK);
2713 return -1;
2714 }
2715
2716 if (!diff)
2717 return -1;
2718
2719 bool isStat = 0;
2720 if (!arg)
2721 isStat = true;
2722 else
2723 isStat = !!strstr(arg, "stat");
2724
2725 int count=0;
2726
2727 if (!hash2)
2728 ret = git_root_diff(diff, hash1->m_hash, &file, &count,isStat);
2729 else
2730 ret = git_do_diff(diff,hash2->m_hash,hash1->m_hash,&file,&count,isStat);
2731
2732 if(ret)
2733 return -1;
2734
2735 CTGitPath path;
2736 CString strnewname;
2737 CString stroldname;
2738
2739 for (int j = 0; j < count; ++j)
2740 {
2741 path.Reset();
2742 char *newname;
2743 char *oldname;
2744
2745 strnewname.Empty();
2746 stroldname.Empty();
2747
2748 int mode=0,IsBin=0,inc=0,dec=0;
2749 git_get_diff_file(diff,file,j,&newname,&oldname,
2750 &mode,&IsBin,&inc,&dec);
2751
2752 StringAppend(&strnewname, (BYTE*)newname, CP_UTF8);
2753 StringAppend(&stroldname, (BYTE*)oldname, CP_UTF8);
2754
2755 path.SetFromGit(strnewname,&stroldname);
2756 path.ParserAction((BYTE)mode);
2757
2758 if(IsBin)
2759 {
2760 path.m_StatAdd=_T("-");
2761 path.m_StatDel=_T("-");
2762 }
2763 else
2764 {
2765 path.m_StatAdd.Format(_T("%d"),inc);
2766 path.m_StatDel.Format(_T("%d"),dec);
2767 }
2768 PathList->AddPath(path);
2769 }
2770 git_diff_flush(diff);
2771
2772 if(arg)
2773 git_close_diff(diff);
2774
2775 return 0;
2776 }
2777
2778 int CGit::GetShortHASHLength() const
2779 {
2780 return 7;
2781 }
2782
2783 CString CGit::GetShortName(const CString& ref, REF_TYPE *out_type)
2784 {
2785 CString str=ref;
2786 CString shortname;
2787 REF_TYPE type = CGit::UNKNOWN;
2788
2789 if (CGit::GetShortName(str, shortname, _T("refs/heads/")))
2790 type = CGit::LOCAL_BRANCH;
2791 else if (CGit::GetShortName(str, shortname, _T("refs/remotes/")))
2792 type = CGit::REMOTE_BRANCH;
2793 else if (str.Right(3) == L"^{}" && CGit::GetShortName(str, shortname, L"refs/tags/"))
2794 type = CGit::ANNOTATED_TAG;
2795 else if (CGit::GetShortName(str, shortname, _T("refs/tags/")))
2796 type = CGit::TAG;
2797 else if (CGit::GetShortName(str, shortname, _T("refs/stash")))
2798 {
2799 type = CGit::STASH;
2800 shortname=_T("stash");
2801 }
2802 else if (CGit::GetShortName(str, shortname, _T("refs/bisect/")))
2803 {
2804 CString bisectGood;
2805 CString bisectBad;
2806 g_Git.GetBisectTerms(&bisectGood, &bisectBad);
2807 TCHAR c;
2808 if (wcsncmp(shortname, bisectGood, bisectGood.GetLength()) == 0 && ((c = shortname.GetAt(bisectGood.GetLength())) == '-' || c == '\0'))
2809 {
2810 type = CGit::BISECT_GOOD;
2811 shortname = bisectGood;
2812 }
2813
2814 if (wcsncmp(shortname, bisectBad, bisectBad.GetLength()) == 0 && ((c = shortname.GetAt(bisectBad.GetLength())) == '-' || c == '\0'))
2815 {
2816 type = CGit::BISECT_BAD;
2817 shortname = bisectBad;
2818 }
2819 }
2820 else if (CGit::GetShortName(str, shortname, _T("refs/notes/")))
2821 type = CGit::NOTES;
2822 else if (CGit::GetShortName(str, shortname, _T("refs/")))
2823 type = CGit::UNKNOWN;
2824 else
2825 {
2826 type = CGit::UNKNOWN;
2827 shortname = ref;
2828 }
2829
2830 if(out_type)
2831 *out_type = type;
2832
2833 return shortname;
2834 }
2835
2836 bool CGit::UsingLibGit2(LIBGIT2_CMD cmd) const
2837 {
2838 return m_IsUseLibGit2 && ((1 << cmd) & m_IsUseLibGit2_mask) ? true : false;
2839 }
2840
2841 void CGit::SetGit2CredentialCallback(void* callback)
2842 {
2843 g_Git2CredCallback = (git_cred_acquire_cb)callback;
2844 }
2845
2846 void CGit::SetGit2CertificateCheckCertificate(void* callback)
2847 {
2848 g_Git2CheckCertificateCallback = (git_transport_certificate_check_cb)callback;
2849 }
2850
2851 CString CGit::GetUnifiedDiffCmd(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, bool bMerge, bool bCombine, int diffContext, bool bNoPrefix)
2852 {
2853 CString cmd;
2854 if (rev2 == GitRev::GetWorkingCopy())
2855 cmd.Format(_T("git.exe diff --stat%s -p %s --"), bNoPrefix ? L" --no-prefix" : L"", (LPCTSTR)rev1);
2856 else if (rev1 == GitRev::GetWorkingCopy())
2857 cmd.Format(_T("git.exe diff -R --stat%s -p %s --"), bNoPrefix ? L" --no-prefix" : L"", (LPCTSTR)rev2);
2858 else
2859 {
2860 CString merge;
2861 if (bMerge)
2862 merge += _T(" -m");
2863
2864 if (bCombine)
2865 merge += _T(" -c");
2866
2867 CString unified;
2868 if (diffContext >= 0)
2869 unified.Format(_T(" --unified=%d"), diffContext);
2870 cmd.Format(_T("git.exe diff-tree -r -p%s%s --stat%s %s %s --"), (LPCTSTR)merge, (LPCTSTR)unified, bNoPrefix ? L" --no-prefix" : L"", (LPCTSTR)rev1, (LPCTSTR)rev2);
2871 }
2872
2873 if (!path.IsEmpty())
2874 {
2875 cmd += _T(" \"");
2876 cmd += path.GetGitPathString();
2877 cmd += _T("\"");
2878 }
2879
2880 return cmd;
2881 }
2882
2883 static void UnifiedDiffStatToFile(const git_buf* text, void* payload)
2884 {
2885 ATLASSERT(payload && text);
2886 fwrite(text->ptr, 1, text->size, (FILE *)payload);
2887 fwrite("\n", 1, 1, (FILE *)payload);
2888 }
2889
2890 static int UnifiedDiffToFile(const git_diff_delta * /* delta */, const git_diff_hunk * /* hunk */, const git_diff_line * line, void *payload)
2891 {
2892 ATLASSERT(payload && line);
2893 if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
2894 fwrite(&line->origin, 1, 1, (FILE *)payload);
2895 fwrite(line->content, 1, line->content_len, (FILE *)payload);
2896 return 0;
2897 }
2898
2899 static int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tree)
2900 {
2901 ATLASSERT(repo && identifier && tree);
2902
2903 /* try to resolve identifier */
2904 CAutoObject obj;
2905 if (git_revparse_single(obj.GetPointer(), repo, identifier))
2906 return -1;
2907
2908 if (obj == nullptr)
2909 return GIT_ENOTFOUND;
2910
2911 int err = 0;
2912 switch (git_object_type(obj))
2913 {
2914 case GIT_OBJ_TREE:
2915 *tree = (git_tree *)obj.Detach();
2916 break;
2917 case GIT_OBJ_COMMIT:
2918 err = git_commit_tree(tree, (git_commit *)(git_object*)obj);
2919 break;
2920 default:
2921 err = GIT_ENOTFOUND;
2922 }
2923
2924 return err;
2925 }
2926
2927 /* use libgit2 get unified diff */
2928 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 */, bool bNoPrefix)
2929 {
2930 CStringA tree1 = CUnicodeUtils::GetMulti(revNew, CP_UTF8);
2931 CStringA tree2 = CUnicodeUtils::GetMulti(revOld, CP_UTF8);
2932
2933 CAutoRepository repo(g_Git.GetGitRepository());
2934 if (!repo)
2935 return -1;
2936
2937 int isHeadOrphan = git_repository_head_unborn(repo);
2938 if (isHeadOrphan == 1)
2939 return 0;
2940 else if (isHeadOrphan != 0)
2941 return -1;
2942
2943 git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
2944 CStringA pathA = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
2945 char *buf = pathA.GetBuffer();
2946 if (!pathA.IsEmpty())
2947 {
2948 opts.pathspec.strings = &buf;
2949 opts.pathspec.count = 1;
2950 }
2951 if (bNoPrefix)
2952 {
2953 opts.new_prefix = "";
2954 opts.old_prefix = "";
2955 }
2956 CAutoDiff diff;
2957
2958 if (revNew == GitRev::GetWorkingCopy() || revOld == GitRev::GetWorkingCopy())
2959 {
2960 CAutoTree t1;
2961 CAutoDiff diff2;
2962
2963 if (revNew != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree1, t1.GetPointer()))
2964 return -1;
2965
2966 if (revOld != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree2, t1.GetPointer()))
2967 return -1;
2968
2969 if (git_diff_tree_to_index(diff.GetPointer(), repo, t1, nullptr, &opts))
2970 return -1;
2971
2972 if (git_diff_index_to_workdir(diff2.GetPointer(), repo, nullptr, &opts))
2973 return -1;
2974
2975 if (git_diff_merge(diff, diff2))
2976 return -1;
2977 }
2978 else
2979 {
2980 if (tree1.IsEmpty() && tree2.IsEmpty())
2981 return -1;
2982
2983 if (tree1.IsEmpty())
2984 {
2985 tree1 = tree2;
2986 tree2.Empty();
2987 }
2988
2989 CAutoTree t1;
2990 CAutoTree t2;
2991 if (!tree1.IsEmpty() && resolve_to_tree(repo, tree1, t1.GetPointer()))
2992 return -1;
2993
2994 if (tree2.IsEmpty())
2995 {
2996 /* don't check return value, there are not parent commit at first commit*/
2997 resolve_to_tree(repo, tree1 + "~1", t2.GetPointer());
2998 }
2999 else if (resolve_to_tree(repo, tree2, t2.GetPointer()))
3000 return -1;
3001 if (git_diff_tree_to_tree(diff.GetPointer(), repo, t2, t1, &opts))
3002 return -1;
3003 }
3004
3005 CAutoDiffStats stats;
3006 if (git_diff_get_stats(stats.GetPointer(), diff))
3007 return -1;
3008 CAutoBuf statBuf;
3009 if (git_diff_stats_to_buf(statBuf, stats, GIT_DIFF_STATS_FULL, 0))
3010 return -1;
3011 statCallback(statBuf, data);
3012
3013 for (size_t i = 0; i < git_diff_num_deltas(diff); ++i)
3014 {
3015 CAutoPatch patch;
3016 if (git_patch_from_diff(patch.GetPointer(), diff, i))
3017 return -1;
3018
3019 if (git_patch_print(patch, callback, data))
3020 return -1;
3021 }
3022
3023 pathA.ReleaseBuffer();
3024
3025 return 0;
3026 }
3027
3028 int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CString patchfile, bool bMerge, bool bCombine, int diffContext, bool bNoPrefix)
3029 {
3030 if (UsingLibGit2(GIT_CMD_DIFF))
3031 {
3032 CAutoFILE file = _tfsopen(patchfile, _T("w"), SH_DENYRW);
3033 if (!file)
3034 return -1;
3035 return GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffStatToFile, UnifiedDiffToFile, file, bMerge, bNoPrefix);
3036 }
3037 else
3038 {
3039 CString cmd;
3040 cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext, bNoPrefix);
3041 return RunLogFile(cmd, patchfile, &gitLastErr);
3042 }
3043 }
3044
3045 static void UnifiedDiffStatToStringA(const git_buf* text, void* payload)
3046 {
3047 ATLASSERT(payload && text);
3048 CStringA *str = (CStringA*) payload;
3049 str->Append(text->ptr, (int)text->size);
3050 str->AppendChar('\n');
3051 }
3052
3053 static int UnifiedDiffToStringA(const git_diff_delta * /*delta*/, const git_diff_hunk * /*hunk*/, const git_diff_line *line, void *payload)
3054 {
3055 ATLASSERT(payload && line);
3056 CStringA *str = (CStringA*) payload;
3057 if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
3058 str->Append(&line->origin, 1);
3059 str->Append(line->content, (int)line->content_len);
3060 return 0;
3061 }
3062
3063 int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CStringA * buffer, bool bMerge, bool bCombine, int diffContext)
3064 {
3065 if (UsingLibGit2(GIT_CMD_DIFF))
3066 return GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffStatToStringA, UnifiedDiffToStringA, buffer, bMerge, false);
3067 else
3068 {
3069 CString cmd;
3070 cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext);
3071 BYTE_VECTOR vector;
3072 int ret = Run(cmd, &vector);
3073 if (!vector.empty())
3074 {
3075 vector.push_back(0); // vector is not NUL terminated
3076 buffer->Append((char *)&vector[0]);
3077 }
3078 return ret;
3079 }
3080 }
3081
3082 int CGit::GitRevert(int parent, const CGitHash &hash)
3083 {
3084 if (UsingLibGit2(GIT_CMD_REVERT))
3085 {
3086 CAutoRepository repo(GetGitRepository());
3087 if (!repo)
3088 return -1;
3089
3090 CAutoCommit commit;
3091 if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
3092 return -1;
3093
3094 git_revert_options revert_opts = GIT_REVERT_OPTIONS_INIT;
3095 revert_opts.mainline = parent;
3096 int result = git_revert(repo, commit, &revert_opts);
3097
3098 return !result ? 0 : -1;
3099 }
3100 else
3101 {
3102 CString cmd, merge;
3103 if (parent)
3104 merge.Format(_T("-m %d "), parent);
3105 cmd.Format(_T("git.exe revert --no-edit --no-commit %s%s"), (LPCTSTR)merge, (LPCTSTR)hash.ToString());
3106 gitLastErr = cmd + _T("\n");
3107 if (Run(cmd, &gitLastErr, CP_UTF8))
3108 return -1;
3109 else
3110 {
3111 gitLastErr.Empty();
3112 return 0;
3113 }
3114 }
3115 }
3116
3117 int CGit::DeleteRef(const CString& reference)
3118 {
3119 if (UsingLibGit2(GIT_CMD_DELETETAGBRANCH))
3120 {
3121 CAutoRepository repo(GetGitRepository());
3122 if (!repo)
3123 return -1;
3124
3125 CStringA refA;
3126 if (reference.Right(3) == _T("^{}"))
3127 refA = CUnicodeUtils::GetUTF8(reference.Left(reference.GetLength() - 3));
3128 else
3129 refA = CUnicodeUtils::GetUTF8(reference);
3130
3131 CAutoReference ref;
3132 if (git_reference_lookup(ref.GetPointer(), repo, refA))
3133 return -1;
3134
3135 int result = -1;
3136 if (git_reference_is_tag(ref))
3137 result = git_tag_delete(repo, git_reference_shorthand(ref));
3138 else if (git_reference_is_branch(ref))
3139 result = git_branch_delete(ref);
3140 else if (git_reference_is_remote(ref))
3141 result = git_branch_delete(ref);
3142 else
3143 giterr_set_str(GITERR_REFERENCE, CUnicodeUtils::GetUTF8(L"unsupported reference type: " + reference));
3144
3145 return result;
3146 }
3147 else
3148 {
3149 CString cmd, shortname;
3150 if (GetShortName(reference, shortname, _T("refs/heads/")))
3151 cmd.Format(_T("git.exe branch -D -- %s"), (LPCTSTR)shortname);
3152 else if (GetShortName(reference, shortname, _T("refs/tags/")))
3153 cmd.Format(_T("git.exe tag -d -- %s"), (LPCTSTR)shortname);
3154 else if (GetShortName(reference, shortname, _T("refs/remotes/")))
3155 cmd.Format(_T("git.exe branch -r -D -- %s"), (LPCTSTR)shortname);
3156 else
3157 {
3158 gitLastErr = L"unsupported reference type: " + reference;
3159 return -1;
3160 }
3161
3162 if (Run(cmd, &gitLastErr, CP_UTF8))
3163 return -1;
3164
3165 gitLastErr.Empty();
3166 return 0;
3167 }
3168 }
3169
3170 bool CGit::LoadTextFile(const CString &filename, CString &msg)
3171 {
3172 if (!PathFileExists(filename))
3173 return false;
3174
3175 CAutoFILE pFile = _tfsopen(filename, _T("r"), SH_DENYWR);
3176 if (!pFile)
3177 {
3178 ::MessageBox(nullptr, _T("Could not open ") + filename, _T("TortoiseGit"), MB_ICONERROR);
3179 return true; // load no further files
3180 }
3181
3182 CStringA str;
3183 do
3184 {
3185 char s[8196] = { 0 };
3186 int read = (int)fread(s, sizeof(char), sizeof(s), pFile);
3187 if (read == 0)
3188 break;
3189 str += CStringA(s, read);
3190 } while (true);
3191 msg += CUnicodeUtils::GetUnicode(str);
3192 msg.Replace(_T("\r\n"), _T("\n"));
3193 msg.TrimRight(_T("\n"));
3194 msg += _T("\n");
3195
3196 return true; // load no further files
3197 }
3198
3199 int CGit::GetWorkingTreeChanges(CTGitPathList& result, bool amend, CTGitPathList* filterlist)
3200 {
3201 if (IsInitRepos())
3202 return GetInitAddList(result);
3203
3204 BYTE_VECTOR out;
3205
3206 int count = 1;
3207 if (filterlist)
3208 count = filterlist->GetCount();
3209
3210 CString head = _T("HEAD");
3211 if (amend)
3212 head = _T("HEAD~1");
3213
3214 for (int i = 0; i < count; ++i)
3215 {
3216 BYTE_VECTOR cmdout;
3217 CString cmd;
3218 if (ms_bCygwinGit || ms_bMsys2Git)
3219 {
3220 // Prevent showing all files as modified when using cygwin's git
3221 if (!filterlist)
3222 cmd = _T("git.exe status --");
3223 else
3224 cmd.Format(_T("git.exe status -- \"%s\""), (LPCTSTR)(*filterlist)[i].GetGitPathString());
3225 Run(cmd, &cmdout);
3226 cmdout.clear();
3227 }
3228
3229 // also list staged files which will be in the commit
3230 Run(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z --"), &cmdout);
3231
3232 if (!filterlist)
3233 cmd = (_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z --"));
3234 else
3235 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""), (LPCTSTR)(*filterlist)[i].GetGitPathString());
3236
3237 BYTE_VECTOR cmdErr;
3238 if (Run(cmd, &cmdout, &cmdErr))
3239 {
3240 int last = cmdErr.RevertFind(0, -1);
3241 CString str;
3242 CGit::StringAppend(&str, &cmdErr[last + 1], CP_UTF8, (int)cmdErr.size() - last - 1);
3243 MessageBox(nullptr, str, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3244 }
3245
3246 out.append(cmdout, 0);
3247 }
3248 result.ParserFromLog(out);
3249
3250 std::map<CString, int> duplicateMap;
3251 for (int i = 0; i < result.GetCount(); ++i)
3252 duplicateMap.insert(std::pair<CString, int>(result[i].GetGitPathString(), i));
3253
3254 // handle delete conflict case, when remote : modified, local : deleted.
3255 for (int i = 0; i < count; ++i)
3256 {
3257 BYTE_VECTOR cmdout;
3258 CString cmd;
3259
3260 if (!filterlist)
3261 cmd = _T("git.exe ls-files -u -t -z");
3262 else
3263 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""), (LPCTSTR)(*filterlist)[i].GetGitPathString());
3264
3265 Run(cmd, &cmdout);
3266
3267 CTGitPathList conflictlist;
3268 conflictlist.ParserFromLog(cmdout);
3269 for (int j = 0; j < conflictlist.GetCount(); ++j)
3270 {
3271 auto existing = duplicateMap.find(conflictlist[j].GetGitPathString());
3272 if (existing != duplicateMap.end())
3273 {
3274 CTGitPath& p = const_cast<CTGitPath&>(result[existing->second]);
3275 p.m_Action |= CTGitPath::LOGACTIONS_UNMERGED;
3276 }
3277 else
3278 {
3279 result.AddPath(conflictlist[j]);
3280 duplicateMap.insert(std::pair<CString, int>(result[i].GetGitPathString(), result.GetCount() - 1));
3281 }
3282 }
3283 }
3284
3285 // handle source files of file renames/moves (issue #860)
3286 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3287 for (int i = 0; i < count; ++i)
3288 {
3289 BYTE_VECTOR cmdout;
3290 CString cmd;
3291
3292 if (!filterlist)
3293 cmd = _T("git.exe ls-files -d -z");
3294 else
3295 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""), (LPCTSTR)(*filterlist)[i].GetGitPathString());
3296
3297 Run(cmd, &cmdout);
3298
3299 CTGitPathList deletelist;
3300 deletelist.ParserFromLog(cmdout, true);
3301 for (int j = 0; j < deletelist.GetCount(); ++j)
3302 {
3303 auto existing = duplicateMap.find(deletelist[j].GetGitPathString());
3304 if (existing == duplicateMap.end())
3305 {
3306 result.AddPath(deletelist[j]);
3307 duplicateMap.insert(std::pair<CString, int>(result[i].GetGitPathString(), result.GetCount() - 1));
3308 }
3309 else
3310 {
3311 CTGitPath& p = const_cast<CTGitPath&>(result[existing->second]);
3312 p.m_Action |= CTGitPath::LOGACTIONS_MISSING;
3313 }
3314 }
3315 }
3316
3317 return 0;
3318 }
3319
3320 int CGit::IsRebaseRunning()
3321 {
3322 CString adminDir;
3323 if (!GitAdminDir::GetAdminDirPath(g_Git.m_CurrentDir, adminDir))
3324 return -1;
3325
3326 if (PathIsDirectory(adminDir + L"rebase-apply") || PathIsDirectory(adminDir + L"tgitrebase.active"))
3327 return 1;
3328 return 0;
3329 }
3330
3331 void CGit::GetBisectTerms(CString* good, CString* bad)
3332 {
3333 static CString lastGood;
3334 static CString lastBad;
3335 static ULONGLONG lastRead = 0;
3336
3337 SCOPE_EXIT
3338 {
3339 if (bad)
3340 *bad = lastBad;
3341 if (good)
3342 *good = lastGood;
3343 };
3344
3345 #ifndef GTEST_INCLUDE_GTEST_GTEST_H_
3346 // add some caching here, because this method might be called multiple times in a short time from LogDlg and RevisionGraph
3347 // as we only read a small file the performance effects should be negligible
3348 if (lastRead + 5000 > GetTickCount64())
3349 return;
3350 #endif
3351
3352 lastGood = L"good";
3353 lastBad = L"bad";
3354
3355 CString adminDir;
3356 if (!GitAdminDir::GetAdminDirPath(m_CurrentDir, adminDir))
3357 return;
3358
3359 CString termsFile = adminDir + L"BISECT_TERMS";
3360 CAutoFILE fp;
3361 _tfopen_s(fp.GetPointer(), termsFile, L"rb");
3362 if (!fp)
3363 return;
3364 char badA[MAX_PATH] = { 0 };
3365 fgets(badA, MAX_PATH, fp);
3366 size_t len = strlen(badA);
3367 if (len > 0 && badA[len - 1] == '\n')
3368 badA[len - 1] = '\0';
3369 char goodA[MAX_PATH] = { 0 };
3370 fgets(goodA, MAX_PATH, fp);
3371 len = strlen(goodA);
3372 if (len > 0 && goodA[len - 1] == '\n')
3373 goodA[len - 1] = '\0';
3374 lastGood = CUnicodeUtils::GetUnicode(goodA);
3375 lastBad = CUnicodeUtils::GetUnicode(badA);
3376 lastRead = GetTickCount64();
3377 }
3378
3379 int CGit::GetGitVersion(CString* versiondebug, CString* errStr)
3380 {
3381 CString version, err;
3382 if (Run(_T("git.exe --version"), &version, &err, CP_UTF8))
3383 {
3384 if (errStr)
3385 *errStr = err;
3386 return -1;
3387 }
3388
3389 int start = 0;
3390 int ver = 0;
3391 if (versiondebug)
3392 *versiondebug = version;
3393
3394 try
3395 {
3396 CString str = version.Tokenize(_T("."), start);
3397 int space = str.ReverseFind(_T(' '));
3398 str = str.Mid(space + 1, start);
3399 ver = _ttol(str);
3400 ver <<= 24;
3401
3402 version = version.Mid(start);
3403 start = 0;
3404
3405 str = version.Tokenize(_T("."), start);
3406 ver |= (_ttol(str) & 0xFF) << 16;
3407
3408 str = version.Tokenize(_T("."), start);
3409 ver |= (_ttol(str) & 0xFF) << 8;
3410
3411 str = version.Tokenize(_T("."), start);
3412 ver |= (_ttol(str) & 0xFF);
3413 }
3414 catch (...)
3415 {
3416 if (!ver)
3417 return -1;
3418 }
3419
3420 return ver;
3421 }
Windows Explorer Extension to Operate Git