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