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