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