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