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