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