?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Uncheck autoload putty key for git://, http://, and https:// clone URLs
[TortoiseGit.git] / src / TortoiseProc / AppUtils.cpp
blob501685fcf6498f45f553568ac3b3167efad4e199
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2015 - TortoiseGit
4 // Copyright (C) 2003-2011, 2013-2014 - TortoiseSVN
5
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
10
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
15
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 //
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "PathUtils.h"
23 #include "AppUtils.h"
24 #include "StringUtils.h"
25 #include "MessageBox.h"
26 #include "registry.h"
27 #include "TGitPath.h"
28 #include "Git.h"
29 #include "UnicodeUtils.h"
30 #include "ExportDlg.h"
31 #include "ProgressDlg.h"
32 #include "GitAdminDir.h"
33 #include "ProgressDlg.h"
34 #include "BrowseFolder.h"
35 #include "DirFileEnum.h"
36 #include "MessageBox.h"
37 #include "GitStatus.h"
38 #include "CreateBranchTagDlg.h"
39 #include "GitSwitchDlg.h"
40 #include "ResetDlg.h"
41 #include "DeleteConflictDlg.h"
42 #include "ChangedDlg.h"
43 #include "SendMailDlg.h"
44 #include "GitProgressDlg.h"
45 #include "PushDlg.h"
46 #include "CommitDlg.h"
47 #include "MergeDlg.h"
48 #include "MergeAbortDlg.h"
49 #include "Hooks.h"
50 #include "..\Settings\Settings.h"
51 #include "InputDlg.h"
52 #include "SVNDCommitDlg.h"
53 #include "requestpulldlg.h"
54 #include "PullFetchDlg.h"
55 #include "FileDiffDlg.h"
56 #include "RebaseDlg.h"
57 #include "PropKey.h"
58 #include "StashSave.h"
59 #include "IgnoreDlg.h"
60 #include "FormatMessageWrapper.h"
61 #include "SmartHandle.h"
62 #include "BisectStartDlg.h"
63 #include "SysProgressDlg.h"
64 #include "UserPassword.h"
65 #include "Patch.h"
66 #include "Globals.h"
67 #include "ProgressCommands/ResetProgressCommand.h"
68 #include "ProgressCommands/FetchProgressCommand.h"
69 #include "ProgressCommands/SendMailProgressCommand.h"
70 #include "CertificateValidationHelper.h"
71 #include "CheckCertificateDlg.h"
72 #include "SubmoduleResolveConflictDlg.h"
73 #include "GitDiff.h"
74 #include "../TGitCache/CacheInterface.h"
75
76 static struct last_accepted_cert {
77 BYTE* data;
78 size_t len;
79
80 last_accepted_cert()
81 : data(nullptr)
82 , len(0)
83 {
84 }
85 ~last_accepted_cert()
86 {
87 free(data);
88 };
89 boolean cmp(git_cert_x509* cert)
90 {
91 return len > 0 && len == cert->len && memcmp(data, cert->data, len) == 0;
92 }
93 void set(git_cert_x509* cert)
94 {
95 free(data);
96 len = cert->len;
97 if (len == 0)
98 {
99 data = nullptr;
100 return;
101 }
102 data = new BYTE[len];
103 memcpy(data, cert->data, len);
104 }
105 } last_accepted_cert;
106
107 static bool DoFetch(const CString& url, const bool fetchAllRemotes, const bool loadPuttyAgent, const int prune, const bool bDepth, const int nDepth, const int fetchTags, const CString& remoteBranch, boolean runRebase);
108
109 CAppUtils::CAppUtils(void)
110 {
111 }
112
113 CAppUtils::~CAppUtils(void)
114 {
115 }
116
117 bool CAppUtils::StashSave(const CString& msg, bool showPull, bool pullShowPush, bool showMerge, const CString& mergeRev)
118 {
119 CStashSaveDlg dlg;
120 dlg.m_sMessage = msg;
121 if (dlg.DoModal() == IDOK)
122 {
123 CString cmd;
124 cmd = _T("git.exe stash save");
125
126 if (CAppUtils::GetMsysgitVersion() >= 0x01070700)
127 {
128 if (dlg.m_bIncludeUntracked)
129 cmd += _T(" --include-untracked");
130 else if (dlg.m_bAll)
131 cmd += _T(" --all");
132 }
133
134 if (!dlg.m_sMessage.IsEmpty())
135 {
136 CString message = dlg.m_sMessage;
137 message.Replace(_T("\""), _T("\"\""));
138 cmd += _T(" -- \"") + message + _T("\"");
139 }
140
141 CProgressDlg progress;
142 progress.m_GitCmd = cmd;
143 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
144 {
145 if (status)
146 return;
147
148 if (showPull)
149 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUPULL, [&]{ CAppUtils::Pull(pullShowPush, true); }));
150 if (showMerge)
151 postCmdList.push_back(PostCmd(IDI_MERGE, IDS_MENUMERGE, [&]{ CAppUtils::Merge(&mergeRev, true); }));
152 };
153 return (progress.DoModal() == IDOK);
154 }
155 return false;
156 }
157
158 bool CAppUtils::StashApply(CString ref, bool showChanges /* true */)
159 {
160 CString cmd,out;
161 cmd = _T("git.exe stash apply ");
162 if (ref.Find(_T("refs/")) == 0)
163 ref = ref.Mid(5);
164 if (ref.Find(_T("stash{")) == 0)
165 ref = _T("stash@") + ref.Mid(5);
166 cmd += ref;
167
168 CSysProgressDlg sysProgressDlg;
169 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
170 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
171 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
172 sysProgressDlg.SetShowProgressBar(false);
173 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
174 sysProgressDlg.ShowModeless((HWND)NULL, true);
175
176 int ret = g_Git.Run(cmd, &out, CP_UTF8);
177
178 sysProgressDlg.Stop();
179
180 bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0);
181 if (ret && !(ret == 1 && hasConflicts))
182 {
183 CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHAPPLYFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
184 }
185 else
186 {
187 CString message;
188 message.LoadString(IDS_PROC_STASHAPPLYSUCCESS);
189 if (hasConflicts)
190 message.LoadString(IDS_PROC_STASHAPPLYFAILEDCONFLICTS);
191 if (showChanges)
192 {
193 if(CMessageBox::Show(NULL,message + _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES))
194 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
195 {
196 CChangedDlg dlg;
197 dlg.m_pathList.AddPath(CTGitPath());
198 dlg.DoModal();
199 }
200 return true;
201 }
202 else
203 {
204 CMessageBox::Show(NULL, message ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
205 return true;
206 }
207 }
208 return false;
209 }
210
211 bool CAppUtils::StashPop(bool showChanges /* true */)
212 {
213 CString cmd,out;
214 cmd=_T("git.exe stash pop ");
215
216 CSysProgressDlg sysProgressDlg;
217 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
218 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
219 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
220 sysProgressDlg.SetShowProgressBar(false);
221 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
222 sysProgressDlg.ShowModeless((HWND)NULL, true);
223
224 int ret = g_Git.Run(cmd, &out, CP_UTF8);
225
226 sysProgressDlg.Stop();
227
228 bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0);
229 if (ret && !(ret == 1 && hasConflicts))
230 {
231 CMessageBox::Show(NULL,CString(MAKEINTRESOURCE(IDS_PROC_STASHPOPFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
232 }
233 else
234 {
235 CString message;
236 message.LoadString(IDS_PROC_STASHPOPSUCCESS);
237 if (hasConflicts)
238 message.LoadString(IDS_PROC_STASHPOPFAILEDCONFLICTS);
239 if (showChanges)
240 {
241 if(CMessageBox::Show(NULL,CString(message + _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES)))
242 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
243 {
244 CChangedDlg dlg;
245 dlg.m_pathList.AddPath(CTGitPath());
246 dlg.DoModal();
247 }
248 return true;
249 }
250 else
251 {
252 CMessageBox::Show(NULL, message ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
253 return true;
254 }
255 }
256 return false;
257 }
258
259 BOOL CAppUtils::StartExtMerge(
260 const CTGitPath& basefile, const CTGitPath& theirfile, const CTGitPath& yourfile, const CTGitPath& mergedfile,
261 const CString& basename, const CString& theirname, const CString& yourname, const CString& mergedname, bool bReadOnly,
262 HWND resolveMsgHwnd, bool bDeleteBaseTheirsMineOnClose)
263 {
264
265 CRegString regCom = CRegString(_T("Software\\TortoiseGit\\Merge"));
266 CString ext = mergedfile.GetFileExtension();
267 CString com = regCom;
268 bool bInternal = false;
269
270 if (!ext.IsEmpty())
271 {
272 // is there an extension specific merge tool?
273 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext.MakeLower());
274 if (!CString(mergetool).IsEmpty())
275 {
276 com = mergetool;
277 }
278 }
279 // is there a filename specific merge tool?
280 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\.") + mergedfile.GetFilename().MakeLower());
281 if (!CString(mergetool).IsEmpty())
282 {
283 com = mergetool;
284 }
285
286 if (com.IsEmpty()||(com.Left(1).Compare(_T("#"))==0))
287 {
288 // Maybe we should use TortoiseIDiff?
289 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
290 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
291 (ext == _T(".png")) || (ext == _T(".ico")) ||
292 (ext == _T(".tif")) || (ext == _T(".tiff")) ||
293 (ext == _T(".dib")) || (ext == _T(".emf")) ||
294 (ext == _T(".cur")))
295 {
296 com = CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe");
297 com = _T("\"") + com + _T("\"");
298 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /result:%merged");
299 com = com + _T(" /basetitle:%bname /theirstitle:%tname /minetitle:%yname");
300 }
301 else
302 {
303 // use TortoiseGitMerge
304 bInternal = true;
305 com = CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe");
306 com = _T("\"") + com + _T("\"");
307 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
308 com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
309 com += _T(" /saverequired");
310 if (resolveMsgHwnd)
311 {
312 CString s;
313 s.Format(L" /resolvemsghwnd:%I64d", (__int64)resolveMsgHwnd);
314 com += s;
315 }
316 if (bDeleteBaseTheirsMineOnClose)
317 com += _T(" /deletebasetheirsmineonclose");
318 }
319 if (!g_sGroupingUUID.IsEmpty())
320 {
321 com += L" /groupuuid:\"";
322 com += g_sGroupingUUID;
323 com += L"\"";
324 }
325 }
326 // check if the params are set. If not, just add the files to the command line
327 if ((com.Find(_T("%merged"))<0)&&(com.Find(_T("%base"))<0)&&(com.Find(_T("%theirs"))<0)&&(com.Find(_T("%mine"))<0))
328 {
329 com += _T(" \"")+basefile.GetWinPathString()+_T("\"");
330 com += _T(" \"")+theirfile.GetWinPathString()+_T("\"");
331 com += _T(" \"")+yourfile.GetWinPathString()+_T("\"");
332 com += _T(" \"")+mergedfile.GetWinPathString()+_T("\"");
333 }
334 if (basefile.IsEmpty())
335 {
336 com.Replace(_T("/base:%base"), _T(""));
337 com.Replace(_T("%base"), _T(""));
338 }
339 else
340 com.Replace(_T("%base"), _T("\"") + basefile.GetWinPathString() + _T("\""));
341 if (theirfile.IsEmpty())
342 {
343 com.Replace(_T("/theirs:%theirs"), _T(""));
344 com.Replace(_T("%theirs"), _T(""));
345 }
346 else
347 com.Replace(_T("%theirs"), _T("\"") + theirfile.GetWinPathString() + _T("\""));
348 if (yourfile.IsEmpty())
349 {
350 com.Replace(_T("/mine:%mine"), _T(""));
351 com.Replace(_T("%mine"), _T(""));
352 }
353 else
354 com.Replace(_T("%mine"), _T("\"") + yourfile.GetWinPathString() + _T("\""));
355 if (mergedfile.IsEmpty())
356 {
357 com.Replace(_T("/merged:%merged"), _T(""));
358 com.Replace(_T("%merged"), _T(""));
359 }
360 else
361 com.Replace(_T("%merged"), _T("\"") + mergedfile.GetWinPathString() + _T("\""));
362 if (basename.IsEmpty())
363 {
364 if (basefile.IsEmpty())
365 {
366 com.Replace(_T("/basename:%bname"), _T(""));
367 com.Replace(_T("%bname"), _T(""));
368 }
369 else
370 {
371 com.Replace(_T("%bname"), _T("\"") + basefile.GetUIFileOrDirectoryName() + _T("\""));
372 }
373 }
374 else
375 com.Replace(_T("%bname"), _T("\"") + basename + _T("\""));
376 if (theirname.IsEmpty())
377 {
378 if (theirfile.IsEmpty())
379 {
380 com.Replace(_T("/theirsname:%tname"), _T(""));
381 com.Replace(_T("%tname"), _T(""));
382 }
383 else
384 {
385 com.Replace(_T("%tname"), _T("\"") + theirfile.GetUIFileOrDirectoryName() + _T("\""));
386 }
387 }
388 else
389 com.Replace(_T("%tname"), _T("\"") + theirname + _T("\""));
390 if (yourname.IsEmpty())
391 {
392 if (yourfile.IsEmpty())
393 {
394 com.Replace(_T("/minename:%yname"), _T(""));
395 com.Replace(_T("%yname"), _T(""));
396 }
397 else
398 {
399 com.Replace(_T("%yname"), _T("\"") + yourfile.GetUIFileOrDirectoryName() + _T("\""));
400 }
401 }
402 else
403 com.Replace(_T("%yname"), _T("\"") + yourname + _T("\""));
404 if (mergedname.IsEmpty())
405 {
406 if (mergedfile.IsEmpty())
407 {
408 com.Replace(_T("/mergedname:%mname"), _T(""));
409 com.Replace(_T("%mname"), _T(""));
410 }
411 else
412 {
413 com.Replace(_T("%mname"), _T("\"") + mergedfile.GetUIFileOrDirectoryName() + _T("\""));
414 }
415 }
416 else
417 com.Replace(_T("%mname"), _T("\"") + mergedname + _T("\""));
418
419 if ((bReadOnly)&&(bInternal))
420 com += _T(" /readonly");
421
422 if(!LaunchApplication(com, IDS_ERR_EXTMERGESTART, false))
423 {
424 return FALSE;
425 }
426
427 return TRUE;
428 }
429
430 BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, const CString& sOriginalDescription, const CString& sPatchedDescription, BOOL bReversed, BOOL bWait)
431 {
432 CString viewer;
433 // use TortoiseGitMerge
434 viewer = CPathUtils::GetAppDirectory();
435 viewer += _T("TortoiseGitMerge.exe");
436
437 viewer = _T("\"") + viewer + _T("\"");
438 viewer = viewer + _T(" /diff:\"") + patchfile.GetWinPathString() + _T("\"");
439 viewer = viewer + _T(" /patchpath:\"") + dir.GetWinPathString() + _T("\"");
440 if (bReversed)
441 viewer += _T(" /reversedpatch");
442 if (!sOriginalDescription.IsEmpty())
443 viewer = viewer + _T(" /patchoriginal:\"") + sOriginalDescription + _T("\"");
444 if (!sPatchedDescription.IsEmpty())
445 viewer = viewer + _T(" /patchpatched:\"") + sPatchedDescription + _T("\"");
446 if (!g_sGroupingUUID.IsEmpty())
447 {
448 viewer += L" /groupuuid:\"";
449 viewer += g_sGroupingUUID;
450 viewer += L"\"";
451 }
452 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
453 {
454 return FALSE;
455 }
456 return TRUE;
457 }
458
459 CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2)
460 {
461 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file2.GetFilename().MakeLower());
462 if (!difftool.IsEmpty())
463 return difftool;
464 difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file1.GetFilename().MakeLower());
465 if (!difftool.IsEmpty())
466 return difftool;
467
468 // Is there an extension specific diff tool?
469 CString ext = file2.GetFileExtension().MakeLower();
470 if (!ext.IsEmpty())
471 {
472 difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext);
473 if (!difftool.IsEmpty())
474 return difftool;
475 // Maybe we should use TortoiseIDiff?
476 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
477 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
478 (ext == _T(".png")) || (ext == _T(".ico")) ||
479 (ext == _T(".tif")) || (ext == _T(".tiff")) ||
480 (ext == _T(".dib")) || (ext == _T(".emf")) ||
481 (ext == _T(".cur")))
482 {
483 return
484 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe") + _T("\"") +
485 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname") +
486 L" /groupuuid:\"" + g_sGroupingUUID + L"\"";
487 }
488 }
489
490 // Finally, pick a generic external diff tool
491 difftool = CRegString(_T("Software\\TortoiseGit\\Diff"));
492 return difftool;
493 }
494
495 bool CAppUtils::StartExtDiff(
496 const CString& file1, const CString& file2,
497 const CString& sName1, const CString& sName2,
498 const CString& originalFile1, const CString& originalFile2,
499 const git_revnum_t& hash1, const git_revnum_t& hash2,
500 const DiffFlags& flags, int jumpToLine)
501 {
502 CString viewer;
503
504 CRegDWORD blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE);
505 if (!flags.bBlame || !(DWORD)blamediff)
506 {
507 viewer = PickDiffTool(file1, file2);
508 // If registry entry for a diff program is commented out, use TortoiseGitMerge.
509 bool bCommentedOut = viewer.Left(1) == _T("#");
510 if (flags.bAlternativeTool)
511 {
512 // Invert external vs. internal diff tool selection.
513 if (bCommentedOut)
514 viewer.Delete(0); // uncomment
515 else
516 viewer = "";
517 }
518 else if (bCommentedOut)
519 viewer = "";
520 }
521
522 bool bInternal = viewer.IsEmpty();
523 if (bInternal)
524 {
525 viewer =
526 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe") + _T("\"") +
527 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname") +
528 _T(" /basereflectedname:%bpath /minereflectedname:%ypath");
529 if (!g_sGroupingUUID.IsEmpty())
530 {
531 viewer += L" /groupuuid:\"";
532 viewer += g_sGroupingUUID;
533 viewer += L"\"";
534 }
535 if (flags.bBlame)
536 viewer += _T(" /blame");
537 }
538 // check if the params are set. If not, just add the files to the command line
539 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
540 {
541 viewer += _T(" \"")+file1+_T("\"");
542 viewer += _T(" \"")+file2+_T("\"");
543 }
544 if (viewer.Find(_T("%base")) >= 0)
545 {
546 viewer.Replace(_T("%base"), _T("\"")+file1+_T("\""));
547 }
548 if (viewer.Find(_T("%mine")) >= 0)
549 {
550 viewer.Replace(_T("%mine"), _T("\"")+file2+_T("\""));
551 }
552
553 if (sName1.IsEmpty())
554 viewer.Replace(_T("%bname"), _T("\"") + file1 + _T("\""));
555 else
556 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
557
558 if (sName2.IsEmpty())
559 viewer.Replace(_T("%yname"), _T("\"") + file2 + _T("\""));
560 else
561 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
562
563 viewer.Replace(_T("%bpath"), _T("\"") + originalFile1 + _T("\""));
564 viewer.Replace(_T("%ypath"), _T("\"") + originalFile2 + _T("\""));
565
566 viewer.Replace(_T("%brev"), _T("\"") + hash1 + _T("\""));
567 viewer.Replace(_T("%yrev"), _T("\"") + hash2 + _T("\""));
568
569 if (flags.bReadOnly && bInternal)
570 viewer += _T(" /readonly");
571
572 if (jumpToLine > 0)
573 {
574 CString temp;
575 temp.Format(_T(" /line:%d"), jumpToLine);
576 viewer += temp;
577 }
578
579 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait);
580 }
581
582 BOOL CAppUtils::StartUnifiedDiffViewer(const CString& patchfile, const CString& title, BOOL bWait)
583 {
584 CString viewer;
585 CRegString v = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
586 viewer = v;
587 if (viewer.IsEmpty() || (viewer.Left(1).Compare(_T("#"))==0))
588 {
589 // use TortoiseGitUDiff
590 viewer = CPathUtils::GetAppDirectory();
591 viewer += _T("TortoiseGitUDiff.exe");
592 // enquote the path to TortoiseGitUDiff
593 viewer = _T("\"") + viewer + _T("\"");
594 // add the params
595 viewer = viewer + _T(" /patchfile:%1 /title:\"%title\"");
596 if (!g_sGroupingUUID.IsEmpty())
597 {
598 viewer += L" /groupuuid:\"";
599 viewer += g_sGroupingUUID;
600 viewer += L"\"";
601 }
602 }
603 if (viewer.Find(_T("%1"))>=0)
604 {
605 if (viewer.Find(_T("\"%1\"")) >= 0)
606 viewer.Replace(_T("%1"), patchfile);
607 else
608 viewer.Replace(_T("%1"), _T("\"") + patchfile + _T("\""));
609 }
610 else
611 viewer += _T(" \"") + patchfile + _T("\"");
612 if (viewer.Find(_T("%title")) >= 0)
613 {
614 viewer.Replace(_T("%title"), title);
615 }
616
617 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
618 {
619 return FALSE;
620 }
621 return TRUE;
622 }
623
624 BOOL CAppUtils::StartTextViewer(CString file)
625 {
626 CString viewer;
627 CRegString txt = CRegString(_T(".txt\\"), _T(""), FALSE, HKEY_CLASSES_ROOT);
628 viewer = txt;
629 viewer = viewer + _T("\\Shell\\Open\\Command\\");
630 CRegString txtexe = CRegString(viewer, _T(""), FALSE, HKEY_CLASSES_ROOT);
631 viewer = txtexe;
632
633 DWORD len = ExpandEnvironmentStrings(viewer, NULL, 0);
634 std::unique_ptr<TCHAR[]> buf(new TCHAR[len + 1]);
635 ExpandEnvironmentStrings(viewer, buf.get(), len);
636 viewer = buf.get();
637 len = ExpandEnvironmentStrings(file, NULL, 0);
638 std::unique_ptr<TCHAR[]> buf2(new TCHAR[len + 1]);
639 ExpandEnvironmentStrings(file, buf2.get(), len);
640 file = buf2.get();
641 file = _T("\"")+file+_T("\"");
642 if (viewer.IsEmpty())
643 {
644 return CAppUtils::ShowOpenWithDialog(file) ? TRUE : FALSE;
645 }
646 if (viewer.Find(_T("\"%1\"")) >= 0)
647 {
648 viewer.Replace(_T("\"%1\""), file);
649 }
650 else if (viewer.Find(_T("%1")) >= 0)
651 {
652 viewer.Replace(_T("%1"), file);
653 }
654 else
655 {
656 viewer += _T(" ");
657 viewer += file;
658 }
659
660 if(!LaunchApplication(viewer, IDS_ERR_TEXTVIEWSTART, false))
661 {
662 return FALSE;
663 }
664 return TRUE;
665 }
666
667 BOOL CAppUtils::CheckForEmptyDiff(const CTGitPath& sDiffPath)
668 {
669 DWORD length = 0;
670 CAutoFile hFile = ::CreateFile(sDiffPath.GetWinPath(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);
671 if (!hFile)
672 return TRUE;
673 length = ::GetFileSize(hFile, NULL);
674 if (length < 4)
675 return TRUE;
676 return FALSE;
677
678 }
679
680 void CAppUtils::CreateFontForLogs(CFont& fontToCreate)
681 {
682 LOGFONT logFont;
683 HDC hScreenDC = ::GetDC(NULL);
684 logFont.lfHeight = -MulDiv((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC, LOGPIXELSY), 72);
685 ::ReleaseDC(NULL, hScreenDC);
686 logFont.lfWidth = 0;
687 logFont.lfEscapement = 0;
688 logFont.lfOrientation = 0;
689 logFont.lfWeight = FW_NORMAL;
690 logFont.lfItalic = 0;
691 logFont.lfUnderline = 0;
692 logFont.lfStrikeOut = 0;
693 logFont.lfCharSet = DEFAULT_CHARSET;
694 logFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
695 logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
696 logFont.lfQuality = DRAFT_QUALITY;
697 logFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH;
698 _tcscpy_s(logFont.lfFaceName, 32, (LPCTSTR)(CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
699 VERIFY(fontToCreate.CreateFontIndirect(&logFont));
700 }
701
702 bool CAppUtils::LaunchPAgent(const CString* keyfile, const CString* pRemote)
703 {
704 CString key,remote;
705 CString cmd,out;
706 if( pRemote == NULL)
707 {
708 remote=_T("origin");
709 }
710 else
711 {
712 remote=*pRemote;
713 }
714 if(keyfile == NULL)
715 {
716 cmd.Format(_T("remote.%s.puttykeyfile"),remote);
717 key = g_Git.GetConfigValue(cmd);
718 }
719 else
720 key=*keyfile;
721
722 if(key.IsEmpty())
723 return false;
724
725 CString proc=CPathUtils::GetAppDirectory();
726 proc += _T("pageant.exe \"");
727 proc += key;
728 proc += _T("\"");
729
730 CString tempfile = GetTempFile();
731 ::DeleteFile(tempfile);
732
733 proc += _T(" -c \"");
734 proc += CPathUtils::GetAppDirectory();
735 proc += _T("tgittouch.exe\"");
736 proc += _T(" \"");
737 proc += tempfile;
738 proc += _T("\"");
739
740 CString appDir = CPathUtils::GetAppDirectory();
741 bool b = LaunchApplication(proc, IDS_ERR_PAGEANT, true, &appDir);
742 if(!b)
743 return b;
744
745 int i=0;
746 while(!::PathFileExists(tempfile))
747 {
748 Sleep(100);
749 ++i;
750 if(i>10*60*5)
751 break; //timeout 5 minutes
752 }
753
754 if( i== 10*60*5)
755 {
756 CMessageBox::Show(NULL, IDS_ERR_PAEGENTTIMEOUT, IDS_APPNAME, MB_OK | MB_ICONERROR);
757 }
758 ::DeleteFile(tempfile);
759 return true;
760 }
761 bool CAppUtils::LaunchAlternativeEditor(const CString& filename, bool uac)
762 {
763 CString editTool = CRegString(_T("Software\\TortoiseGit\\AlternativeEditor"));
764 if (editTool.IsEmpty() || (editTool.Left(1).Compare(_T("#"))==0)) {
765 editTool = CPathUtils::GetAppDirectory() + _T("notepad2.exe");
766 }
767
768 CString sCmd;
769 sCmd.Format(_T("\"%s\" \"%s\""), editTool, filename);
770
771 LaunchApplication(sCmd, NULL, false, NULL, uac);
772 return true;
773 }
774 bool CAppUtils::LaunchRemoteSetting()
775 {
776 CTGitPath path(g_Git.m_CurrentDir);
777 CSettings dlg(IDS_PROC_SETTINGS_TITLE, &path);
778 dlg.SetTreeViewMode(TRUE, TRUE, TRUE);
779 dlg.SetTreeWidth(220);
780 dlg.m_DefaultPage = _T("gitremote");
781
782 dlg.DoModal();
783 dlg.HandleRestart();
784 return true;
785 }
786 /**
787 * Launch the external blame viewer
788 */
789 bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile, const CString& Rev, const CString& sParams)
790 {
791 CString viewer = _T("\"") + CPathUtils::GetAppDirectory();
792 viewer += _T("TortoiseGitBlame.exe");
793 viewer += _T("\" \"") + sBlameFile + _T("\"");
794 //viewer += _T(" \"") + sLogFile + _T("\"");
795 //viewer += _T(" \"") + sOriginalFile + _T("\"");
796 if(!Rev.IsEmpty() && Rev != GIT_REV_ZERO)
797 viewer += CString(_T(" /rev:"))+Rev;
798 if (!g_sGroupingUUID.IsEmpty())
799 {
800 viewer += L" /groupuuid:\"";
801 viewer += g_sGroupingUUID;
802 viewer += L"\"";
803 }
804 viewer += _T(" ")+sParams;
805
806 return LaunchApplication(viewer, IDS_ERR_TGITBLAME, false);
807 }
808
809 bool CAppUtils::FormatTextInRichEditControl(CWnd * pWnd)
810 {
811 CString sText;
812 if (pWnd == NULL)
813 return false;
814 bool bStyled = false;
815 pWnd->GetWindowText(sText);
816 // the rich edit control doesn't count the CR char!
817 // to be exact: CRLF is treated as one char.
818 sText.Remove(_T('\r'));
819
820 // style each line separately
821 int offset = 0;
822 int nNewlinePos;
823 do
824 {
825 nNewlinePos = sText.Find('\n', offset);
826 CString sLine = nNewlinePos >= 0 ? sText.Mid(offset, nNewlinePos - offset) : sText.Mid(offset);
827
828 int start = 0;
829 int end = 0;
830 while (FindStyleChars(sLine, '*', start, end))
831 {
832 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
833 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
834 SetCharFormat(pWnd, CFM_BOLD, CFE_BOLD);
835 bStyled = true;
836 start = end;
837 }
838 start = 0;
839 end = 0;
840 while (FindStyleChars(sLine, '^', start, end))
841 {
842 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
843 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
844 SetCharFormat(pWnd, CFM_ITALIC, CFE_ITALIC);
845 bStyled = true;
846 start = end;
847 }
848 start = 0;
849 end = 0;
850 while (FindStyleChars(sLine, '_', start, end))
851 {
852 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
853 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
854 SetCharFormat(pWnd, CFM_UNDERLINE, CFE_UNDERLINE);
855 bStyled = true;
856 start = end;
857 }
858 offset = nNewlinePos+1;
859 } while(nNewlinePos>=0);
860 return bStyled;
861 }
862
863 bool CAppUtils::FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end)
864 {
865 int i=start;
866 int last = sText.GetLength() - 1;
867 bool bFoundMarker = false;
868 TCHAR c = i == 0 ? _T('\0') : sText[i - 1];
869 TCHAR nextChar = i >= last ? _T('\0') : sText[i + 1];
870
871 // find a starting marker
872 while (i < last)
873 {
874 TCHAR prevChar = c;
875 c = nextChar;
876 nextChar = sText[i + 1];
877
878 // IsCharAlphaNumeric can be somewhat expensive.
879 // Long lines of "*****" or "----" will be pre-empted efficiently
880 // by the (c != nextChar) condition.
881
882 if ((c == stylechar) && (c != nextChar))
883 {
884 if (IsCharAlphaNumeric(nextChar) && !IsCharAlphaNumeric(prevChar))
885 {
886 start = ++i;
887 bFoundMarker = true;
888 break;
889 }
890 }
891 ++i;
892 }
893 if (!bFoundMarker)
894 return false;
895
896 // find ending marker
897 // c == sText[i - 1]
898
899 bFoundMarker = false;
900 while (i <= last)
901 {
902 TCHAR prevChar = c;
903 c = sText[i];
904 if (c == stylechar)
905 {
906 if ((i == last) || (!IsCharAlphaNumeric(sText[i + 1]) && IsCharAlphaNumeric(prevChar)))
907 {
908 end = i;
909 ++i;
910 bFoundMarker = true;
911 break;
912 }
913 }
914 ++i;
915 }
916 return bFoundMarker;
917 }
918
919 // from CSciEdit
920 namespace {
921 bool IsValidURLChar(wchar_t ch)
922 {
923 return iswalnum(ch) ||
924 ch == L'_' || ch == L'/' || ch == L';' || ch == L'?' || ch == L'&' || ch == L'=' ||
925 ch == L'%' || ch == L':' || ch == L'.' || ch == L'#' || ch == L'-' || ch == L'+' ||
926 ch == L'|' || ch == L'>' || ch == L'<';
927 }
928
929 bool IsUrl(const CString& sText)
930 {
931 if (!PathIsURLW(sText))
932 return false;
933 if (sText.Find(L"://") >= 0)
934 return true;
935 return false;
936 }
937 }
938
939 BOOL CAppUtils::StyleURLs(const CString& msg, CWnd* pWnd)
940 {
941 std::vector<CHARRANGE> positions = FindURLMatches(msg);
942 CAppUtils::SetCharFormat(pWnd, CFM_LINK, CFE_LINK, positions);
943
944 return positions.empty() ? FALSE : TRUE;
945 }
946
947 /**
948 * implements URL searching with the same logic as CSciEdit::StyleURLs
949 */
950 std::vector<CHARRANGE> CAppUtils::FindURLMatches(const CString& msg)
951 {
952 std::vector<CHARRANGE> result;
953
954 int len = msg.GetLength();
955 int starturl = -1;
956
957 for (int i = 0; i <= msg.GetLength(); ++i)
958 {
959 if ((i < len) && IsValidURLChar(msg[i]))
960 {
961 if (starturl < 0)
962 starturl = i;
963 }
964 else
965 {
966 if (starturl >= 0)
967 {
968 bool strip = true;
969 if (msg[starturl] == '<' && i < len) // try to detect and do not strip URLs put within <>
970 {
971 while (starturl <= i && msg[starturl] == '<') // strip leading '<'
972 ++starturl;
973 strip = false;
974 i = starturl;
975 while (i < len && msg[i] != '\r' && msg[i] != '\n' && msg[i] != '>') // find first '>' or new line after resetting i to start position
976 ++i;
977 }
978 if (!IsUrl(msg.Mid(starturl, i - starturl)))
979 {
980 starturl = -1;
981 continue;
982 }
983
984 int skipTrailing = 0;
985 while (strip && i - skipTrailing - 1 > starturl && (msg[i - skipTrailing - 1] == '.' || msg[i - skipTrailing - 1] == '-' || msg[i - skipTrailing - 1] == '?' || msg[i - skipTrailing - 1] == ';' || msg[i - skipTrailing - 1] == ':' || msg[i - skipTrailing - 1] == '>' || msg[i - skipTrailing - 1] == '<'))
986 ++skipTrailing;
987
988 CHARRANGE range = { starturl, i - skipTrailing };
989 result.push_back(range);
990 }
991 starturl = -1;
992 }
993 }
994
995 return result;
996 }
997
998 bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const git_revnum_t& rev1,
999 const CTGitPath& /*url2*/, const git_revnum_t& rev2,
1000 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
1001 bool /*bAlternateDiff*/ /* = false */, bool /*bIgnoreAncestry*/ /* = false */,
1002 bool /* blame = false */,
1003 bool bMerge,
1004 bool bCombine)
1005 {
1006 int diffContext = 0;
1007 if (GetMsysgitVersion() > 0x01080100)
1008 diffContext = g_Git.GetConfigValueInt32(_T("diff.context"), -1);
1009 CString tempfile=GetTempFile();
1010 if (g_Git.GetUnifiedDiff(url1, rev1, rev2, tempfile, bMerge, bCombine, diffContext))
1011 {
1012 CMessageBox::Show(hWnd, g_Git.GetGitLastErr(_T("Could not get unified diff."), CGit::GIT_CMD_DIFF), _T("TortoiseGit"), MB_OK);
1013 return false;
1014 }
1015 CAppUtils::StartUnifiedDiffViewer(tempfile, rev1 + _T(":") + rev2);
1016
1017 #if 0
1018 CString sCmd;
1019 sCmd.Format(_T("%s /command:showcompare /unified"),
1020 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseGitProc.exe")));
1021 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
1022 if (rev1.IsValid())
1023 sCmd += _T(" /revision1:") + rev1.ToString();
1024 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
1025 if (rev2.IsValid())
1026 sCmd += _T(" /revision2:") + rev2.ToString();
1027 if (peg.IsValid())
1028 sCmd += _T(" /pegrevision:") + peg.ToString();
1029 if (headpeg.IsValid())
1030 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
1031
1032 if (bAlternateDiff)
1033 sCmd += _T(" /alternatediff");
1034
1035 if (bIgnoreAncestry)
1036 sCmd += _T(" /ignoreancestry");
1037
1038 if (hWnd)
1039 {
1040 sCmd += _T(" /hwnd:");
1041 TCHAR buf[30];
1042 _stprintf_s(buf, 30, _T("%p"), (void*)hWnd);
1043 sCmd += buf;
1044 }
1045
1046 return CAppUtils::LaunchApplication(sCmd, NULL, false);
1047 #endif
1048 return TRUE;
1049 }
1050
1051 bool CAppUtils::SetupDiffScripts(bool force, const CString& type)
1052 {
1053 CString scriptsdir = CPathUtils::GetAppParentDirectory();
1054 scriptsdir += _T("Diff-Scripts");
1055 CSimpleFileFind files(scriptsdir);
1056 while (files.FindNextFileNoDirectories())
1057 {
1058 CString file = files.GetFilePath();
1059 CString filename = files.GetFileName();
1060 CString ext = file.Mid(file.ReverseFind('-') + 1);
1061 ext = _T(".") + ext.Left(ext.ReverseFind('.'));
1062 std::set<CString> extensions;
1063 extensions.insert(ext);
1064 CString kind;
1065 if (file.Right(3).CompareNoCase(_T("vbs"))==0)
1066 {
1067 kind = _T(" //E:vbscript");
1068 }
1069 if (file.Right(2).CompareNoCase(_T("js"))==0)
1070 {
1071 kind = _T(" //E:javascript");
1072 }
1073 // open the file, read the first line and find possible extensions
1074 // this script can handle
1075 try
1076 {
1077 CStdioFile f(file, CFile::modeRead | CFile::shareDenyNone);
1078 CString extline;
1079 if (f.ReadString(extline))
1080 {
1081 if ((extline.GetLength() > 15 ) &&
1082 ((extline.Left(15).Compare(_T("// extensions: ")) == 0) ||
1083 (extline.Left(14).Compare(_T("' extensions: ")) == 0)))
1084 {
1085 if (extline[0] == '/')
1086 extline = extline.Mid(15);
1087 else
1088 extline = extline.Mid(14);
1089 CString sToken;
1090 int curPos = 0;
1091 sToken = extline.Tokenize(_T(";"), curPos);
1092 while (!sToken.IsEmpty())
1093 {
1094 if (!sToken.IsEmpty())
1095 {
1096 if (sToken[0] != '.')
1097 sToken = _T(".") + sToken;
1098 extensions.insert(sToken);
1099 }
1100 sToken = extline.Tokenize(_T(";"), curPos);
1101 }
1102 }
1103 }
1104 f.Close();
1105 }
1106 catch (CFileException* e)
1107 {
1108 e->Delete();
1109 }
1110
1111 for (std::set<CString>::const_iterator it = extensions.begin(); it != extensions.end(); ++it)
1112 {
1113 if (type.IsEmpty() || (type.Compare(_T("Diff")) == 0))
1114 {
1115 if (filename.Left(5).CompareNoCase(_T("diff-")) == 0)
1116 {
1117 CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + *it);
1118 CString diffregstring = diffreg;
1119 if (force || (diffregstring.IsEmpty()) || (diffregstring.Find(filename) >= 0))
1120 diffreg = _T("wscript.exe \"") + file + _T("\" %base %mine") + kind;
1121 }
1122 }
1123 if (type.IsEmpty() || (type.Compare(_T("Merge"))==0))
1124 {
1125 if (filename.Left(6).CompareNoCase(_T("merge-"))==0)
1126 {
1127 CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\MergeTools\\") + *it);
1128 CString diffregstring = diffreg;
1129 if (force || (diffregstring.IsEmpty()) || (diffregstring.Find(filename) >= 0))
1130 diffreg = _T("wscript.exe \"") + file + _T("\" %merged %theirs %mine %base") + kind;
1131 }
1132 }
1133 }
1134 }
1135
1136 return true;
1137 }
1138
1139 bool CAppUtils::Export(const CString* BashHash, const CTGitPath* orgPath)
1140 {
1141 // ask from where the export has to be done
1142 CExportDlg dlg;
1143 if(BashHash)
1144 dlg.m_initialRefName=*BashHash;
1145 if (orgPath)
1146 {
1147 if (PathIsRelative(orgPath->GetWinPath()))
1148 dlg.m_orgPath = g_Git.CombinePath(orgPath);
1149 else
1150 dlg.m_orgPath = *orgPath;
1151 }
1152
1153 if (dlg.DoModal() == IDOK)
1154 {
1155 CString cmd;
1156 cmd.Format(_T("git.exe archive --output=\"%s\" --format=zip --verbose %s --"),
1157 dlg.m_strFile, g_Git.FixBranchName(dlg.m_VersionName));
1158
1159 CProgressDlg pro;
1160 pro.m_GitCmd=cmd;
1161 pro.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
1162 {
1163 if (status)
1164 return;
1165 postCmdList.push_back(PostCmd(IDI_EXPLORER, IDS_STATUSLIST_CONTEXT_EXPLORE, [&]{ CAppUtils::ExploreTo(hWndExplorer, dlg.m_strFile); }));
1166 };
1167
1168 CGit git;
1169 if (!dlg.m_bWholeProject && !dlg.m_orgPath.IsEmpty() && PathIsDirectory(dlg.m_orgPath.GetWinPathString()))
1170 {
1171 git.m_CurrentDir = dlg.m_orgPath.GetWinPathString();
1172 pro.m_Git = &git;
1173 }
1174 return (pro.DoModal() == IDOK);
1175 }
1176 return false;
1177 }
1178
1179 bool CAppUtils::CreateBranchTag(bool IsTag, const CString* CommitHash, bool switch_new_brach)
1180 {
1181 CCreateBranchTagDlg dlg;
1182 dlg.m_bIsTag=IsTag;
1183 dlg.m_bSwitch=switch_new_brach;
1184
1185 if(CommitHash)
1186 dlg.m_initialRefName = *CommitHash;
1187
1188 if(dlg.DoModal()==IDOK)
1189 {
1190 CString cmd;
1191 CString force;
1192 CString track;
1193 if(dlg.m_bTrack == TRUE)
1194 track=_T(" --track ");
1195 else if(dlg.m_bTrack == FALSE)
1196 track=_T(" --no-track");
1197
1198 if(dlg.m_bForce)
1199 force=_T(" -f ");
1200
1201 if(IsTag)
1202 {
1203 CString sign;
1204 if(dlg.m_bSign)
1205 sign=_T("-s");
1206
1207 cmd.Format(_T("git.exe tag %s %s %s %s"),
1208 force,
1209 sign,
1210 dlg.m_BranchTagName,
1211 g_Git.FixBranchName(dlg.m_VersionName)
1212 );
1213
1214 if(!dlg.m_Message.Trim().IsEmpty())
1215 {
1216 CString tempfile = ::GetTempFile();
1217 if (CAppUtils::SaveCommitUnicodeFile(tempfile, dlg.m_Message))
1218 {
1219 CMessageBox::Show(nullptr, _T("Could not save tag message"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1220 return FALSE;
1221 }
1222 cmd += _T(" -F ")+tempfile;
1223 }
1224 }
1225 else
1226 {
1227 cmd.Format(_T("git.exe branch %s %s %s %s"),
1228 track,
1229 force,
1230 dlg.m_BranchTagName,
1231 g_Git.FixBranchName(dlg.m_VersionName)
1232 );
1233 }
1234 CString out;
1235 if(g_Git.Run(cmd,&out,CP_UTF8))
1236 {
1237 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
1238 return FALSE;
1239 }
1240 if( !IsTag && dlg.m_bSwitch )
1241 {
1242 // it is a new branch and the user has requested to switch to it
1243 PerformSwitch(dlg.m_BranchTagName);
1244 }
1245
1246 return TRUE;
1247 }
1248 return FALSE;
1249 }
1250
1251 bool CAppUtils::Switch(const CString& initialRefName)
1252 {
1253 CGitSwitchDlg dlg;
1254 if(!initialRefName.IsEmpty())
1255 dlg.m_initialRefName = initialRefName;
1256
1257 if (dlg.DoModal() == IDOK)
1258 {
1259 CString branch;
1260 if (dlg.m_bBranch)
1261 branch = dlg.m_NewBranch;
1262
1263 // if refs/heads/ is not stripped, checkout will detach HEAD
1264 // checkout prefers branches on name clashes (with tags)
1265 if (dlg.m_VersionName.Left(11) ==_T("refs/heads/") && dlg.m_bBranchOverride != TRUE)
1266 dlg.m_VersionName = dlg.m_VersionName.Mid(11);
1267
1268 return PerformSwitch(dlg.m_VersionName, dlg.m_bForce == TRUE , branch, dlg.m_bBranchOverride == TRUE, dlg.m_bTrack, dlg.m_bMerge == TRUE);
1269 }
1270 return FALSE;
1271 }
1272
1273 bool CAppUtils::PerformSwitch(const CString& ref, bool bForce /* false */, const CString& sNewBranch /* CString() */, bool bBranchOverride /* false */, BOOL bTrack /* 2 */, bool bMerge /* false */)
1274 {
1275 CString cmd;
1276 CString track;
1277 CString force;
1278 CString branch;
1279 CString merge;
1280
1281 if(!sNewBranch.IsEmpty()){
1282 if (bBranchOverride)
1283 {
1284 branch.Format(_T("-B %s"), sNewBranch);
1285 }
1286 else
1287 {
1288 branch.Format(_T("-b %s"), sNewBranch);
1289 }
1290 if (bTrack == TRUE)
1291 track = _T("--track");
1292 else if (bTrack == FALSE)
1293 track = _T("--no-track");
1294 }
1295 if (bForce)
1296 force = _T("-f");
1297 if (bMerge)
1298 merge = _T("--merge");
1299
1300 cmd.Format(_T("git.exe checkout %s %s %s %s %s --"),
1301 force,
1302 track,
1303 merge,
1304 branch,
1305 g_Git.FixBranchName(ref));
1306
1307 CProgressDlg progress;
1308 progress.m_GitCmd = cmd;
1309
1310 CString currentBranch;
1311 bool hasBranch = CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, currentBranch) == 0;
1312 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
1313 {
1314 if (!status)
1315 {
1316 CTGitPath gitPath = g_Git.m_CurrentDir;
1317 if (gitPath.HasSubmodules())
1318 {
1319 postCmdList.push_back(PostCmd(IDI_UPDATE, IDS_PROC_SUBMODULESUPDATE, [&]
1320 {
1321 CString sCmd;
1322 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
1323 RunTortoiseGitProc(sCmd);
1324 }));
1325 }
1326 if (hasBranch)
1327 postCmdList.push_back(PostCmd(IDI_MERGE, IDS_MENUMERGE, [&]{ Merge(&currentBranch); }));
1328
1329
1330 CString newBranch;
1331 if (!CGit::GetCurrentBranchFromFile(g_Git.m_CurrentDir, newBranch))
1332 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUPULL, [&]{ Pull(); }));
1333
1334 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUCOMMIT, []{
1335 CTGitPathList pathlist;
1336 CTGitPathList selectedlist;
1337 bool bSelectFilesForCommit = !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
1338 CString str;
1339 Commit(CString(), false, str, pathlist, selectedlist, bSelectFilesForCommit);
1340 }));
1341 }
1342 else
1343 {
1344 postCmdList.push_back(PostCmd(IDI_REFRESH, IDS_MSGBOX_RETRY, [&]{ PerformSwitch(ref, bForce, sNewBranch, bBranchOverride, bTrack, bMerge); }));
1345 if (!bMerge)
1346 postCmdList.push_back(PostCmd(IDI_SWITCH, IDS_SWITCH_WITH_MERGE, [&]{ PerformSwitch(ref, bForce, sNewBranch, bBranchOverride, bTrack, true); }));
1347 }
1348 };
1349
1350 INT_PTR ret = progress.DoModal();
1351
1352 return ret == IDOK;
1353 }
1354
1355 class CIgnoreFile : public CStdioFile
1356 {
1357 public:
1358 STRING_VECTOR m_Items;
1359 CString m_eol;
1360
1361 virtual BOOL ReadString(CString& rString)
1362 {
1363 if (GetPosition() == 0)
1364 {
1365 unsigned char utf8bom[] = { 0xEF, 0xBB, 0xBF };
1366 char buf[3] = { 0, 0, 0 };
1367 Read(buf, 3);
1368 if (memcpy(buf, utf8bom, sizeof(utf8bom)))
1369 {
1370 SeekToBegin();
1371 }
1372 }
1373
1374 CStringA strA;
1375 char lastChar = '\0';
1376 for (char c = '\0'; Read(&c, 1) == 1; lastChar = c)
1377 {
1378 if (c == '\r')
1379 continue;
1380 if (c == '\n')
1381 {
1382 m_eol = lastChar == '\r' ? _T("\r\n") : _T("\n");
1383 break;
1384 }
1385 strA.AppendChar(c);
1386 }
1387 if (strA.IsEmpty())
1388 return FALSE;
1389
1390 rString = CUnicodeUtils::GetUnicode(strA);
1391 return TRUE;
1392 }
1393
1394 void ResetState()
1395 {
1396 m_Items.clear();
1397 m_eol = _T("");
1398 }
1399 };
1400
1401 bool CAppUtils::OpenIgnoreFile(CIgnoreFile &file, const CString& filename)
1402 {
1403 file.ResetState();
1404 if (!file.Open(filename, CFile::modeCreate | CFile::modeReadWrite | CFile::modeNoTruncate | CFile::typeBinary))
1405 {
1406 CMessageBox::Show(NULL, filename + _T(" Open Failure"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1407 return false;
1408 }
1409
1410 if (file.GetLength() > 0)
1411 {
1412 CString fileText;
1413 while (file.ReadString(fileText))
1414 file.m_Items.push_back(fileText);
1415 file.Seek(file.GetLength() - 1, 0);
1416 char lastchar[1] = { 0 };
1417 file.Read(lastchar, 1);
1418 file.SeekToEnd();
1419 if (lastchar[0] != '\n')
1420 {
1421 CStringA eol = CStringA(file.m_eol.IsEmpty() ? _T("\n") : file.m_eol);
1422 file.Write(eol, eol.GetLength());
1423 }
1424 }
1425 else
1426 file.SeekToEnd();
1427
1428 return true;
1429 }
1430
1431 bool CAppUtils::IgnoreFile(const CTGitPathList& path,bool IsMask)
1432 {
1433 CIgnoreDlg ignoreDlg;
1434 if (ignoreDlg.DoModal() == IDOK)
1435 {
1436 CString ignorefile;
1437 ignorefile = g_Git.m_CurrentDir + _T("\\");
1438
1439 switch (ignoreDlg.m_IgnoreFile)
1440 {
1441 case 0:
1442 ignorefile += _T(".gitignore");
1443 break;
1444 case 2:
1445 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, ignorefile);
1446 ignorefile += _T("info/exclude");
1447 break;
1448 }
1449
1450 CIgnoreFile file;
1451 try
1452 {
1453 if (ignoreDlg.m_IgnoreFile != 1 && !OpenIgnoreFile(file, ignorefile))
1454 return false;
1455
1456 for (int i = 0; i < path.GetCount(); ++i)
1457 {
1458 if (ignoreDlg.m_IgnoreFile == 1)
1459 {
1460 ignorefile = g_Git.CombinePath(path[i].GetContainingDirectory()) + _T("\\.gitignore");
1461 if (!OpenIgnoreFile(file, ignorefile))
1462 return false;
1463 }
1464
1465 CString ignorePattern;
1466 if (ignoreDlg.m_IgnoreType == 0)
1467 {
1468 if (ignoreDlg.m_IgnoreFile != 1 && !path[i].GetContainingDirectory().GetGitPathString().IsEmpty())
1469 ignorePattern += _T("/") + path[i].GetContainingDirectory().GetGitPathString();
1470
1471 ignorePattern += _T("/");
1472 }
1473 if (IsMask)
1474 {
1475 ignorePattern += _T("*") + path[i].GetFileExtension();
1476 }
1477 else
1478 {
1479 ignorePattern += path[i].GetFileOrDirectoryName();
1480 }
1481
1482 // escape [ and ] so that files get ignored correctly
1483 ignorePattern.Replace(_T("["), _T("\\["));
1484 ignorePattern.Replace(_T("]"), _T("\\]"));
1485
1486 bool found = false;
1487 for (size_t j = 0; j < file.m_Items.size(); ++j)
1488 {
1489 if (file.m_Items[j] == ignorePattern)
1490 {
1491 found = true;
1492 break;
1493 }
1494 }
1495 if (!found)
1496 {
1497 file.m_Items.push_back(ignorePattern);
1498 ignorePattern += file.m_eol.IsEmpty() ? _T("\n") : file.m_eol;
1499 CStringA ignorePatternA = CUnicodeUtils::GetUTF8(ignorePattern);
1500 file.Write(ignorePatternA, ignorePatternA.GetLength());
1501 }
1502
1503 if (ignoreDlg.m_IgnoreFile == 1)
1504 file.Close();
1505 }
1506
1507 if (ignoreDlg.m_IgnoreFile != 1)
1508 file.Close();
1509 }
1510 catch(...)
1511 {
1512 file.Abort();
1513 return false;
1514 }
1515
1516 return true;
1517 }
1518 return false;
1519 }
1520
1521 static bool Reset(const CString& resetTo, int resetType)
1522 {
1523 CString cmd;
1524 CString type;
1525 switch (resetType)
1526 {
1527 case 0:
1528 type = _T("--soft");
1529 break;
1530 case 1:
1531 type = _T("--mixed");
1532 break;
1533 case 2:
1534 type = _T("--hard");
1535 break;
1536 default:
1537 resetType = 1;
1538 type = _T("--mixed");
1539 break;
1540 }
1541 cmd.Format(_T("git.exe reset %s %s --"), type, resetTo);
1542
1543 CProgressDlg progress;
1544 progress.m_GitCmd = cmd;
1545
1546 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
1547 {
1548 if (status)
1549 {
1550 postCmdList.push_back(PostCmd(IDI_REFRESH, IDS_MSGBOX_RETRY, [&]{ Reset(resetTo, resetType); }));
1551 return;
1552 }
1553
1554 CTGitPath gitPath = g_Git.m_CurrentDir;
1555 if (gitPath.HasSubmodules() && resetType == 2)
1556 {
1557 postCmdList.push_back(PostCmd(IDI_UPDATE, IDS_PROC_SUBMODULESUPDATE, [&]
1558 {
1559 CString sCmd;
1560 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
1561 CAppUtils::RunTortoiseGitProc(sCmd);
1562 }));
1563 }
1564 };
1565
1566 INT_PTR ret;
1567 if (g_Git.UsingLibGit2(CGit::GIT_CMD_RESET))
1568 {
1569 CGitProgressDlg gitdlg;
1570 ResetProgressCommand resetProgressCommand;
1571 gitdlg.SetCommand(&resetProgressCommand);
1572 resetProgressCommand.m_PostCmdCallback = progress.m_PostCmdCallback;
1573 resetProgressCommand.SetRevision(resetTo);
1574 resetProgressCommand.SetResetType(resetType);
1575 ret = gitdlg.DoModal();
1576 }
1577 else
1578 ret = progress.DoModal();
1579
1580 return ret == IDOK;
1581 }
1582
1583 bool CAppUtils::GitReset(const CString* CommitHash, int type)
1584 {
1585 CResetDlg dlg;
1586 dlg.m_ResetType=type;
1587 dlg.m_ResetToVersion=*CommitHash;
1588 dlg.m_initialRefName = *CommitHash;
1589 if (dlg.DoModal() == IDOK)
1590 return Reset(dlg.m_ResetToVersion, dlg.m_ResetType);
1591
1592 return false;
1593 }
1594
1595 void CAppUtils::DescribeConflictFile(bool mode, bool base,CString &descript)
1596 {
1597 if(mode == FALSE)
1598 {
1599 descript = CString(MAKEINTRESOURCE(IDS_SVNACTION_DELETE));
1600 return;
1601 }
1602 if(base)
1603 {
1604 descript = CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED));
1605 return;
1606 }
1607 descript = CString(MAKEINTRESOURCE(IDS_PROC_CREATED));
1608 return;
1609 }
1610
1611 void CAppUtils::RemoveTempMergeFile(const CTGitPath& path)
1612 {
1613 ::DeleteFile(CAppUtils::GetMergeTempFile(_T("LOCAL"), path));
1614 ::DeleteFile(CAppUtils::GetMergeTempFile(_T("REMOTE"), path));
1615 ::DeleteFile(CAppUtils::GetMergeTempFile(_T("BASE"), path));
1616 }
1617 CString CAppUtils::GetMergeTempFile(const CString& type, const CTGitPath &merge)
1618 {
1619 CString file;
1620 file = g_Git.CombinePath(merge.GetWinPathString() + _T(".") + type + merge.GetFileExtension());
1621
1622 return file;
1623 }
1624
1625 bool ParseHashesFromLsFile(const BYTE_VECTOR& out, CString& hash1, CString& hash2, CString& hash3)
1626 {
1627 int pos = 0;
1628 CString one;
1629 CString part;
1630
1631 while (pos >= 0 && pos < (int)out.size())
1632 {
1633 one.Empty();
1634
1635 g_Git.StringAppend(&one, &out[pos], CP_UTF8);
1636 int tabstart = 0;
1637 one.Tokenize(_T("\t"), tabstart);
1638
1639 tabstart = 0;
1640 part = one.Tokenize(_T(" "), tabstart); //Tag
1641 part = one.Tokenize(_T(" "), tabstart); //Mode
1642 part = one.Tokenize(_T(" "), tabstart); //Hash
1643 CString hash = part;
1644 part = one.Tokenize(_T("\t"), tabstart); //Stage
1645 int stage = _ttol(part);
1646 if (stage == 1)
1647 hash1 = hash;
1648 else if (stage == 2)
1649 hash2 = hash;
1650 else if (stage == 3)
1651 {
1652 hash3 = hash;
1653 return true;
1654 }
1655
1656 pos = out.findNextString(pos);
1657 }
1658
1659 return false;
1660 }
1661
1662 bool CAppUtils::ConflictEdit(const CTGitPath& path, bool /*bAlternativeTool = false*/, bool revertTheirMy /*= false*/, HWND resolveMsgHwnd /*= nullptr*/)
1663 {
1664 bool bRet = false;
1665
1666 CTGitPath merge=path;
1667 CTGitPath directory = merge.GetDirectory();
1668
1669 // we have the conflicted file (%merged)
1670 // now look for the other required files
1671 //GitStatus stat;
1672 //stat.GetStatus(merge);
1673 //if (stat.status == NULL)
1674 // return false;
1675
1676 BYTE_VECTOR vector;
1677
1678 CString cmd;
1679 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge.GetGitPathString());
1680
1681 if (g_Git.Run(cmd, &vector))
1682 {
1683 return FALSE;
1684 }
1685
1686 if (merge.IsDirectory())
1687 {
1688 CString baseHash, realBaseHash(GIT_REV_ZERO), localHash(GIT_REV_ZERO), remoteHash(GIT_REV_ZERO);
1689 if (merge.HasAdminDir()) {
1690 CGit subgit;
1691 subgit.m_CurrentDir = g_Git.CombinePath(merge);
1692 CGitHash hash;
1693 subgit.GetHash(hash, _T("HEAD"));
1694 baseHash = hash;
1695 }
1696 if (ParseHashesFromLsFile(vector, realBaseHash, localHash, remoteHash)) // in base no submodule, but in remote submodule
1697 baseHash = realBaseHash;
1698
1699 CGitDiff::ChangeType changeTypeMine = CGitDiff::Unknown;
1700 CGitDiff::ChangeType changeTypeTheirs = CGitDiff::Unknown;
1701
1702 bool baseOK = false, mineOK = false, theirsOK = false;
1703 CString baseSubject, mineSubject, theirsSubject;
1704 if (merge.HasAdminDir())
1705 {
1706 CGit subgit;
1707 subgit.m_CurrentDir = g_Git.CombinePath(merge);
1708 CGitDiff::GetSubmoduleChangeType(subgit, baseHash, localHash, baseOK, mineOK, changeTypeMine, baseSubject, mineSubject);
1709 CGitDiff::GetSubmoduleChangeType(subgit, baseHash, remoteHash, baseOK, theirsOK, changeTypeTheirs, baseSubject, theirsSubject);
1710 }
1711 else if (baseHash == GIT_REV_ZERO && localHash == GIT_REV_ZERO && remoteHash != GIT_REV_ZERO) // merge conflict with no submodule, but submodule in merged revision (not initialized)
1712 {
1713 changeTypeMine = CGitDiff::Identical;
1714 changeTypeTheirs = CGitDiff::NewSubmodule;
1715 baseSubject = _T("no submodule");
1716 mineSubject = baseSubject;
1717 theirsSubject = _T("not initialized");
1718 }
1719 else if (baseHash.IsEmpty() && localHash != GIT_REV_ZERO && remoteHash == GIT_REV_ZERO) // merge conflict with no submodule initialized, but submodule exists in base and folder with no submodule is merged
1720 {
1721 baseHash = localHash;
1722 baseSubject = _T("not initialized");
1723 mineSubject = baseSubject;
1724 theirsSubject = _T("not initialized");
1725 changeTypeMine = CGitDiff::Identical;
1726 changeTypeTheirs = CGitDiff::DeleteSubmodule;
1727 }
1728 else if (baseHash != GIT_REV_ZERO && localHash != GIT_REV_ZERO && remoteHash != GIT_REV_ZERO) // base has submodule, mine has submodule and theirs also, but not initialized
1729 {
1730 baseSubject = _T("not initialized");
1731 mineSubject = baseSubject;
1732 theirsSubject = baseSubject;
1733 if (baseHash == localHash)
1734 changeTypeMine = CGitDiff::Identical;
1735 }
1736 else
1737 return FALSE;
1738
1739 CSubmoduleResolveConflictDlg resolveSubmoduleConflictDialog;
1740 resolveSubmoduleConflictDialog.SetDiff(merge.GetGitPathString(), revertTheirMy, baseHash, baseSubject, baseOK, localHash, mineSubject, mineOK, changeTypeMine, remoteHash, theirsSubject, theirsOK, changeTypeTheirs);
1741 resolveSubmoduleConflictDialog.DoModal();
1742 if (resolveSubmoduleConflictDialog.m_bResolved && resolveMsgHwnd)
1743 {
1744 static UINT WM_REVERTMSG = RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
1745 ::PostMessage(resolveMsgHwnd, WM_REVERTMSG, NULL, NULL);
1746 }
1747
1748 return TRUE;
1749 }
1750
1751 CTGitPathList list;
1752 if (list.ParserFromLsFile(vector))
1753 {
1754 CMessageBox::Show(NULL, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK);
1755 return FALSE;
1756 }
1757
1758 if (list.IsEmpty())
1759 return FALSE;
1760
1761 CTGitPath theirs;
1762 CTGitPath mine;
1763 CTGitPath base;
1764
1765 if (revertTheirMy)
1766 {
1767 mine.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge));
1768 theirs.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge));
1769 }
1770 else
1771 {
1772 mine.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge));
1773 theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge));
1774 }
1775 base.SetFromGit(GetMergeTempFile(_T("BASE"),merge));
1776
1777 CString format;
1778
1779 //format=_T("git.exe cat-file blob \":%d:%s\"");
1780 format = _T("git.exe checkout-index --temp --stage=%d -- \"%s\"");
1781 CFile tempfile;
1782 //create a empty file, incase stage is not three
1783 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1784 tempfile.Close();
1785 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1786 tempfile.Close();
1787 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1788 tempfile.Close();
1789
1790 bool b_base=false, b_local=false, b_remote=false;
1791
1792 for (int i = 0; i< list.GetCount(); ++i)
1793 {
1794 CString cmd;
1795 CString outfile;
1796 cmd.Empty();
1797 outfile.Empty();
1798
1799 if( list[i].m_Stage == 1)
1800 {
1801 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1802 b_base = true;
1803 outfile = base.GetWinPathString();
1804
1805 }
1806 if( list[i].m_Stage == 2 )
1807 {
1808 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1809 b_local = true;
1810 outfile = mine.GetWinPathString();
1811
1812 }
1813 if( list[i].m_Stage == 3 )
1814 {
1815 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1816 b_remote = true;
1817 outfile = theirs.GetWinPathString();
1818 }
1819 CString output, err;
1820 if(!outfile.IsEmpty())
1821 if (!g_Git.Run(cmd, &output, &err, CP_UTF8))
1822 {
1823 CString file;
1824 int start =0 ;
1825 file = output.Tokenize(_T("\t"), start);
1826 ::MoveFileEx(file,outfile,MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED);
1827 }
1828 else
1829 {
1830 CMessageBox::Show(NULL, output + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
1831 }
1832 }
1833
1834 if(b_local && b_remote )
1835 {
1836 merge.SetFromWin(g_Git.CombinePath(merge));
1837 if( revertTheirMy )
1838 bRet = !!CAppUtils::StartExtMerge(base, mine, theirs, merge, _T("BASE"), _T("REMOTE"), _T("LOCAL"), CString(), false, resolveMsgHwnd, true);
1839 else
1840 bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge, _T("BASE"), _T("REMOTE"), _T("LOCAL"), CString(), false, resolveMsgHwnd, true);
1841
1842 }
1843 else
1844 {
1845 ::DeleteFile(mine.GetWinPathString());
1846 ::DeleteFile(theirs.GetWinPathString());
1847 ::DeleteFile(base.GetWinPathString());
1848
1849 CDeleteConflictDlg dlg;
1850 DescribeConflictFile(b_local, b_base,dlg.m_LocalStatus);
1851 DescribeConflictFile(b_remote,b_base,dlg.m_RemoteStatus);
1852 CGitHash localHash, remoteHash;
1853 if (!g_Git.GetHash(localHash, _T("HEAD")))
1854 dlg.m_LocalHash = localHash.ToString();
1855 if (!g_Git.GetHash(remoteHash, _T("MERGE_HEAD")))
1856 dlg.m_RemoteHash = remoteHash.ToString();
1857 else if (!g_Git.GetHash(remoteHash, _T("rebase-apply/original-commit")))
1858 dlg.m_RemoteHash = remoteHash.ToString();
1859 else if (!g_Git.GetHash(remoteHash, _T("CHERRY_PICK_HEAD")))
1860 dlg.m_RemoteHash = remoteHash.ToString();
1861 else if (!g_Git.GetHash(remoteHash, _T("REVERT_HEAD")))
1862 dlg.m_RemoteHash = remoteHash.ToString();
1863 dlg.m_bShowModifiedButton=b_base;
1864 dlg.m_File=merge.GetGitPathString();
1865 if(dlg.DoModal() == IDOK)
1866 {
1867 CString cmd,out;
1868 if(dlg.m_bIsDelete)
1869 {
1870 cmd.Format(_T("git.exe rm -- \"%s\""),merge.GetGitPathString());
1871 }
1872 else
1873 cmd.Format(_T("git.exe add -- \"%s\""),merge.GetGitPathString());
1874
1875 if (g_Git.Run(cmd, &out, CP_UTF8))
1876 {
1877 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
1878 return FALSE;
1879 }
1880 return TRUE;
1881 }
1882 else
1883 return FALSE;
1884 }
1885
1886 #if 0
1887 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1888 base, theirs, mine, merge);
1889 #endif
1890 #if 0
1891 if (stat.status->text_status == svn_wc_status_conflicted)
1892 {
1893 // we have a text conflict, use our merge tool to resolve the conflict
1894
1895 CTSVNPath theirs(directory);
1896 CTSVNPath mine(directory);
1897 CTSVNPath base(directory);
1898 bool bConflictData = false;
1899
1900 if ((stat.status->entry)&&(stat.status->entry->conflict_new))
1901 {
1902 theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));
1903 bConflictData = true;
1904 }
1905 if ((stat.status->entry)&&(stat.status->entry->conflict_old))
1906 {
1907 base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));
1908 bConflictData = true;
1909 }
1910 if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))
1911 {
1912 mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));
1913 bConflictData = true;
1914 }
1915 else
1916 {
1917 mine = merge;
1918 }
1919 if (bConflictData)
1920 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1921 base, theirs, mine, merge);
1922 }
1923
1924 if (stat.status->prop_status == svn_wc_status_conflicted)
1925 {
1926 // we have a property conflict
1927 CTSVNPath prej(directory);
1928 if ((stat.status->entry)&&(stat.status->entry->prejfile))
1929 {
1930 prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));
1931 // there's a problem: the prej file contains a _description_ of the conflict, and
1932 // that description string might be translated. That means we have no way of parsing
1933 // the file to find out the conflicting values.
1934 // The only thing we can do: show a dialog with the conflict description, then
1935 // let the user either accept the existing property or open the property edit dialog
1936 // to manually change the properties and values. And a button to mark the conflict as
1937 // resolved.
1938 CEditPropConflictDlg dlg;
1939 dlg.SetPrejFile(prej);
1940 dlg.SetConflictedItem(merge);
1941 bRet = (dlg.DoModal() != IDCANCEL);
1942 }
1943 }
1944
1945 if (stat.status->tree_conflict)
1946 {
1947 // we have a tree conflict
1948 SVNInfo info;
1949 const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());
1950 if (pInfoData)
1951 {
1952 if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)
1953 {
1954 CTSVNPath theirs(directory);
1955 CTSVNPath mine(directory);
1956 CTSVNPath base(directory);
1957 bool bConflictData = false;
1958
1959 if (pInfoData->treeconflict_theirfile)
1960 {
1961 theirs.AppendPathString(pInfoData->treeconflict_theirfile);
1962 bConflictData = true;
1963 }
1964 if (pInfoData->treeconflict_basefile)
1965 {
1966 base.AppendPathString(pInfoData->treeconflict_basefile);
1967 bConflictData = true;
1968 }
1969 if (pInfoData->treeconflict_myfile)
1970 {
1971 mine.AppendPathString(pInfoData->treeconflict_myfile);
1972 bConflictData = true;
1973 }
1974 else
1975 {
1976 mine = merge;
1977 }
1978 if (bConflictData)
1979 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1980 base, theirs, mine, merge);
1981 }
1982 else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)
1983 {
1984 CString sConflictAction;
1985 CString sConflictReason;
1986 CString sResolveTheirs;
1987 CString sResolveMine;
1988 CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);
1989 CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();
1990
1991 if (pInfoData->treeconflict_nodekind == svn_node_file)
1992 {
1993 switch (pInfoData->treeconflict_operation)
1994 {
1995 case svn_wc_operation_update:
1996 switch (pInfoData->treeconflict_action)
1997 {
1998 case svn_wc_conflict_action_edit:
1999 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);
2000 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2001 break;
2002 case svn_wc_conflict_action_add:
2003 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);
2004 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2005 break;
2006 case svn_wc_conflict_action_delete:
2007 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);
2008 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
2009 break;
2010 }
2011 break;
2012 case svn_wc_operation_switch:
2013 switch (pInfoData->treeconflict_action)
2014 {
2015 case svn_wc_conflict_action_edit:
2016 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);
2017 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2018 break;
2019 case svn_wc_conflict_action_add:
2020 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);
2021 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2022 break;
2023 case svn_wc_conflict_action_delete:
2024 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);
2025 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
2026 break;
2027 }
2028 break;
2029 case svn_wc_operation_merge:
2030 switch (pInfoData->treeconflict_action)
2031 {
2032 case svn_wc_conflict_action_edit:
2033 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);
2034 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2035 break;
2036 case svn_wc_conflict_action_add:
2037 sResolveTheirs.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);
2038 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
2039 break;
2040 case svn_wc_conflict_action_delete:
2041 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);
2042 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
2043 break;
2044 }
2045 break;
2046 }
2047 }
2048 else if (pInfoData->treeconflict_nodekind == svn_node_dir)
2049 {
2050 switch (pInfoData->treeconflict_operation)
2051 {
2052 case svn_wc_operation_update:
2053 switch (pInfoData->treeconflict_action)
2054 {
2055 case svn_wc_conflict_action_edit:
2056 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);
2057 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2058 break;
2059 case svn_wc_conflict_action_add:
2060 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);
2061 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2062 break;
2063 case svn_wc_conflict_action_delete:
2064 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);
2065 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
2066 break;
2067 }
2068 break;
2069 case svn_wc_operation_switch:
2070 switch (pInfoData->treeconflict_action)
2071 {
2072 case svn_wc_conflict_action_edit:
2073 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);
2074 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2075 break;
2076 case svn_wc_conflict_action_add:
2077 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);
2078 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2079 break;
2080 case svn_wc_conflict_action_delete:
2081 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);
2082 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
2083 break;
2084 }
2085 break;
2086 case svn_wc_operation_merge:
2087 switch (pInfoData->treeconflict_action)
2088 {
2089 case svn_wc_conflict_action_edit:
2090 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);
2091 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2092 break;
2093 case svn_wc_conflict_action_add:
2094 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);
2095 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
2096 break;
2097 case svn_wc_conflict_action_delete:
2098 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);
2099 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
2100 break;
2101 }
2102 break;
2103 }
2104 }
2105
2106 UINT uReasonID = 0;
2107 switch (pInfoData->treeconflict_reason)
2108 {
2109 case svn_wc_conflict_reason_edited:
2110 uReasonID = IDS_TREECONFLICT_REASON_EDITED;
2111 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
2112 break;
2113 case svn_wc_conflict_reason_obstructed:
2114 uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;
2115 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
2116 break;
2117 case svn_wc_conflict_reason_deleted:
2118 uReasonID = IDS_TREECONFLICT_REASON_DELETED;
2119 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
2120 break;
2121 case svn_wc_conflict_reason_added:
2122 uReasonID = IDS_TREECONFLICT_REASON_ADDED;
2123 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
2124 break;
2125 case svn_wc_conflict_reason_missing:
2126 uReasonID = IDS_TREECONFLICT_REASON_MISSING;
2127 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
2128 break;
2129 case svn_wc_conflict_reason_unversioned:
2130 uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;
2131 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
2132 break;
2133 }
2134 sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);
2135
2136 CTreeConflictEditorDlg dlg;
2137 dlg.SetConflictInfoText(sConflictReason);
2138 dlg.SetResolveTexts(sResolveTheirs, sResolveMine);
2139 dlg.SetPath(treeConflictPath);
2140 INT_PTR dlgRet = dlg.DoModal();
2141 bRet = (dlgRet != IDCANCEL);
2142 }
2143 }
2144 }
2145 #endif
2146 return bRet;
2147 }
2148
2149 bool CAppUtils::IsSSHPutty()
2150 {
2151 CString sshclient=g_Git.m_Environment.GetEnv(_T("GIT_SSH"));
2152 sshclient=sshclient.MakeLower();
2153 if(sshclient.Find(_T("plink.exe"),0)>=0)
2154 {
2155 return true;
2156 }
2157 return false;
2158 }
2159
2160 CString CAppUtils::GetClipboardLink(const CString &skipGitPrefix, int paramsCount)
2161 {
2162 if (!OpenClipboard(NULL))
2163 return CString();
2164
2165 CString sClipboardText;
2166 HGLOBAL hglb = GetClipboardData(CF_TEXT);
2167 if (hglb)
2168 {
2169 LPCSTR lpstr = (LPCSTR)GlobalLock(hglb);
2170 sClipboardText = CString(lpstr);
2171 GlobalUnlock(hglb);
2172 }
2173 hglb = GetClipboardData(CF_UNICODETEXT);
2174 if (hglb)
2175 {
2176 LPCTSTR lpstr = (LPCTSTR)GlobalLock(hglb);
2177 sClipboardText = lpstr;
2178 GlobalUnlock(hglb);
2179 }
2180 CloseClipboard();
2181
2182 if(!sClipboardText.IsEmpty())
2183 {
2184 if(sClipboardText[0] == _T('\"') && sClipboardText[sClipboardText.GetLength()-1] == _T('\"'))
2185 sClipboardText=sClipboardText.Mid(1,sClipboardText.GetLength()-2);
2186
2187 if(sClipboardText.Find( _T("http://")) == 0)
2188 return sClipboardText;
2189
2190 if(sClipboardText.Find( _T("https://")) == 0)
2191 return sClipboardText;
2192
2193 if(sClipboardText.Find( _T("git://")) == 0)
2194 return sClipboardText;
2195
2196 if(sClipboardText.Find( _T("ssh://")) == 0)
2197 return sClipboardText;
2198
2199 if (sClipboardText.Find(_T("git@")) == 0)
2200 return sClipboardText;
2201
2202 if(sClipboardText.GetLength()>=2)
2203 if( sClipboardText[1] == _T(':') )
2204 if( (sClipboardText[0] >= 'A' && sClipboardText[0] <= 'Z')
2205 || (sClipboardText[0] >= 'a' && sClipboardText[0] <= 'z') )
2206 return sClipboardText;
2207
2208 // trim prefixes like "git clone "
2209 if (!skipGitPrefix.IsEmpty() && sClipboardText.Find(skipGitPrefix) == 0)
2210 {
2211 sClipboardText = sClipboardText.Mid(skipGitPrefix.GetLength()).Trim();
2212 int spacePos = -1;
2213 while (paramsCount >= 0)
2214 {
2215 --paramsCount;
2216 spacePos = sClipboardText.Find(_T(' '), spacePos + 1);
2217 if (spacePos == -1)
2218 break;
2219 }
2220 if (spacePos > 0 && paramsCount < 0)
2221 sClipboardText = sClipboardText.Left(spacePos);
2222 return sClipboardText;
2223 }
2224 }
2225
2226 return CString(_T(""));
2227 }
2228
2229 CString CAppUtils::ChooseRepository(const CString* path)
2230 {
2231 CBrowseFolder browseFolder;
2232 CRegString regLastResopitory = CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\LastRepo"),_T(""));
2233
2234 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
2235 CString strCloneDirectory;
2236 if(path)
2237 strCloneDirectory=*path;
2238 else
2239 {
2240 strCloneDirectory = regLastResopitory;
2241 }
2242
2243 CString title;
2244 title.LoadString(IDS_CHOOSE_REPOSITORY);
2245
2246 browseFolder.SetInfo(title);
2247
2248 if (browseFolder.Show(NULL, strCloneDirectory) == CBrowseFolder::OK)
2249 {
2250 regLastResopitory = strCloneDirectory;
2251 return strCloneDirectory;
2252 }
2253 else
2254 {
2255 return CString();
2256 }
2257 }
2258
2259 bool CAppUtils::SendPatchMail(CTGitPathList& list, bool bIsMainWnd)
2260 {
2261 CSendMailDlg dlg;
2262
2263 dlg.m_PathList = list;
2264
2265 if(dlg.DoModal()==IDOK)
2266 {
2267 if (dlg.m_PathList.IsEmpty())
2268 return FALSE;
2269
2270 CGitProgressDlg progDlg;
2271 if (bIsMainWnd)
2272 theApp.m_pMainWnd = &progDlg;
2273 SendMailProgressCommand sendMailProgressCommand;
2274 progDlg.SetCommand(&sendMailProgressCommand);
2275
2276 sendMailProgressCommand.SetPathList(dlg.m_PathList);
2277 progDlg.SetItemCount(dlg.m_PathList.GetCount());
2278
2279 CSendMailPatch sendMailPatch(dlg.m_To, dlg.m_CC, dlg.m_Subject, !!dlg.m_bAttachment, !!dlg.m_bCombine);
2280 sendMailProgressCommand.SetSendMailOption(&sendMailPatch);
2281
2282 progDlg.DoModal();
2283
2284 return true;
2285 }
2286 return false;
2287 }
2288
2289 bool CAppUtils::SendPatchMail(const CString& cmd, const CString& formatpatchoutput, bool bIsMainWnd)
2290 {
2291 CTGitPathList list;
2292 CString log=formatpatchoutput;
2293 int start=log.Find(cmd);
2294 if(start >=0)
2295 CString one=log.Tokenize(_T("\n"),start);
2296 else
2297 start = 0;
2298
2299 while(start>=0)
2300 {
2301 CString one=log.Tokenize(_T("\n"),start);
2302 one=one.Trim();
2303 if(one.IsEmpty() || one.Find(_T("Success")) == 0)
2304 continue;
2305 one.Replace(_T('/'),_T('\\'));
2306 CTGitPath path;
2307 path.SetFromWin(one);
2308 list.AddPath(path);
2309 }
2310 if (!list.IsEmpty())
2311 {
2312 return SendPatchMail(list, bIsMainWnd);
2313 }
2314 else
2315 {
2316 CMessageBox::Show(NULL, IDS_ERR_NOPATCHES, IDS_APPNAME, MB_ICONINFORMATION);
2317 return true;
2318 }
2319 }
2320
2321
2322 int CAppUtils::GetLogOutputEncode(CGit *pGit)
2323 {
2324 CString output;
2325 output = pGit->GetConfigValue(_T("i18n.logOutputEncoding"));
2326 if(output.IsEmpty())
2327 return CUnicodeUtils::GetCPCode(pGit->GetConfigValue(_T("i18n.commitencoding")));
2328 else
2329 {
2330 return CUnicodeUtils::GetCPCode(output);
2331 }
2332 }
2333 int CAppUtils::SaveCommitUnicodeFile(const CString& filename, CString &message)
2334 {
2335 try
2336 {
2337 CFile file(filename, CFile::modeReadWrite | CFile::modeCreate);
2338 int cp = CUnicodeUtils::GetCPCode(g_Git.GetConfigValue(_T("i18n.commitencoding")));
2339
2340 bool stripComments = (CRegDWORD(_T("Software\\TortoiseGit\\StripCommentedLines"), FALSE) == TRUE);
2341
2342 if (CRegDWORD(_T("Software\\TortoiseGit\\SanitizeCommitMsg"), TRUE) == TRUE)
2343 message.TrimRight(L" \r\n");
2344
2345 int len = message.GetLength();
2346 int start = 0;
2347 while (start >= 0 && start < len)
2348 {
2349 int oldStart = start;
2350 start = message.Find(L"\n", oldStart);
2351 CString line = message.Mid(oldStart);
2352 if (start != -1)
2353 {
2354 line = line.Left(start - oldStart);
2355 ++start; // move forward so we don't find the same char again
2356 }
2357 if (stripComments && (line.GetLength() >= 1 && line.GetAt(0) == '#') || (start < 0 && line.IsEmpty()))
2358 continue;
2359 line.TrimRight(L" \r");
2360 CStringA lineA = CUnicodeUtils::GetMulti(line + L"\n", cp);
2361 file.Write(lineA.GetBuffer(), lineA.GetLength());
2362 }
2363 file.Close();
2364 return 0;
2365 }
2366 catch (CFileException *e)
2367 {
2368 e->Delete();
2369 return -1;
2370 }
2371 }
2372
2373 bool CAppUtils::Pull(bool showPush, bool showStashPop)
2374 {
2375 CPullFetchDlg dlg;
2376 dlg.m_IsPull = TRUE;
2377 if (dlg.DoModal() == IDOK)
2378 {
2379 // "git.exe pull --rebase" is not supported, never and ever. So, adapting it to Fetch & Rebase.
2380 if (dlg.m_bRebase)
2381 return DoFetch(dlg.m_RemoteURL,
2382 FALSE, // Fetch all remotes
2383 dlg.m_bAutoLoad == BST_CHECKED,
2384 dlg.m_bPrune,
2385 dlg.m_bDepth == BST_CHECKED,
2386 dlg.m_nDepth,
2387 dlg.m_bFetchTags,
2388 dlg.m_RemoteBranchName,
2389 TRUE); // Rebase after fetching
2390
2391 CString url = dlg.m_RemoteURL;
2392
2393 if (dlg.m_bAutoLoad)
2394 {
2395 CAppUtils::LaunchPAgent(NULL, &dlg.m_RemoteURL);
2396 }
2397
2398 CString cmd;
2399 CGitHash hashOld;
2400 if (g_Git.GetHash(hashOld, _T("HEAD")))
2401 {
2402 MessageBox(NULL, g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
2403 return false;
2404 }
2405
2406 CString cmdRebase;
2407 CString noff;
2408 CString ffonly;
2409 CString squash;
2410 CString nocommit;
2411 CString depth;
2412 CString notags;
2413 CString prune;
2414
2415 if (!dlg.m_bFetchTags)
2416 notags = _T("--no-tags ");
2417
2418 if (dlg.m_bFetchTags == TRUE)
2419 notags = _T("--tags ");
2420
2421 if (dlg.m_bNoFF)
2422 noff=_T("--no-ff ");
2423
2424 if (dlg.m_bFFonly)
2425 ffonly = _T("--ff-only ");
2426
2427 if (dlg.m_bSquash)
2428 squash = _T("--squash ");
2429
2430 if (dlg.m_bNoCommit)
2431 nocommit = _T("--no-commit ");
2432
2433 if (dlg.m_bDepth)
2434 depth.Format(_T("--depth %d "), dlg.m_nDepth);
2435
2436 int ver = CAppUtils::GetMsysgitVersion();
2437
2438 if (dlg.m_bPrune == TRUE)
2439 prune = _T("--prune ");
2440 else if (dlg.m_bPrune == FALSE && ver >= 0x01080500)
2441 prune = _T("--no-prune ");
2442
2443 if(ver >= 0x01070203) //above 1.7.0.2
2444 cmdRebase += _T("--progress ");
2445
2446 cmd.Format(_T("git.exe pull -v --no-rebase %s%s%s%s%s%s%s%s\"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, depth, notags, prune, url, dlg.m_RemoteBranchName);
2447 CProgressDlg progress;
2448 progress.m_GitCmd = cmd;
2449
2450 CGitHash hashNew; // declare outside lambda, because it is captured by reference
2451 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
2452 {
2453 if (status)
2454 {
2455 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUPULL, [&]{ Pull(); }));
2456 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUSTASHSAVE, [&]{ StashSave(_T(""), true); }));
2457 return;
2458 }
2459
2460 if (showStashPop)
2461 postCmdList.push_back(PostCmd(IDI_RELOCATE, IDS_MENUSTASHPOP, []{ StashPop(); }));
2462
2463 if (g_Git.GetHash(hashNew, _T("HEAD")))
2464 MessageBox(nullptr, g_Git.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR);
2465 else
2466 {
2467 postCmdList.push_back(PostCmd(IDI_DIFF, IDS_PROC_PULL_DIFFS, [&]
2468 {
2469 CFileDiffDlg dlg;
2470 dlg.SetDiff(NULL, hashNew.ToString(), hashOld.ToString());
2471 dlg.DoModal();
2472 }));
2473 postCmdList.push_back(PostCmd(IDI_LOG, IDS_PROC_PULL_LOG, [&]
2474 {
2475 CLogDlg dlg;
2476 dlg.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), hashOld.ToString() + _T("..") + hashNew.ToString(), 0);
2477 dlg.DoModal();
2478 }));
2479 }
2480
2481 if (showPush)
2482 postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, []{ Push(_T("")); }));
2483
2484 CTGitPath gitPath = g_Git.m_CurrentDir;
2485 if (gitPath.HasSubmodules())
2486 {
2487 postCmdList.push_back(PostCmd(IDI_UPDATE, IDS_PROC_SUBMODULESUPDATE, []
2488 {
2489 CString sCmd;
2490 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
2491 CAppUtils::RunTortoiseGitProc(sCmd);
2492 }));
2493 }
2494 };
2495
2496 INT_PTR ret = progress.DoModal();
2497
2498 if (ret == IDOK && progress.m_GitStatus == 1 && progress.m_LogText.Find(_T("CONFLICT")) >= 0 && CMessageBox::Show(NULL, IDS_SEECHANGES, IDS_APPNAME, MB_YESNO | MB_ICONINFORMATION) == IDYES)
2499 {
2500 CChangedDlg dlg;
2501 dlg.m_pathList.AddPath(CTGitPath());
2502 dlg.DoModal();
2503
2504 return true;
2505 }
2506
2507 return ret == IDOK;
2508 }
2509
2510 return false;
2511 }
2512
2513 bool CAppUtils::RebaseAfterFetch(const CString& upstream)
2514 {
2515 while (true)
2516 {
2517 CRebaseDlg dlg;
2518 if (!upstream.IsEmpty())
2519 dlg.m_Upstream = upstream;
2520 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
2521 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENUDESSENDMAIL)));
2522 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE)));
2523 INT_PTR response = dlg.DoModal();
2524 if (response == IDOK)
2525 {
2526 return true;
2527 }
2528 else if (response == IDC_REBASE_POST_BUTTON)
2529 {
2530 CString cmd = _T("/command:log");
2531 cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
2532 CAppUtils::RunTortoiseGitProc(cmd);
2533 return true;
2534 }
2535 else if (response == IDC_REBASE_POST_BUTTON + 1)
2536 {
2537 CString cmd, out, err;
2538 cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
2539 g_Git.m_CurrentDir,
2540 g_Git.FixBranchName(dlg.m_Upstream),
2541 g_Git.FixBranchName(dlg.m_Branch));
2542 if (g_Git.Run(cmd, &out, &err, CP_UTF8))
2543 {
2544 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2545 return false;
2546 }
2547 CAppUtils::SendPatchMail(cmd, out);
2548 return true;
2549 }
2550 else if (response == IDC_REBASE_POST_BUTTON + 2)
2551 continue;
2552 else if (response == IDCANCEL)
2553 return false;
2554 return false;
2555 }
2556 }
2557
2558 static bool DoFetch(const CString& url, const bool fetchAllRemotes, const bool loadPuttyAgent, const int prune, const bool bDepth, const int nDepth, const int fetchTags, const CString& remoteBranch, boolean runRebase)
2559 {
2560 if (loadPuttyAgent)
2561 {
2562 if (fetchAllRemotes)
2563 {
2564 STRING_VECTOR list;
2565 g_Git.GetRemoteList(list);
2566
2567 STRING_VECTOR::const_iterator it = list.begin();
2568 while (it != list.end())
2569 {
2570 CString remote(*it);
2571 CAppUtils::LaunchPAgent(NULL, &remote);
2572 ++it;
2573 }
2574 }
2575 else
2576 CAppUtils::LaunchPAgent(NULL, &url);
2577 }
2578
2579 CString cmd, arg;
2580 int ver = CAppUtils::GetMsysgitVersion();
2581 if (ver >= 0x01070203) //above 1.7.0.2
2582 arg += _T(" --progress");
2583
2584 if (bDepth)
2585 arg.AppendFormat(_T(" --depth %d"), nDepth);
2586
2587 if (prune == TRUE)
2588 arg += _T(" --prune");
2589 else if (prune == FALSE && ver >= 0x01080500)
2590 arg += _T(" --no-prune");
2591
2592 if (fetchTags == 1)
2593 arg += _T(" --tags");
2594 else if (fetchTags == 0)
2595 arg += _T(" --no-tags");
2596
2597 if (fetchAllRemotes)
2598 cmd.Format(_T("git.exe fetch --all -v%s"), arg);
2599 else
2600 cmd.Format(_T("git.exe fetch -v%s \"%s\" %s"), arg, url, remoteBranch);
2601
2602 CProgressDlg progress;
2603 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
2604 {
2605 if (status)
2606 {
2607 postCmdList.push_back(PostCmd(IDI_REFRESH, IDS_MSGBOX_RETRY, [&]{ DoFetch(url, fetchAllRemotes, loadPuttyAgent, prune, bDepth, nDepth, fetchTags, remoteBranch, runRebase); }));
2608 return;
2609 }
2610
2611 postCmdList.push_back(PostCmd(IDI_LOG, IDS_MENULOG, []
2612 {
2613 CString cmd = _T("/command:log");
2614 cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
2615 CAppUtils::RunTortoiseGitProc(cmd);
2616 }));
2617
2618 postCmdList.push_back(PostCmd(IDI_REVERT, IDS_PROC_RESET, []
2619 {
2620 CString pullRemote, pullBranch;
2621 g_Git.GetRemoteTrackedBranchForHEAD(pullRemote, pullBranch);
2622 CString defaultUpstream;
2623 if (!pullRemote.IsEmpty() && !pullBranch.IsEmpty())
2624 defaultUpstream.Format(_T("remotes/%s/%s"), pullRemote, pullBranch);
2625 CAppUtils::GitReset(&defaultUpstream, 2);
2626 }));
2627
2628 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUFETCH, []{ CAppUtils::Fetch(); }));
2629
2630 if (!runRebase && !g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir))
2631 postCmdList.push_back(PostCmd(IDI_REBASE, IDS_MENUREBASE, [&]{ runRebase = false; CAppUtils::RebaseAfterFetch(); }));
2632 };
2633
2634 progress.m_GitCmd = cmd;
2635 INT_PTR userResponse;
2636
2637 if (g_Git.UsingLibGit2(CGit::GIT_CMD_FETCH))
2638 {
2639 CGitProgressDlg gitdlg;
2640 FetchProgressCommand fetchProgressCommand;
2641 if (!fetchAllRemotes)
2642 fetchProgressCommand.SetUrl(url);
2643 gitdlg.SetCommand(&fetchProgressCommand);
2644 fetchProgressCommand.m_PostCmdCallback = progress.m_PostCmdCallback;
2645 fetchProgressCommand.SetAutoTag(fetchTags == 1 ? GIT_REMOTE_DOWNLOAD_TAGS_ALL : fetchTags == 2 ? GIT_REMOTE_DOWNLOAD_TAGS_AUTO : GIT_REMOTE_DOWNLOAD_TAGS_NONE);
2646 if (!fetchAllRemotes)
2647 fetchProgressCommand.SetRefSpec(remoteBranch);
2648 userResponse = gitdlg.DoModal();
2649 return userResponse == IDOK;
2650 }
2651
2652 userResponse = progress.DoModal();
2653 if (!progress.m_GitStatus)
2654 {
2655 if (runRebase)
2656 return CAppUtils::RebaseAfterFetch();
2657 }
2658
2659 return userResponse == IDOK;
2660 }
2661
2662 bool CAppUtils::Fetch(const CString& remoteName, bool allRemotes)
2663 {
2664 CPullFetchDlg dlg;
2665 dlg.m_PreSelectRemote = remoteName;
2666 dlg.m_IsPull=FALSE;
2667 dlg.m_bAllRemotes = allRemotes;
2668
2669 if(dlg.DoModal()==IDOK)
2670 return DoFetch(dlg.m_RemoteURL, dlg.m_bAllRemotes == BST_CHECKED, dlg.m_bAutoLoad == BST_CHECKED, dlg.m_bPrune, dlg.m_bDepth == BST_CHECKED, dlg.m_nDepth, dlg.m_bFetchTags, dlg.m_RemoteBranchName, dlg.m_bRebase == BST_CHECKED);
2671
2672 return false;
2673 }
2674
2675 bool CAppUtils::Push(const CString& selectLocalBranch)
2676 {
2677 CPushDlg dlg;
2678 dlg.m_BranchSourceName = selectLocalBranch;
2679
2680 if (dlg.DoModal() == IDOK)
2681 {
2682 CString error;
2683 DWORD exitcode = 0xFFFFFFFF;
2684 if (CHooks::Instance().PrePush(g_Git.m_CurrentDir, exitcode, error))
2685 {
2686 if (exitcode)
2687 {
2688 CString temp;
2689 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2690 CMessageBox::Show(nullptr, temp, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2691 return false;
2692 }
2693 }
2694
2695 CString arg;
2696
2697 if(dlg.m_bPack)
2698 arg += _T("--thin ");
2699 if(dlg.m_bTags && !dlg.m_bPushAllBranches)
2700 arg += _T("--tags ");
2701 if(dlg.m_bForce)
2702 arg += _T("--force ");
2703 if (dlg.m_bForceWithLease)
2704 arg += _T("--force-with-lease ");
2705 if (dlg.m_bSetUpstream)
2706 arg += _T("--set-upstream ");
2707 if (dlg.m_RecurseSubmodules == 1)
2708 arg += _T("--recurse-submodules=check ");
2709 if (dlg.m_RecurseSubmodules == 2)
2710 arg += _T("--recurse-submodules=on-demand ");
2711
2712 int ver = CAppUtils::GetMsysgitVersion();
2713
2714 if(ver >= 0x01070203) //above 1.7.0.2
2715 arg += _T("--progress ");
2716
2717 CProgressDlg progress;
2718
2719 STRING_VECTOR remotesList;
2720 if (dlg.m_bPushAllRemotes)
2721 g_Git.GetRemoteList(remotesList);
2722 else
2723 remotesList.push_back(dlg.m_URL);
2724
2725 for (unsigned int i = 0; i < remotesList.size(); ++i)
2726 {
2727 if (dlg.m_bAutoLoad)
2728 CAppUtils::LaunchPAgent(NULL, &remotesList[i]);
2729
2730 CString cmd;
2731 if (dlg.m_bPushAllBranches)
2732 {
2733 cmd.Format(_T("git.exe push --all %s \"%s\""),
2734 arg,
2735 remotesList[i]);
2736
2737 if (dlg.m_bTags)
2738 {
2739 progress.m_GitCmdList.push_back(cmd);
2740 cmd.Format(_T("git.exe push --tags %s \"%s\""), arg, remotesList[i]);
2741 }
2742 }
2743 else
2744 {
2745 cmd.Format(_T("git.exe push %s \"%s\" %s"),
2746 arg,
2747 remotesList[i],
2748 dlg.m_BranchSourceName);
2749 if (!dlg.m_BranchRemoteName.IsEmpty())
2750 {
2751 cmd += _T(":") + dlg.m_BranchRemoteName;
2752 }
2753 }
2754 progress.m_GitCmdList.push_back(cmd);
2755 }
2756
2757 CString superprojectRoot;
2758 g_GitAdminDir.HasAdminDir(g_Git.m_CurrentDir, false, &superprojectRoot);
2759 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
2760 {
2761 // need to execute hooks as those might be needed by post action commands
2762 DWORD exitcode = 0xFFFFFFFF;
2763 CString error;
2764 if (CHooks::Instance().PostPush(g_Git.m_CurrentDir, exitcode, error))
2765 {
2766 if (exitcode)
2767 {
2768 CString temp;
2769 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2770 MessageBox(nullptr, temp, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2771 }
2772 }
2773
2774 if (status)
2775 {
2776 bool rejected = progress.GetLogText().Find(_T("! [rejected]")) > 0;
2777 if (rejected)
2778 {
2779 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUPULL, []{ Pull(true); }));
2780 postCmdList.push_back(PostCmd(IDI_PULL, IDS_MENUFETCH, [&]{ Fetch(dlg.m_bPushAllRemotes ? _T("") : dlg.m_URL, !!dlg.m_bPushAllRemotes); }));
2781 }
2782 postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, [&]{ Push(selectLocalBranch); }));
2783 return;
2784 }
2785
2786 postCmdList.push_back(PostCmd(IDS_PROC_REQUESTPULL, [&]{ RequestPull(dlg.m_BranchRemoteName); }));
2787 postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, [&]{ Push(selectLocalBranch); }));
2788 postCmdList.push_back(PostCmd(IDI_SWITCH, IDS_MENUSWITCH, [&]{ Switch(); }));
2789 if (!superprojectRoot.IsEmpty())
2790 {
2791 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_PROC_COMMIT_SUPERPROJECT, [&]
2792 {
2793 CString sCmd;
2794 sCmd.Format(_T("/command:commit /path:\"%s\""), superprojectRoot);
2795 RunTortoiseGitProc(sCmd);
2796 }));
2797 }
2798 };
2799
2800 INT_PTR ret = progress.DoModal();
2801 return ret == IDOK;
2802 }
2803 return FALSE;
2804 }
2805
2806 bool CAppUtils::RequestPull(const CString& endrevision, const CString& repositoryUrl, bool bIsMainWnd)
2807 {
2808 CRequestPullDlg dlg;
2809 dlg.m_RepositoryURL = repositoryUrl;
2810 dlg.m_EndRevision = endrevision;
2811 if (dlg.DoModal()==IDOK)
2812 {
2813 CString cmd;
2814 cmd.Format(_T("git.exe request-pull %s \"%s\" %s"), dlg.m_StartRevision, dlg.m_RepositoryURL, dlg.m_EndRevision);
2815
2816 CSysProgressDlg sysProgressDlg;
2817 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
2818 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_CREATINGPULLREUQEST)));
2819 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
2820 sysProgressDlg.SetShowProgressBar(false);
2821 sysProgressDlg.ShowModeless((HWND)NULL, true);
2822
2823 CString tempFileName = GetTempFile();
2824 CString err;
2825 DeleteFile(tempFileName);
2826 CreateDirectory(tempFileName, NULL);
2827 tempFileName += _T("\\pullrequest.txt");
2828 if (g_Git.RunLogFile(cmd, tempFileName, &err))
2829 {
2830 CString msg;
2831 msg.LoadString(IDS_ERR_PULLREUQESTFAILED);
2832 CMessageBox::Show(NULL, msg + _T("\n") + err, _T("TortoiseGit"), MB_OK);
2833 return false;
2834 }
2835
2836 if (sysProgressDlg.HasUserCancelled())
2837 {
2838 CMessageBox::Show(NULL, IDS_SVN_USERCANCELLED, IDS_APPNAME, MB_OK);
2839 ::DeleteFile(tempFileName);
2840 return false;
2841 }
2842
2843 sysProgressDlg.Stop();
2844
2845 if (dlg.m_bSendMail)
2846 {
2847 CSendMailDlg dlg;
2848 dlg.m_PathList = CTGitPathList(CTGitPath(tempFileName));
2849 dlg.m_bCustomSubject = true;
2850
2851 if (dlg.DoModal() == IDOK)
2852 {
2853 if (dlg.m_PathList.IsEmpty())
2854 return FALSE;
2855
2856 CGitProgressDlg progDlg;
2857 if (bIsMainWnd)
2858 theApp.m_pMainWnd = &progDlg;
2859 SendMailProgressCommand sendMailProgressCommand;
2860 progDlg.SetCommand(&sendMailProgressCommand);
2861
2862 sendMailProgressCommand.SetPathList(dlg.m_PathList);
2863 progDlg.SetItemCount(dlg.m_PathList.GetCount());
2864
2865 CSendMailCombineable sendMailCombineable(dlg.m_To, dlg.m_CC, dlg.m_Subject, !!dlg.m_bAttachment, !!dlg.m_bCombine);
2866 sendMailProgressCommand.SetSendMailOption(&sendMailCombineable);
2867
2868 progDlg.DoModal();
2869
2870 return true;
2871 }
2872 return false;
2873 }
2874
2875 CAppUtils::LaunchAlternativeEditor(tempFileName);
2876 }
2877 return true;
2878 }
2879
2880 bool CAppUtils::CreateMultipleDirectory(const CString& szPath)
2881 {
2882 CString strDir(szPath);
2883 if (strDir.GetAt(strDir.GetLength()-1)!=_T('\\'))
2884 {
2885 strDir.AppendChar(_T('\\'));
2886 }
2887 std::vector<CString> vPath;
2888 CString strTemp;
2889 bool bSuccess = false;
2890
2891 for (int i=0;i<strDir.GetLength();++i)
2892 {
2893 if (strDir.GetAt(i) != _T('\\'))
2894 {
2895 strTemp.AppendChar(strDir.GetAt(i));
2896 }
2897 else
2898 {
2899 vPath.push_back(strTemp);
2900 strTemp.AppendChar(_T('\\'));
2901 }
2902 }
2903
2904 for (auto vIter = vPath.begin(); vIter != vPath.end(); ++vIter)
2905 {
2906 bSuccess = CreateDirectory(*vIter, NULL) ? true : false;
2907 }
2908
2909 return bSuccess;
2910 }
2911
2912 void CAppUtils::RemoveTrailSlash(CString &path)
2913 {
2914 if(path.IsEmpty())
2915 return ;
2916
2917 // For URL, do not trim the slash just after the host name component.
2918 int index = path.Find(_T("://"));
2919 if (index >= 0)
2920 {
2921 index += 4;
2922 index = path.Find(_T('/'), index);
2923 if (index == path.GetLength() - 1)
2924 return;
2925 }
2926
2927 while(path[path.GetLength()-1] == _T('\\') || path[path.GetLength()-1] == _T('/' ) )
2928 {
2929 path=path.Left(path.GetLength()-1);
2930 if(path.IsEmpty())
2931 return;
2932 }
2933 }
2934
2935 bool CAppUtils::CheckUserData()
2936 {
2937 while(g_Git.GetUserName().IsEmpty() || g_Git.GetUserEmail().IsEmpty())
2938 {
2939 if(CMessageBox::Show(NULL, IDS_PROC_NOUSERDATA, IDS_APPNAME, MB_YESNO| MB_ICONERROR) == IDYES)
2940 {
2941 CTGitPath path(g_Git.m_CurrentDir);
2942 CSettings dlg(IDS_PROC_SETTINGS_TITLE,&path);
2943 dlg.SetTreeViewMode(TRUE, TRUE, TRUE);
2944 dlg.SetTreeWidth(220);
2945 dlg.m_DefaultPage = _T("gitconfig");
2946
2947 dlg.DoModal();
2948 dlg.HandleRestart();
2949
2950 }
2951 else
2952 return false;
2953 }
2954
2955 return true;
2956 }
2957
2958 BOOL CAppUtils::Commit(const CString& bugid, BOOL bWholeProject, CString &sLogMsg,
2959 CTGitPathList &pathList,
2960 CTGitPathList &selectedList,
2961 bool bSelectFilesForCommit)
2962 {
2963 bool bFailed = true;
2964
2965 if (!CheckUserData())
2966 return false;
2967
2968 while (bFailed)
2969 {
2970 bFailed = false;
2971 CCommitDlg dlg;
2972 dlg.m_sBugID = bugid;
2973
2974 dlg.m_bWholeProject = bWholeProject;
2975
2976 dlg.m_sLogMessage = sLogMsg;
2977 dlg.m_pathList = pathList;
2978 dlg.m_checkedPathList = selectedList;
2979 dlg.m_bSelectFilesForCommit = bSelectFilesForCommit;
2980 if (dlg.DoModal() == IDOK)
2981 {
2982 if (dlg.m_pathList.IsEmpty())
2983 return false;
2984 // if the user hasn't changed the list of selected items
2985 // we don't use that list. Because if we would use the list
2986 // of pre-checked items, the dialog would show different
2987 // checked items on the next startup: it would only try
2988 // to check the parent folder (which might not even show)
2989 // instead, we simply use an empty list and let the
2990 // default checking do its job.
2991 if (!dlg.m_pathList.IsEqual(pathList))
2992 selectedList = dlg.m_pathList;
2993 pathList = dlg.m_updatedPathList;
2994 sLogMsg = dlg.m_sLogMessage;
2995 bSelectFilesForCommit = true;
2996
2997 switch (dlg.m_PostCmd)
2998 {
2999 case GIT_POSTCOMMIT_CMD_DCOMMIT:
3000 CAppUtils::SVNDCommit();
3001 break;
3002 case GIT_POSTCOMMIT_CMD_PUSH:
3003 CAppUtils::Push();
3004 break;
3005 case GIT_POSTCOMMIT_CMD_CREATETAG:
3006 CAppUtils::CreateBranchTag(TRUE);
3007 break;
3008 case GIT_POSTCOMMIT_CMD_PULL:
3009 CAppUtils::Pull(true);
3010 break;
3011 default:
3012 break;
3013 }
3014
3015 // CGitProgressDlg progDlg;
3016 // progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);
3017 // if (parser.HasVal(_T("closeonend")))
3018 // progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
3019 // progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);
3020 // progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);
3021 // progDlg.SetPathList(dlg.m_pathList);
3022 // progDlg.SetCommitMessage(dlg.m_sLogMessage);
3023 // progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);
3024 // progDlg.SetSelectedList(dlg.m_selectedPathList);
3025 // progDlg.SetItemCount(dlg.m_itemsCount);
3026 // progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);
3027 // progDlg.DoModal();
3028 // CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
3029 // err = (DWORD)progDlg.DidErrorsOccur();
3030 // bFailed = progDlg.DidErrorsOccur();
3031 // bRet = progDlg.DidErrorsOccur();
3032 // CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);
3033 // if (DWORD(bFailRepeat)==0)
3034 // bFailed = false; // do not repeat if the user chose not to in the settings.
3035 }
3036 }
3037 return true;
3038 }
3039
3040
3041 BOOL CAppUtils::SVNDCommit()
3042 {
3043 CSVNDCommitDlg dcommitdlg;
3044 CString gitSetting = g_Git.GetConfigValue(_T("svn.rmdir"));
3045 if (gitSetting == _T("")) {
3046 if (dcommitdlg.DoModal() != IDOK)
3047 {
3048 return false;
3049 }
3050 else
3051 {
3052 if (dcommitdlg.m_remember)
3053 {
3054 if (dcommitdlg.m_rmdir)
3055 {
3056 gitSetting = _T("true");
3057 }
3058 else
3059 {
3060 gitSetting = _T("false");
3061 }
3062 if(g_Git.SetConfigValue(_T("svn.rmdir"),gitSetting))
3063 {
3064 CString msg;
3065 msg.Format(IDS_PROC_SAVECONFIGFAILED, _T("svn.rmdir"), gitSetting);
3066 CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3067 }
3068 }
3069 }
3070 }
3071
3072 BOOL IsStash = false;
3073 if(!g_Git.CheckCleanWorkTree())
3074 {
3075 if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
3076 {
3077 CSysProgressDlg sysProgressDlg;
3078 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
3079 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
3080 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
3081 sysProgressDlg.SetShowProgressBar(false);
3082 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
3083 sysProgressDlg.ShowModeless((HWND)NULL, true);
3084
3085 CString cmd,out;
3086 cmd=_T("git.exe stash");
3087 if (g_Git.Run(cmd, &out, CP_UTF8))
3088 {
3089 sysProgressDlg.Stop();
3090 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
3091 return false;
3092 }
3093 sysProgressDlg.Stop();
3094
3095 IsStash =true;
3096 }
3097 else
3098 {
3099 return false;
3100 }
3101 }
3102
3103 CProgressDlg progress;
3104 if (dcommitdlg.m_rmdir)
3105 {
3106 progress.m_GitCmd=_T("git.exe svn dcommit --rmdir");
3107 }
3108 else
3109 {
3110 progress.m_GitCmd=_T("git.exe svn dcommit");
3111 }
3112 if(progress.DoModal()==IDOK && progress.m_GitStatus == 0)
3113 {
3114 ::DeleteFile(g_Git.m_CurrentDir + _T("\\sys$command"));
3115 if( IsStash)
3116 {
3117 if(CMessageBox::Show(NULL,IDS_DCOMMIT_STASH_POP,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
3118 {
3119 CSysProgressDlg sysProgressDlg;
3120 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
3121 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
3122 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
3123 sysProgressDlg.SetShowProgressBar(false);
3124 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
3125 sysProgressDlg.ShowModeless((HWND)NULL, true);
3126
3127 CString cmd,out;
3128 cmd=_T("git.exe stash pop");
3129 if (g_Git.Run(cmd, &out, CP_UTF8))
3130 {
3131 sysProgressDlg.Stop();
3132 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
3133 return false;
3134 }
3135 sysProgressDlg.Stop();
3136 }
3137 else
3138 {
3139 return false;
3140 }
3141 }
3142 return TRUE;
3143 }
3144 return FALSE;
3145 }
3146
3147 BOOL CAppUtils::Merge(const CString* commit, bool showStashPop)
3148 {
3149 if (!CheckUserData())
3150 return FALSE;
3151
3152 CMergeDlg dlg;
3153 if(commit)
3154 dlg.m_initialRefName = *commit;
3155
3156 if(dlg.DoModal()==IDOK)
3157 {
3158 CString cmd;
3159 CString args;
3160
3161 if(dlg.m_bNoFF)
3162 args += _T(" --no-ff");
3163
3164 if(dlg.m_bSquash)
3165 args += _T(" --squash");
3166
3167 if(dlg.m_bNoCommit)
3168 args += _T(" --no-commit");
3169
3170 if (dlg.m_bLog)
3171 {
3172 CString fmt;
3173 fmt.Format(_T(" --log=%d"), dlg.m_nLog);
3174 args += fmt;
3175 }
3176
3177 if (!dlg.m_MergeStrategy.IsEmpty())
3178 {
3179 args += _T(" --strategy=") + dlg.m_MergeStrategy;
3180 if (!dlg.m_StrategyOption.IsEmpty())
3181 {
3182 args += _T(" --strategy-option=") + dlg.m_StrategyOption;
3183 if (!dlg.m_StrategyParam.IsEmpty())
3184 args += _T("=") + dlg.m_StrategyParam;
3185 }
3186 }
3187
3188 if(!dlg.m_strLogMesage.IsEmpty())
3189 {
3190 CString logmsg = dlg.m_strLogMesage;
3191 logmsg.Replace(_T("\""), _T("\\\""));
3192 args += _T(" -m \"") + logmsg + _T("\"");
3193 }
3194 cmd.Format(_T("git.exe merge %s %s"), args, g_Git.FixBranchName(dlg.m_VersionName));
3195
3196 CProgressDlg Prodlg;
3197 Prodlg.m_GitCmd = cmd;
3198
3199 Prodlg.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
3200 {
3201 if (status)
3202 {
3203 CTGitPathList list;
3204 if (!g_Git.ListConflictFile(list) && !list.IsEmpty())
3205 {
3206 // there are conflict files
3207
3208 postCmdList.push_back(PostCmd(IDI_RESOLVE, IDS_PROGRS_CMD_RESOLVE, []
3209 {
3210 CString sCmd;
3211 sCmd.Format(_T("/command:commit /path:\"%s\""), g_Git.m_CurrentDir);
3212 CAppUtils::RunTortoiseGitProc(sCmd);
3213 }));
3214 }
3215
3216 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUSTASHSAVE, [&]{ CAppUtils::StashSave(_T(""), false, false, true, g_Git.FixBranchName(dlg.m_VersionName)); }));
3217 return;
3218 }
3219
3220 if (showStashPop)
3221 postCmdList.push_back(PostCmd(IDI_RELOCATE, IDS_MENUSTASHPOP, []{ StashPop(); }));
3222
3223 if (dlg.m_bNoCommit)
3224 {
3225 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUCOMMIT, []
3226 {
3227 CString sCmd;
3228 sCmd.Format(_T("/command:commit /path:\"%s\""), g_Git.m_CurrentDir);
3229 CAppUtils::RunTortoiseGitProc(sCmd);
3230 }));
3231 return;
3232 }
3233
3234 if (dlg.m_bIsBranch && dlg.m_VersionName.Find(L"remotes/") == -1) // do not ask to remove remote branches
3235 {
3236 postCmdList.push_back(PostCmd(IDI_DELETE, IDS_PROC_REMOVEBRANCH, [&]
3237 {
3238 CString msg;
3239 msg.Format(IDS_PROC_DELETEBRANCHTAG, dlg.m_VersionName);
3240 if (CMessageBox::Show(nullptr, msg, _T("TortoiseGit"), 2, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
3241 {
3242 CString cmd, out;
3243 cmd.Format(_T("git.exe branch -D -- %s"), dlg.m_VersionName);
3244 if (g_Git.Run(cmd, &out, CP_UTF8))
3245 MessageBox(nullptr, out, _T("TortoiseGit"), MB_OK);
3246 }
3247 }));
3248 }
3249 if (dlg.m_bIsBranch)
3250 postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, []{ Push(); }));
3251
3252 BOOL hasGitSVN = CTGitPath(g_Git.m_CurrentDir).GetAdminDirMask() & ITEMIS_GITSVN;
3253 if (hasGitSVN)
3254 postCmdList.push_back(PostCmd(IDI_COMMIT, IDS_MENUSVNDCOMMIT, []{ SVNDCommit(); }));
3255 };
3256
3257 Prodlg.DoModal();
3258 return !Prodlg.m_GitStatus;
3259 }
3260 return false;
3261 }
3262
3263 BOOL CAppUtils::MergeAbort()
3264 {
3265 CMergeAbortDlg dlg;
3266 if (dlg.DoModal() == IDOK)
3267 return Reset(_T("HEAD"), dlg.m_ResetType + 1);
3268
3269 return FALSE;
3270 }
3271
3272 void CAppUtils::EditNote(GitRev *rev)
3273 {
3274 if (!CheckUserData())
3275 return;
3276
3277 CInputDlg dlg;
3278 dlg.m_sHintText = CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES));
3279 dlg.m_sInputText = rev->m_Notes;
3280 dlg.m_sTitle = CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES));
3281 //dlg.m_pProjectProperties = &m_ProjectProperties;
3282 dlg.m_bUseLogWidth = true;
3283 if(dlg.DoModal() == IDOK)
3284 {
3285 CString cmd,output;
3286 cmd=_T("notes add -f -F \"");
3287
3288 CString tempfile=::GetTempFile();
3289 if (CAppUtils::SaveCommitUnicodeFile(tempfile, dlg.m_sInputText))
3290 {
3291 CMessageBox::Show(nullptr, IDS_PROC_FAILEDSAVINGNOTES, IDS_APPNAME, MB_OK | MB_ICONERROR);
3292 return;
3293 }
3294 cmd += tempfile;
3295 cmd += _T("\" ");
3296 cmd += rev->m_CommitHash.ToString();
3297
3298 try
3299 {
3300 if (git_run_cmd("notes", CUnicodeUtils::GetMulti(cmd, CP_UTF8).GetBuffer()))
3301 {
3302 CMessageBox::Show(NULL, IDS_PROC_FAILEDSAVINGNOTES, IDS_APPNAME, MB_OK | MB_ICONERROR);
3303
3304 }
3305 else
3306 {
3307 rev->m_Notes = dlg.m_sInputText;
3308 }
3309 }catch(...)
3310 {
3311 CMessageBox::Show(NULL, IDS_PROC_FAILEDSAVINGNOTES, IDS_APPNAME, MB_OK | MB_ICONERROR);
3312 }
3313 ::DeleteFile(tempfile);
3314
3315 }
3316 }
3317
3318 int CAppUtils::GetMsysgitVersion()
3319 {
3320 if (g_Git.ms_LastMsysGitVersion)
3321 return g_Git.ms_LastMsysGitVersion;
3322
3323 CString cmd;
3324 CString versiondebug;
3325 CString version;
3326
3327 CRegDWORD regTime = CRegDWORD(_T("Software\\TortoiseGit\\git_file_time"));
3328 CRegDWORD regVersion = CRegDWORD(_T("Software\\TortoiseGit\\git_cached_version"));
3329
3330 CString gitpath = CGit::ms_LastMsysGitDir+_T("\\git.exe");
3331
3332 __int64 time=0;
3333 if (!g_Git.GetFileModifyTime(gitpath, &time))
3334 {
3335 if((DWORD)time == regTime)
3336 {
3337 g_Git.ms_LastMsysGitVersion = regVersion;
3338 return regVersion;
3339 }
3340 }
3341
3342 CString err;
3343 cmd = _T("git.exe --version");
3344 if (g_Git.Run(cmd, &version, &err, CP_UTF8))
3345 {
3346 CMessageBox::Show(NULL, _T("git.exe not correctly set up (") + err + _T(")\nCheck TortoiseGit settings and consult help file for \"Git.exe Path\"."), _T("TortoiseGit"), MB_OK|MB_ICONERROR);
3347 return -1;
3348 }
3349
3350 int start=0;
3351 int ver = 0;
3352
3353 versiondebug = version;
3354
3355 try
3356 {
3357 CString str=version.Tokenize(_T("."), start);
3358 int space = str.ReverseFind(_T(' '));
3359 str = str.Mid(space+1,start);
3360 ver = _ttol(str);
3361 ver <<=24;
3362
3363 version = version.Mid(start);
3364 start = 0;
3365
3366 str = version.Tokenize(_T("."), start);
3367
3368 ver |= (_ttol(str) & 0xFF) << 16;
3369
3370 str = version.Tokenize(_T("."), start);
3371 ver |= (_ttol(str) & 0xFF) << 8;
3372
3373 str = version.Tokenize(_T("."), start);
3374 ver |= (_ttol(str) & 0xFF);
3375 }
3376 catch(...)
3377 {
3378 if (!ver)
3379 {
3380 CMessageBox::Show(NULL, _T("Could not parse git.exe version number: \"") + versiondebug + _T("\""), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3381 return -1;
3382 }
3383 }
3384
3385 regTime = time&0xFFFFFFFF;
3386 regVersion = ver;
3387 g_Git.ms_LastMsysGitVersion = ver;
3388
3389 return ver;
3390 }
3391
3392 void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd)
3393 {
3394 typedef HRESULT (WINAPI *SHGPSFW) (HWND hwnd,REFIID riid,void** ppv);
3395
3396 CAutoLibrary hShell = AtlLoadSystemLibraryUsingFullPath(_T("Shell32.dll"));
3397
3398 if (hShell.IsValid()) {
3399 SHGPSFW pfnSHGPSFW = (SHGPSFW)::GetProcAddress(hShell, "SHGetPropertyStoreForWindow");
3400 if (pfnSHGPSFW) {
3401 IPropertyStore *pps;
3402 HRESULT hr = pfnSHGPSFW(hWnd, IID_PPV_ARGS(&pps));
3403 if (SUCCEEDED(hr)) {
3404 PROPVARIANT var;
3405 var.vt = VT_BOOL;
3406 var.boolVal = VARIANT_TRUE;
3407 pps->SetValue(PKEY_AppUserModel_PreventPinning, var);
3408 pps->Release();
3409 }
3410 }
3411 }
3412 }
3413
3414 void CAppUtils::SetWindowTitle(HWND hWnd, const CString& urlorpath, const CString& dialogname)
3415 {
3416 ASSERT(dialogname.GetLength() < 70);
3417 ASSERT(urlorpath.GetLength() < MAX_PATH);
3418 WCHAR pathbuf[MAX_PATH] = {0};
3419
3420 PathCompactPathEx(pathbuf, urlorpath, 70 - dialogname.GetLength(), 0);
3421
3422 wcscat_s(pathbuf, L" - ");
3423 wcscat_s(pathbuf, dialogname);
3424 wcscat_s(pathbuf, L" - ");
3425 wcscat_s(pathbuf, CString(MAKEINTRESOURCE(IDS_APPNAME)));
3426 SetWindowText(hWnd, pathbuf);
3427 }
3428
3429 bool CAppUtils::BisectStart(const CString& lastGood, const CString& firstBad, bool bIsMainWnd)
3430 {
3431 if (!g_Git.CheckCleanWorkTree())
3432 {
3433 if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
3434 {
3435 CSysProgressDlg sysProgressDlg;
3436 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
3437 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
3438 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
3439 sysProgressDlg.SetShowProgressBar(false);
3440 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
3441 sysProgressDlg.ShowModeless((HWND)NULL, true);
3442
3443 CString cmd, out;
3444 cmd = _T("git.exe stash");
3445 if (g_Git.Run(cmd, &out, CP_UTF8))
3446 {
3447 sysProgressDlg.Stop();
3448 CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK);
3449 return false;
3450 }
3451 sysProgressDlg.Stop();
3452 }
3453 else
3454 return false;
3455 }
3456
3457 CBisectStartDlg bisectStartDlg;
3458
3459 if (!lastGood.IsEmpty())
3460 bisectStartDlg.m_sLastGood = lastGood;
3461 if (!firstBad.IsEmpty())
3462 bisectStartDlg.m_sFirstBad = firstBad;
3463
3464 if (bisectStartDlg.DoModal() == IDOK)
3465 {
3466 CProgressDlg progress;
3467 if (bIsMainWnd)
3468 theApp.m_pMainWnd = &progress;
3469 progress.m_GitCmdList.push_back(_T("git.exe bisect start"));
3470 progress.m_GitCmdList.push_back(_T("git.exe bisect good ") + bisectStartDlg.m_LastGoodRevision);
3471 progress.m_GitCmdList.push_back(_T("git.exe bisect bad ") + bisectStartDlg.m_FirstBadRevision);
3472
3473 progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
3474 {
3475 if (status)
3476 return;
3477
3478 CTGitPath path(g_Git.m_CurrentDir);
3479 if (path.HasSubmodules())
3480 {
3481 postCmdList.push_back(PostCmd(IDI_UPDATE, IDS_PROC_SUBMODULESUPDATE, []
3482 {
3483 CString sCmd;
3484 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
3485 CAppUtils::RunTortoiseGitProc(sCmd);
3486 }));
3487 }
3488 };
3489
3490
3491
3492 INT_PTR ret = progress.DoModal();
3493 return ret == IDOK;
3494 }
3495
3496 return false;
3497 }
3498
3499 int CAppUtils::Git2GetUserPassword(git_cred **out, const char *url, const char *username_from_url, unsigned int /*allowed_types*/, void * /*payload*/)
3500 {
3501 CUserPassword dlg;
3502 dlg.m_URL = CUnicodeUtils::GetUnicode(url, CP_UTF8);
3503 if (username_from_url)
3504 dlg.m_UserName = CUnicodeUtils::GetUnicode(username_from_url, CP_UTF8);
3505
3506 CStringA username, password;
3507 if (dlg.DoModal() == IDOK)
3508 {
3509 username = CUnicodeUtils::GetMulti(dlg.m_UserName, CP_UTF8);
3510 password = CUnicodeUtils::GetMulti(dlg.m_Password, CP_UTF8);
3511 return git_cred_userpass_plaintext_new(out, username, password);
3512 }
3513 giterr_set_str(GITERR_NONE, "User cancelled.");
3514 return GIT_EUSER;
3515 }
3516
3517 int CAppUtils::Git2CertificateCheck(git_cert* base_cert, int /*valid*/, const char* host, void* /*payload*/)
3518 {
3519 if (base_cert->cert_type == GIT_CERT_X509)
3520 {
3521 git_cert_x509* cert = (git_cert_x509*)base_cert;
3522
3523 if (last_accepted_cert.cmp(cert))
3524 return 0;
3525
3526 PCCERT_CONTEXT pServerCert = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, (BYTE*)cert->data, (DWORD)cert->len);
3527
3528 DWORD verificationError = VerifyServerCertificate(pServerCert, CUnicodeUtils::GetUnicode(host).GetBuffer(), 0);
3529 if (!verificationError)
3530 {
3531 last_accepted_cert.set(cert);
3532 CertFreeCertificateContext(pServerCert);
3533 return 0;
3534 }
3535
3536 CString servernameInCert;
3537 CertGetNameString(pServerCert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, nullptr, servernameInCert.GetBuffer(128), 128);
3538 servernameInCert.ReleaseBuffer();
3539
3540 CString issuer;
3541 CertGetNameString(pServerCert, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, nullptr, issuer.GetBuffer(128), 128);
3542 issuer.ReleaseBuffer();
3543
3544 CertFreeCertificateContext(pServerCert);
3545
3546 CCheckCertificateDlg dlg;
3547 dlg.cert = cert;
3548 dlg.m_sCertificateCN = servernameInCert;
3549 dlg.m_sCertificateIssuer = issuer;
3550 dlg.m_sHostname = CUnicodeUtils::GetUnicode(host);
3551 dlg.m_sError = CFormatMessageWrapper(verificationError);
3552 if (dlg.DoModal() == IDOK)
3553 {
3554 last_accepted_cert.set(cert);
3555 return 0;
3556 }
3557 }
3558 return GIT_ECERTIFICATE;
3559 }
3560
3561 void CAppUtils::ExploreTo(HWND hwnd, CString path)
3562 {
3563 if (PathFileExists(path))
3564 {
3565 ITEMIDLIST __unaligned * pidl = ILCreateFromPath(path);
3566 if (pidl)
3567 {
3568 SHOpenFolderAndSelectItems(pidl, 0, 0, 0);
3569 ILFree(pidl);
3570 }
3571 return;
3572 }
3573 // if filepath does not exist any more, navigate to closest matching folder
3574 do
3575 {
3576 int pos = path.ReverseFind(_T('\\'));
3577 if (pos <= 3)
3578 break;
3579 path = path.Left(pos);
3580 } while (!PathFileExists(path));
3581 ShellExecute(hwnd, _T("explore"), path, nullptr, nullptr, SW_SHOW);
3582 }
3583
3584 int CAppUtils::ResolveConflict(CTGitPath& path, resolve_with resolveWith)
3585 {
3586 bool b_local = false, b_remote = false;
3587 BYTE_VECTOR vector;
3588 {
3589 CString cmd;
3590 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""), path.GetGitPathString());
3591 if (g_Git.Run(cmd, &vector))
3592 {
3593 CMessageBox::Show(nullptr, _T("git ls-files failed!"), _T("TortoiseGit"), MB_OK);
3594 return -1;
3595 }
3596
3597 CTGitPathList list;
3598 if (list.ParserFromLsFile(vector))
3599 {
3600 CMessageBox::Show(nullptr, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK);
3601 return -1;
3602 }
3603
3604 if (list.IsEmpty())
3605 return 0;
3606 for (int i = 0; i < list.GetCount(); ++i)
3607 {
3608 if (list[i].m_Stage == 2)
3609 b_local = true;
3610 if (list[i].m_Stage == 3)
3611 b_remote = true;
3612 }
3613 }
3614
3615 CBlockCacheForPath block(g_Git.m_CurrentDir);
3616 if (path.IsDirectory()) // is submodule conflict
3617 {
3618 CString err = _T("We're sorry, but you hit a very rare conflict condition with a submodule which cannot be resolved by TortoiseGit. You have to use the command line git for this.");
3619 if (b_local && b_remote)
3620 {
3621 if (!path.HasAdminDir()) // check if submodule is initialized
3622 {
3623 err += _T("\n\nYou have to checkout the submodule manually into \"") + path.GetGitPathString() + _T("\" and then reset HEAD to the right commit (see resolve submodule conflict dialog for this).");
3624 MessageBox(nullptr, err, _T("TortoiseGit"), MB_ICONERROR);
3625 return -1;
3626 }
3627 CGit subgit;
3628 subgit.m_CurrentDir = g_Git.CombinePath(path);
3629 CGitHash submoduleHead;
3630 if (subgit.GetHash(submoduleHead, _T("HEAD")))
3631 {
3632 MessageBox(nullptr, err, _T("TortoiseGit"), MB_ICONERROR);
3633 return -1;
3634 }
3635 CString baseHash, localHash, remoteHash;
3636 ParseHashesFromLsFile(vector, baseHash, localHash, remoteHash);
3637 if (resolveWith == RESOLVE_WITH_THEIRS && submoduleHead.ToString() != remoteHash)
3638 {
3639 CString origPath = g_Git.m_CurrentDir;
3640 g_Git.m_CurrentDir = g_Git.CombinePath(path);
3641 if (!GitReset(&remoteHash))
3642 {
3643 g_Git.m_CurrentDir = origPath;
3644 return -1;
3645 }
3646 g_Git.m_CurrentDir = origPath;
3647 }
3648 else if (resolveWith == RESOLVE_WITH_MINE && submoduleHead.ToString() != localHash)
3649 {
3650 CString origPath = g_Git.m_CurrentDir;
3651 g_Git.m_CurrentDir = g_Git.CombinePath(path);
3652 if (!GitReset(&localHash))
3653 {
3654 g_Git.m_CurrentDir = origPath;
3655 return -1;
3656 }
3657 g_Git.m_CurrentDir = origPath;
3658 }
3659 }
3660 else
3661 {
3662 MessageBox(nullptr, err, _T("TortoiseGit"), MB_ICONERROR);
3663 return -1;
3664 }
3665 }
3666
3667 if (resolveWith == RESOLVE_WITH_THEIRS)
3668 {
3669 CString gitcmd, output;
3670 if (b_local && b_remote)
3671 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""), path.GetGitPathString());
3672 else if (b_remote)
3673 gitcmd.Format(_T("git.exe add -f -- \"%s\""), path.GetGitPathString());
3674 else if (b_local)
3675 gitcmd.Format(_T("git.exe rm -f -- \"%s\""), path.GetGitPathString());
3676 if (g_Git.Run(gitcmd, &output, CP_UTF8))
3677 {
3678 CMessageBox::Show(nullptr, output, _T("TortoiseGit"), MB_ICONERROR);
3679 return -1;
3680 }
3681 }
3682 else if (resolveWith == RESOLVE_WITH_MINE)
3683 {
3684 CString gitcmd, output;
3685 if (b_local && b_remote)
3686 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""), path.GetGitPathString());
3687 else if (b_local)
3688 gitcmd.Format(_T("git.exe add -f -- \"%s\""), path.GetGitPathString());
3689 else if (b_remote)
3690 gitcmd.Format(_T("git.exe rm -f -- \"%s\""), path.GetGitPathString());
3691 if (g_Git.Run(gitcmd, &output, CP_UTF8))
3692 {
3693 CMessageBox::Show(nullptr, output, _T("TortoiseGit"), MB_ICONERROR);
3694 return -1;
3695 }
3696 }
3697
3698 if (b_local && b_remote && path.m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3699 {
3700 CString gitcmd, output;
3701 gitcmd.Format(_T("git.exe add -f -- \"%s\""), path.GetGitPathString());
3702 if (g_Git.Run(gitcmd, &output, CP_UTF8))
3703 CMessageBox::Show(nullptr, output, _T("TortoiseGit"), MB_ICONERROR);
3704 else
3705 {
3706 path.m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
3707 path.m_Action &= ~CTGitPath::LOGACTIONS_UNMERGED;
3708 }
3709 }
3710
3711 RemoveTempMergeFile(path);
3712 return 0;
3713 }
3714
3715 bool CAppUtils::ShellOpen(const CString& file, HWND hwnd /*= nullptr */)
3716 {
3717 if ((int)ShellExecute(hwnd, NULL, file, NULL, NULL, SW_SHOW) > HINSTANCE_ERROR)
3718 return true;
3719
3720 return ShowOpenWithDialog(file, hwnd);
3721 }
3722
3723 bool CAppUtils::ShowOpenWithDialog(const CString& file, HWND hwnd /*= nullptr */)
3724 {
3725 CAutoLibrary hShell = AtlLoadSystemLibraryUsingFullPath(_T("shell32.dll"));
3726 if (hShell)
3727 {
3728 typedef HRESULT STDAPICALLTYPE SHOpenWithDialoFN(_In_opt_ HWND hwndParent, _In_ const OPENASINFO *poainfo);
3729 SHOpenWithDialoFN *pfnSHOpenWithDialog = (SHOpenWithDialoFN*)GetProcAddress(hShell, "SHOpenWithDialog");
3730 if (pfnSHOpenWithDialog)
3731 {
3732 OPENASINFO oi = { 0 };
3733 oi.pcszFile = file;
3734 oi.oaifInFlags = OAIF_EXEC;
3735 return SUCCEEDED(pfnSHOpenWithDialog(hwnd, &oi));
3736 }
3737 }
3738 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
3739 cmd += file;
3740 return CAppUtils::LaunchApplication(cmd, NULL, false);
3741 }
Windows Explorer Extension to Operate Git