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