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