?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fixed issue #1542: Can send pull request email
[TortoiseGit.git] / src / TortoiseProc / AppUtils.cpp
blobf1163d21bd1bcc4e77d1085e2c2178b75ae98ec5
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2003-2011 - 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 "resource.h"
22 #include "TortoiseProc.h"
23 #include "PathUtils.h"
24 #include "AppUtils.h"
25 //#include "GitProperties.h"
26 #include "StringUtils.h"
27 #include "MessageBox.h"
28 #include "registry.h"
29 #include "TGitPath.h"
30 #include "Git.h"
31 //#include "RepositoryBrowser.h"
32 //#include "BrowseFolder.h"
33 #include "UnicodeUtils.h"
34 #include "ExportDlg.h"
35 #include "ProgressDlg.h"
36 #include "GitAdminDir.h"
37 #include "ProgressDlg.h"
38 #include "BrowseFolder.h"
39 #include "DirFileEnum.h"
40 #include "MessageBox.h"
41 #include "GitStatus.h"
42 #include "CreateBranchTagDlg.h"
43 #include "GitSwitchDlg.h"
44 #include "ResetDlg.h"
45 #include "DeleteConflictDlg.h"
46 #include "ChangedDlg.h"
47 #include "SendMailDlg.h"
48 #include "GITProgressDlg.h"
49 #include "PushDlg.h"
50 #include "CommitDlg.h"
51 #include "MergeDlg.h"
52 #include "hooks.h"
53 #include "..\Settings\Settings.h"
54 #include "InputDlg.h"
55 #include "SVNDCommitDlg.h"
56 #include "requestpulldlg.h"
57 #include "PullFetchDlg.h"
58 #include "RebaseDlg.h"
59 #include "PropKey.h"
60 #include "StashSave.h"
61 #include "IgnoreDlg.h"
62 #include "FormatMessageWrapper.h"
63 #include "SmartHandle.h"
64 #include "BisectStartDlg.h"
65 #include "SysProgressDlg.h"
66 #include "UserPassword.h"
67 #include "Patch.h"
68
69 CAppUtils::CAppUtils(void)
70 {
71 }
72
73 CAppUtils::~CAppUtils(void)
74 {
75 }
76
77 bool CAppUtils::StashSave()
78 {
79 CStashSaveDlg dlg;
80
81 if (dlg.DoModal() == IDOK)
82 {
83 CString cmd, out;
84 cmd = _T("git.exe stash save");
85
86 if (CAppUtils::GetMsysgitVersion() >= 0x01070700)
87 {
88 if (dlg.m_bIncludeUntracked)
89 cmd += _T(" --include-untracked");
90 else if (dlg.m_bAll)
91 cmd += _T(" --all");
92 }
93
94 if (!dlg.m_sMessage.IsEmpty())
95 {
96 CString message = dlg.m_sMessage;
97 message.Replace(_T("\""), _T("\"\""));
98 cmd += _T(" \"") + message + _T("\"");
99 }
100
101 CSysProgressDlg sysProgressDlg;
102 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
103 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
104 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
105 sysProgressDlg.SetShowProgressBar(false);
106 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
107 sysProgressDlg.ShowModeless((HWND)NULL, true);
108
109 if (g_Git.Run(cmd, &out, CP_UTF8))
110 {
111 sysProgressDlg.Stop();
112 CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
113 }
114 else
115 {
116 sysProgressDlg.Stop();
117 CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHSUCCESS)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
118 return true;
119 }
120 }
121 return false;
122 }
123
124 bool CAppUtils::StashApply(CString ref, bool showChanges /* true */)
125 {
126 CString cmd,out;
127 cmd = _T("git.exe stash apply ");
128 if (ref.Find(_T("refs/")) == 0)
129 ref = ref.Mid(5);
130 if (ref.Find(_T("stash{")) == 0)
131 ref = _T("stash@") + ref.Mid(5);
132 cmd += ref;
133
134 CSysProgressDlg sysProgressDlg;
135 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
136 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
137 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
138 sysProgressDlg.SetShowProgressBar(false);
139 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
140 sysProgressDlg.ShowModeless((HWND)NULL, true);
141
142 int ret = g_Git.Run(cmd, &out, CP_UTF8);
143
144 sysProgressDlg.Stop();
145
146 bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0);
147 if (ret && !(ret == 1 && hasConflicts))
148 {
149 CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHAPPLYFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
150 }
151 else
152 {
153 CString message;
154 message.LoadString(IDS_PROC_STASHAPPLYSUCCESS);
155 if (hasConflicts)
156 message.LoadString(IDS_PROC_STASHAPPLYFAILEDCONFLICTS);
157 if (showChanges)
158 {
159 if(CMessageBox::Show(NULL,message + _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES))
160 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
161 {
162 CChangedDlg dlg;
163 dlg.m_pathList.AddPath(CTGitPath());
164 dlg.DoModal();
165 }
166 return true;
167 }
168 else
169 {
170 CMessageBox::Show(NULL, message ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
171 return true;
172 }
173 }
174 return false;
175 }
176
177 bool CAppUtils::StashPop(bool showChanges /* true */)
178 {
179 CString cmd,out;
180 cmd=_T("git.exe stash pop ");
181
182 CSysProgressDlg sysProgressDlg;
183 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
184 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
185 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
186 sysProgressDlg.SetShowProgressBar(false);
187 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
188 sysProgressDlg.ShowModeless((HWND)NULL, true);
189
190 int ret = g_Git.Run(cmd, &out, CP_UTF8);
191
192 sysProgressDlg.Stop();
193
194 bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0);
195 if (ret && !(ret == 1 && hasConflicts))
196 {
197 CMessageBox::Show(NULL,CString(MAKEINTRESOURCE(IDS_PROC_STASHPOPFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
198 }
199 else
200 {
201 CString message;
202 message.LoadString(IDS_PROC_STASHPOPSUCCESS);
203 if (hasConflicts)
204 message.LoadString(IDS_PROC_STASHPOPFAILEDCONFLICTS);
205 if (showChanges)
206 {
207 if(CMessageBox::Show(NULL,CString(message + _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES)))
208 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
209 {
210 CChangedDlg dlg;
211 dlg.m_pathList.AddPath(CTGitPath());
212 dlg.DoModal();
213 }
214 return true;
215 }
216 else
217 {
218 CMessageBox::Show(NULL, message ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
219 return true;
220 }
221 }
222 return false;
223 }
224
225 bool CAppUtils::GetMimeType(const CTGitPath& /*file*/, CString& /*mimetype*/)
226 {
227 #if 0
228 GitProperties props(file, GitRev::REV_WC, false);
229 for (int i = 0; i < props.GetCount(); ++i)
230 {
231 if (props.GetItemName(i).compare(_T("svn:mime-type"))==0)
232 {
233 mimetype = props.GetItemValue(i).c_str();
234 return true;
235 }
236 }
237 #endif
238 return false;
239 }
240
241 BOOL CAppUtils::StartExtMerge(
242 const CTGitPath& basefile, const CTGitPath& theirfile, const CTGitPath& yourfile, const CTGitPath& mergedfile,
243 const CString& basename, const CString& theirname, const CString& yourname, const CString& mergedname, bool bReadOnly)
244 {
245
246 CRegString regCom = CRegString(_T("Software\\TortoiseGit\\Merge"));
247 CString ext = mergedfile.GetFileExtension();
248 CString com = regCom;
249 bool bInternal = false;
250
251 CString mimetype;
252 if (ext != "")
253 {
254 // is there an extension specific merge tool?
255 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext.MakeLower());
256 if (CString(mergetool) != "")
257 {
258 com = mergetool;
259 }
260 }
261 if (GetMimeType(yourfile, mimetype) || GetMimeType(theirfile, mimetype) || GetMimeType(basefile, mimetype))
262 {
263 // is there a mime type specific merge tool?
264 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype);
265 if (CString(mergetool) != "")
266 {
267 com = mergetool;
268 }
269 }
270 // is there a filename specific merge tool?
271 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\.") + mergedfile.GetFilename().MakeLower());
272 if (CString(mergetool) != "")
273 {
274 com = mergetool;
275 }
276
277 // Maybe we should use TortoiseIDiff?
278 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
279 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
280 (ext == _T(".png")) || (ext == _T(".ico")) ||
281 (ext == _T(".dib")) || (ext == _T(".emf")))
282 {
283 com = _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe") + _T("\"") +
284 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname") + _T("\n") +
285 // delimited by \n
286 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe") + _T("\"") +
287 _T(" /left:%base /right:%theirs /lefttitle:%bname /righttitle:%tname");
288 }
289
290 if (com.IsEmpty()||(com.Left(1).Compare(_T("#"))==0))
291 {
292 // use TortoiseGitMerge
293 bInternal = true;
294 CRegString tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE);
295 com = tortoiseMergePath;
296 if (com.IsEmpty())
297 {
298 com = CPathUtils::GetAppDirectory();
299 com += _T("TortoiseGitMerge.exe");
300 }
301 com = _T("\"") + com + _T("\"");
302 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
303 com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
304 }
305 // check if the params are set. If not, just add the files to the command line
306 if ((com.Find(_T("%merged"))<0)&&(com.Find(_T("%base"))<0)&&(com.Find(_T("%theirs"))<0)&&(com.Find(_T("%mine"))<0))
307 {
308 com += _T(" \"")+basefile.GetWinPathString()+_T("\"");
309 com += _T(" \"")+theirfile.GetWinPathString()+_T("\"");
310 com += _T(" \"")+yourfile.GetWinPathString()+_T("\"");
311 com += _T(" \"")+mergedfile.GetWinPathString()+_T("\"");
312 }
313 if (basefile.IsEmpty())
314 {
315 com.Replace(_T("/base:%base"), _T(""));
316 com.Replace(_T("%base"), _T(""));
317 }
318 else
319 com.Replace(_T("%base"), _T("\"") + basefile.GetWinPathString() + _T("\""));
320 if (theirfile.IsEmpty())
321 {
322 com.Replace(_T("/theirs:%theirs"), _T(""));
323 com.Replace(_T("%theirs"), _T(""));
324 }
325 else
326 com.Replace(_T("%theirs"), _T("\"") + theirfile.GetWinPathString() + _T("\""));
327 if (yourfile.IsEmpty())
328 {
329 com.Replace(_T("/mine:%mine"), _T(""));
330 com.Replace(_T("%mine"), _T(""));
331 }
332 else
333 com.Replace(_T("%mine"), _T("\"") + yourfile.GetWinPathString() + _T("\""));
334 if (mergedfile.IsEmpty())
335 {
336 com.Replace(_T("/merged:%merged"), _T(""));
337 com.Replace(_T("%merged"), _T(""));
338 }
339 else
340 com.Replace(_T("%merged"), _T("\"") + mergedfile.GetWinPathString() + _T("\""));
341 if (basename.IsEmpty())
342 {
343 if (basefile.IsEmpty())
344 {
345 com.Replace(_T("/basename:%bname"), _T(""));
346 com.Replace(_T("%bname"), _T(""));
347 }
348 else
349 {
350 com.Replace(_T("%bname"), _T("\"") + basefile.GetUIFileOrDirectoryName() + _T("\""));
351 }
352 }
353 else
354 com.Replace(_T("%bname"), _T("\"") + basename + _T("\""));
355 if (theirname.IsEmpty())
356 {
357 if (theirfile.IsEmpty())
358 {
359 com.Replace(_T("/theirsname:%tname"), _T(""));
360 com.Replace(_T("%tname"), _T(""));
361 }
362 else
363 {
364 com.Replace(_T("%tname"), _T("\"") + theirfile.GetUIFileOrDirectoryName() + _T("\""));
365 }
366 }
367 else
368 com.Replace(_T("%tname"), _T("\"") + theirname + _T("\""));
369 if (yourname.IsEmpty())
370 {
371 if (yourfile.IsEmpty())
372 {
373 com.Replace(_T("/minename:%yname"), _T(""));
374 com.Replace(_T("%yname"), _T(""));
375 }
376 else
377 {
378 com.Replace(_T("%yname"), _T("\"") + yourfile.GetUIFileOrDirectoryName() + _T("\""));
379 }
380 }
381 else
382 com.Replace(_T("%yname"), _T("\"") + yourname + _T("\""));
383 if (mergedname.IsEmpty())
384 {
385 if (mergedfile.IsEmpty())
386 {
387 com.Replace(_T("/mergedname:%mname"), _T(""));
388 com.Replace(_T("%mname"), _T(""));
389 }
390 else
391 {
392 com.Replace(_T("%mname"), _T("\"") + mergedfile.GetUIFileOrDirectoryName() + _T("\""));
393 }
394 }
395 else
396 com.Replace(_T("%mname"), _T("\"") + mergedname + _T("\""));
397
398 if ((bReadOnly)&&(bInternal))
399 com += _T(" /readonly");
400
401 CString com2;
402 int newLine = com.Find(_T('\n'));
403 if (newLine >= 0)
404 {
405 com2 = com.Mid(newLine + 1);
406 com = com.Left(newLine);
407 }
408 if(!LaunchApplication(com, IDS_ERR_EXTMERGESTART, false))
409 {
410 return FALSE;
411 }
412 if (!com2.IsEmpty() && !LaunchApplication(com2, IDS_ERR_EXTMERGESTART, false))
413 {
414 return FALSE;
415 }
416
417 return TRUE;
418 }
419
420 BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, const CString& sOriginalDescription, const CString& sPatchedDescription, BOOL bReversed, BOOL bWait)
421 {
422 CString viewer;
423 // use TortoiseGitMerge
424 viewer = CPathUtils::GetAppDirectory();
425 viewer += _T("TortoiseGitMerge.exe");
426
427 viewer = _T("\"") + viewer + _T("\"");
428 viewer = viewer + _T(" /diff:\"") + patchfile.GetWinPathString() + _T("\"");
429 viewer = viewer + _T(" /patchpath:\"") + dir.GetWinPathString() + _T("\"");
430 if (bReversed)
431 viewer += _T(" /reversedpatch");
432 if (!sOriginalDescription.IsEmpty())
433 viewer = viewer + _T(" /patchoriginal:\"") + sOriginalDescription + _T("\"");
434 if (!sPatchedDescription.IsEmpty())
435 viewer = viewer + _T(" /patchpatched:\"") + sPatchedDescription + _T("\"");
436 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
437 {
438 return FALSE;
439 }
440 return TRUE;
441 }
442
443 CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2)
444 {
445 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file2.GetFilename().MakeLower());
446 if (!difftool.IsEmpty())
447 return difftool;
448 difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file1.GetFilename().MakeLower());
449 if (!difftool.IsEmpty())
450 return difftool;
451
452 // Is there a mime type specific diff tool?
453 CString mimetype;
454 if (GetMimeType(file1, mimetype) || GetMimeType(file2, mimetype))
455 {
456 difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype);
457 if (!difftool.IsEmpty())
458 return difftool;
459 }
460
461 // Is there an extension specific diff tool?
462 CString ext = file2.GetFileExtension().MakeLower();
463 if (!ext.IsEmpty())
464 {
465 difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext);
466 if (!difftool.IsEmpty())
467 return difftool;
468 // Maybe we should use TortoiseIDiff?
469 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
470 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
471 (ext == _T(".png")) || (ext == _T(".ico")) ||
472 (ext == _T(".dib")) || (ext == _T(".emf")))
473 {
474 return
475 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe") + _T("\"") +
476 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname");
477 }
478 }
479
480 // Finally, pick a generic external diff tool
481 difftool = CRegString(_T("Software\\TortoiseGit\\Diff"));
482 return difftool;
483 }
484
485 bool CAppUtils::StartExtDiff(
486 const CString& file1, const CString& file2,
487 const CString& sName1, const CString& sName2,
488 const CString& originalFile1, const CString& originalFile2,
489 const git_revnum_t& hash1, const git_revnum_t& hash2,
490 const DiffFlags& flags)
491 {
492 CString viewer;
493
494 CRegDWORD blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE);
495 if (!flags.bBlame || !(DWORD)blamediff)
496 {
497 viewer = PickDiffTool(file1, file2);
498 // If registry entry for a diff program is commented out, use TortoiseGitMerge.
499 bool bCommentedOut = viewer.Left(1) == _T("#");
500 if (flags.bAlternativeTool)
501 {
502 // Invert external vs. internal diff tool selection.
503 if (bCommentedOut)
504 viewer.Delete(0); // uncomment
505 else
506 viewer = "";
507 }
508 else if (bCommentedOut)
509 viewer = "";
510 }
511
512 bool bInternal = viewer.IsEmpty();
513 if (bInternal)
514 {
515 viewer =
516 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe") + _T("\"") +
517 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
518 if (flags.bBlame)
519 viewer += _T(" /blame");
520 }
521 // check if the params are set. If not, just add the files to the command line
522 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
523 {
524 viewer += _T(" \"")+file1+_T("\"");
525 viewer += _T(" \"")+file2+_T("\"");
526 }
527 if (viewer.Find(_T("%base")) >= 0)
528 {
529 viewer.Replace(_T("%base"), _T("\"")+file1+_T("\""));
530 }
531 if (viewer.Find(_T("%mine")) >= 0)
532 {
533 viewer.Replace(_T("%mine"), _T("\"")+file2+_T("\""));
534 }
535
536 if (sName1.IsEmpty())
537 viewer.Replace(_T("%bname"), _T("\"") + file1 + _T("\""));
538 else
539 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
540
541 if (sName2.IsEmpty())
542 viewer.Replace(_T("%yname"), _T("\"") + file2 + _T("\""));
543 else
544 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
545
546 viewer.Replace(_T("%bpath"), _T("\"") + originalFile1 + _T("\""));
547 viewer.Replace(_T("%ypath"), _T("\"") + originalFile2 + _T("\""));
548
549 viewer.Replace(_T("%brev"), _T("\"") + hash1 + _T("\""));
550 viewer.Replace(_T("%yrev"), _T("\"") + hash2 + _T("\""));
551
552 if (flags.bReadOnly && bInternal)
553 viewer += _T(" /readonly");
554
555 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait);
556 }
557
558 BOOL CAppUtils::StartUnifiedDiffViewer(const CString& patchfile, const CString& title, BOOL bWait)
559 {
560 CString viewer;
561 CRegString v = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
562 viewer = v;
563 if (viewer.IsEmpty() || (viewer.Left(1).Compare(_T("#"))==0))
564 {
565 // use TortoiseGitUDiff
566 viewer = CPathUtils::GetAppDirectory();
567 viewer += _T("TortoiseGitUDiff.exe");
568 // enquote the path to TortoiseGitUDiff
569 viewer = _T("\"") + viewer + _T("\"");
570 // add the params
571 viewer = viewer + _T(" /patchfile:%1 /title:\"%title\"");
572
573 }
574 if (viewer.Find(_T("%1"))>=0)
575 {
576 if (viewer.Find(_T("\"%1\"")) >= 0)
577 viewer.Replace(_T("%1"), patchfile);
578 else
579 viewer.Replace(_T("%1"), _T("\"") + patchfile + _T("\""));
580 }
581 else
582 viewer += _T(" \"") + patchfile + _T("\"");
583 if (viewer.Find(_T("%title")) >= 0)
584 {
585 viewer.Replace(_T("%title"), title);
586 }
587
588 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
589 {
590 return FALSE;
591 }
592 return TRUE;
593 }
594
595 BOOL CAppUtils::StartTextViewer(CString file)
596 {
597 CString viewer;
598 CRegString txt = CRegString(_T(".txt\\"), _T(""), FALSE, HKEY_CLASSES_ROOT);
599 viewer = txt;
600 viewer = viewer + _T("\\Shell\\Open\\Command\\");
601 CRegString txtexe = CRegString(viewer, _T(""), FALSE, HKEY_CLASSES_ROOT);
602 viewer = txtexe;
603
604 DWORD len = ExpandEnvironmentStrings(viewer, NULL, 0);
605 std::unique_ptr<TCHAR[]> buf(new TCHAR[len + 1]);
606 ExpandEnvironmentStrings(viewer, buf.get(), len);
607 viewer = buf.get();
608 len = ExpandEnvironmentStrings(file, NULL, 0);
609 std::unique_ptr<TCHAR[]> buf2(new TCHAR[len + 1]);
610 ExpandEnvironmentStrings(file, buf2.get(), len);
611 file = buf2.get();
612 file = _T("\"")+file+_T("\"");
613 if (viewer.IsEmpty())
614 {
615 viewer = _T("RUNDLL32 Shell32,OpenAs_RunDLL");
616 }
617 if (viewer.Find(_T("\"%1\"")) >= 0)
618 {
619 viewer.Replace(_T("\"%1\""), file);
620 }
621 else if (viewer.Find(_T("%1")) >= 0)
622 {
623 viewer.Replace(_T("%1"), file);
624 }
625 else
626 {
627 viewer += _T(" ");
628 viewer += file;
629 }
630
631 if(!LaunchApplication(viewer, IDS_ERR_TEXTVIEWSTART, false))
632 {
633 return FALSE;
634 }
635 return TRUE;
636 }
637
638 BOOL CAppUtils::CheckForEmptyDiff(const CTGitPath& sDiffPath)
639 {
640 DWORD length = 0;
641 CAutoFile hFile = ::CreateFile(sDiffPath.GetWinPath(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);
642 if (!hFile)
643 return TRUE;
644 length = ::GetFileSize(hFile, NULL);
645 if (length < 4)
646 return TRUE;
647 return FALSE;
648
649 }
650
651 void CAppUtils::CreateFontForLogs(CFont& fontToCreate)
652 {
653 LOGFONT logFont;
654 HDC hScreenDC = ::GetDC(NULL);
655 logFont.lfHeight = -MulDiv((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC, LOGPIXELSY), 72);
656 ::ReleaseDC(NULL, hScreenDC);
657 logFont.lfWidth = 0;
658 logFont.lfEscapement = 0;
659 logFont.lfOrientation = 0;
660 logFont.lfWeight = FW_NORMAL;
661 logFont.lfItalic = 0;
662 logFont.lfUnderline = 0;
663 logFont.lfStrikeOut = 0;
664 logFont.lfCharSet = DEFAULT_CHARSET;
665 logFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
666 logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
667 logFont.lfQuality = DRAFT_QUALITY;
668 logFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH;
669 _tcscpy_s(logFont.lfFaceName, 32, (LPCTSTR)(CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
670 VERIFY(fontToCreate.CreateFontIndirect(&logFont));
671 }
672
673 bool CAppUtils::LaunchPAgent(CString *keyfile,CString * pRemote)
674 {
675 CString key,remote;
676 CString cmd,out;
677 if( pRemote == NULL)
678 {
679 remote=_T("origin");
680 }
681 else
682 {
683 remote=*pRemote;
684 }
685 if(keyfile == NULL)
686 {
687 cmd.Format(_T("remote.%s.puttykeyfile"),remote);
688 key = g_Git.GetConfigValue(cmd);
689 int start=0;
690 key = key.Tokenize(_T("\n"),start);
691 }
692 else
693 key=*keyfile;
694
695 if(key.IsEmpty())
696 return false;
697
698 CString proc=CPathUtils::GetAppDirectory();
699 proc += _T("pageant.exe \"");
700 proc += key;
701 proc += _T("\"");
702
703 CString tempfile = GetTempFile();
704 ::DeleteFile(tempfile);
705
706 proc += _T(" -c \"");
707 proc += CPathUtils::GetAppDirectory();
708 proc += _T("touch.exe\"");
709 proc += _T(" \"");
710 proc += tempfile;
711 proc += _T("\"");
712
713 CString appDir = CPathUtils::GetAppDirectory();
714 bool b = LaunchApplication(proc, IDS_ERR_PAGEANT, true, &appDir);
715 if(!b)
716 return b;
717
718 int i=0;
719 while(!::PathFileExists(tempfile))
720 {
721 Sleep(100);
722 ++i;
723 if(i>10*60*5)
724 break; //timeout 5 minutes
725 }
726
727 if( i== 10*60*5)
728 {
729 CMessageBox::Show(NULL, IDS_ERR_PAEGENTTIMEOUT, IDS_APPNAME, MB_OK | MB_ICONERROR);
730 }
731 ::DeleteFile(tempfile);
732 return true;
733 }
734 bool CAppUtils::LaunchAlternativeEditor(const CString& filename, bool uac)
735 {
736 CString editTool = CRegString(_T("Software\\TortoiseGit\\AlternativeEditor"));
737 if (editTool.IsEmpty() || (editTool.Left(1).Compare(_T("#"))==0)) {
738 editTool = CPathUtils::GetAppDirectory() + _T("notepad2.exe");
739 }
740
741 CString sCmd;
742 sCmd.Format(_T("\"%s\" \"%s\""), editTool, filename);
743
744 LaunchApplication(sCmd, NULL, false, NULL, uac);
745 return true;
746 }
747 bool CAppUtils::LaunchRemoteSetting()
748 {
749 CTGitPath path(g_Git.m_CurrentDir);
750 CSettings dlg(IDS_PROC_SETTINGS_TITLE, &path);
751 dlg.SetTreeViewMode(TRUE, TRUE, TRUE);
752 dlg.SetTreeWidth(220);
753 dlg.m_DefaultPage = _T("gitremote");
754
755 dlg.DoModal();
756 dlg.HandleRestart();
757 return true;
758 }
759 /**
760 * Launch the external blame viewer
761 */
762 bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile,CString Rev,const CString& sParams)
763 {
764 CString viewer = _T("\"") + CPathUtils::GetAppDirectory();
765 viewer += _T("TortoiseGitBlame.exe");
766 viewer += _T("\" \"") + sBlameFile + _T("\"");
767 //viewer += _T(" \"") + sLogFile + _T("\"");
768 //viewer += _T(" \"") + sOriginalFile + _T("\"");
769 if(!Rev.IsEmpty() && Rev != GIT_REV_ZERO)
770 viewer += CString(_T(" /rev:"))+Rev;
771 viewer += _T(" ")+sParams;
772
773 return LaunchApplication(viewer, IDS_ERR_TGITBLAME, false);
774 }
775
776 bool CAppUtils::FormatTextInRichEditControl(CWnd * pWnd)
777 {
778 CString sText;
779 if (pWnd == NULL)
780 return false;
781 bool bStyled = false;
782 pWnd->GetWindowText(sText);
783 // the rich edit control doesn't count the CR char!
784 // to be exact: CRLF is treated as one char.
785 sText.Remove('\r');
786
787 // style each line separately
788 int offset = 0;
789 int nNewlinePos;
790 do
791 {
792 nNewlinePos = sText.Find('\n', offset);
793 CString sLine = sText.Mid(offset);
794 if (nNewlinePos>=0)
795 sLine = sLine.Left(nNewlinePos-offset);
796 int start = 0;
797 int end = 0;
798 while (FindStyleChars(sLine, '*', start, end))
799 {
800 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
801 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
802 CHARFORMAT2 format;
803 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
804 format.cbSize = sizeof(CHARFORMAT2);
805 format.dwMask = CFM_BOLD;
806 format.dwEffects = CFE_BOLD;
807 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
808 bStyled = true;
809 start = end;
810 }
811 start = 0;
812 end = 0;
813 while (FindStyleChars(sLine, '^', start, end))
814 {
815 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
816 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
817 CHARFORMAT2 format;
818 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
819 format.cbSize = sizeof(CHARFORMAT2);
820 format.dwMask = CFM_ITALIC;
821 format.dwEffects = CFE_ITALIC;
822 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
823 bStyled = true;
824 start = end;
825 }
826 start = 0;
827 end = 0;
828 while (FindStyleChars(sLine, '_', start, end))
829 {
830 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
831 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
832 CHARFORMAT2 format;
833 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
834 format.cbSize = sizeof(CHARFORMAT2);
835 format.dwMask = CFM_UNDERLINE;
836 format.dwEffects = CFE_UNDERLINE;
837 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
838 bStyled = true;
839 start = end;
840 }
841 offset = nNewlinePos+1;
842 } while(nNewlinePos>=0);
843 return bStyled;
844 }
845
846 bool CAppUtils::FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end)
847 {
848 int i=start;
849 bool bFoundMarker = false;
850 // find a starting marker
851 while (sText[i] != 0)
852 {
853 if (sText[i] == stylechar)
854 {
855 if (((i+1)<sText.GetLength())&&(IsCharAlphaNumeric(sText[i+1])) &&
856 (((i>0)&&(!IsCharAlphaNumeric(sText[i-1])))||(i==0)))
857 {
858 start = i+1;
859 ++i;
860 bFoundMarker = true;
861 break;
862 }
863 }
864 ++i;
865 }
866 if (!bFoundMarker)
867 return false;
868 // find ending marker
869 bFoundMarker = false;
870 while (sText[i] != 0)
871 {
872 if (sText[i] == stylechar)
873 {
874 if ((IsCharAlphaNumeric(sText[i-1])) &&
875 ((((i+1)<sText.GetLength())&&(!IsCharAlphaNumeric(sText[i+1])))||(i+1)==sText.GetLength()))
876 {
877 end = i;
878 ++i;
879 bFoundMarker = true;
880 break;
881 }
882 }
883 ++i;
884 }
885 return bFoundMarker;
886 }
887
888 CString CAppUtils::GetProjectNameFromURL(CString url)
889 {
890 CString name;
891 while (name.IsEmpty() || (name.CompareNoCase(_T("branches"))==0) ||
892 (name.CompareNoCase(_T("tags"))==0) ||
893 (name.CompareNoCase(_T("trunk"))==0))
894 {
895 name = url.Mid(url.ReverseFind('/')+1);
896 url = url.Left(url.ReverseFind('/'));
897 }
898 if ((name.Compare(_T("svn")) == 0)||(name.Compare(_T("svnroot")) == 0))
899 {
900 // a name of svn or svnroot indicates that it's not really the project name. In that
901 // case, we try the first part of the URL
902 // of course, this won't work in all cases (but it works for Google project hosting)
903 url.Replace(_T("http://"), _T(""));
904 url.Replace(_T("https://"), _T(""));
905 url.Replace(_T("svn://"), _T(""));
906 url.Replace(_T("svn+ssh://"), _T(""));
907 url.TrimLeft(_T("/"));
908 name = url.Left(url.Find('.'));
909 }
910 return name;
911 }
912
913 bool CAppUtils::StartShowUnifiedDiff(HWND /*hWnd*/, const CTGitPath& url1, const git_revnum_t& rev1,
914 const CTGitPath& /*url2*/, const git_revnum_t& rev2,
915 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
916 bool /*bAlternateDiff*/ /* = false */, bool /*bIgnoreAncestry*/ /* = false */, bool /* blame = false */, bool bMerge)
917 {
918
919 CString tempfile=GetTempFile();
920 CString cmd;
921 if(rev2 == GitRev::GetWorkingCopy())
922 {
923 cmd.Format(_T("git.exe diff --stat -p %s "), rev1);
924 }
925 else if (rev1 == GitRev::GetWorkingCopy())
926 {
927 cmd.Format(_T("git.exe diff -R --stat -p %s "), rev2);
928 }
929 else
930 {
931 CString merge;
932 if(bMerge)
933 merge = _T("-c");
934
935 cmd.Format(_T("git.exe diff-tree -r -p %s --stat %s %s"),merge, rev1,rev2);
936 }
937
938 if( !url1.IsEmpty() )
939 {
940 cmd += _T(" -- \"");
941 cmd += url1.GetGitPathString();
942 cmd += _T("\" ");
943 }
944 g_Git.RunLogFile(cmd,tempfile);
945 CAppUtils::StartUnifiedDiffViewer(tempfile, rev1 + _T(":") + rev2);
946
947
948 #if 0
949 CString sCmd;
950 sCmd.Format(_T("%s /command:showcompare /unified"),
951 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseGitProc.exe")));
952 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
953 if (rev1.IsValid())
954 sCmd += _T(" /revision1:") + rev1.ToString();
955 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
956 if (rev2.IsValid())
957 sCmd += _T(" /revision2:") + rev2.ToString();
958 if (peg.IsValid())
959 sCmd += _T(" /pegrevision:") + peg.ToString();
960 if (headpeg.IsValid())
961 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
962
963 if (bAlternateDiff)
964 sCmd += _T(" /alternatediff");
965
966 if (bIgnoreAncestry)
967 sCmd += _T(" /ignoreancestry");
968
969 if (hWnd)
970 {
971 sCmd += _T(" /hwnd:");
972 TCHAR buf[30];
973 _stprintf_s(buf, 30, _T("%d"), hWnd);
974 sCmd += buf;
975 }
976
977 return CAppUtils::LaunchApplication(sCmd, NULL, false);
978 #endif
979 return TRUE;
980 }
981
982 bool CAppUtils::SetupDiffScripts(bool force, const CString& type)
983 {
984 CString scriptsdir = CPathUtils::GetAppParentDirectory();
985 scriptsdir += _T("Diff-Scripts");
986 CSimpleFileFind files(scriptsdir);
987 while (files.FindNextFileNoDirectories())
988 {
989 CString file = files.GetFilePath();
990 CString filename = files.GetFileName();
991 CString ext = file.Mid(file.ReverseFind('-') + 1);
992 ext = _T(".") + ext.Left(ext.ReverseFind('.'));
993 std::set<CString> extensions;
994 extensions.insert(ext);
995 CString kind;
996 if (file.Right(3).CompareNoCase(_T("vbs"))==0)
997 {
998 kind = _T(" //E:vbscript");
999 }
1000 if (file.Right(2).CompareNoCase(_T("js"))==0)
1001 {
1002 kind = _T(" //E:javascript");
1003 }
1004 // open the file, read the first line and find possible extensions
1005 // this script can handle
1006 try
1007 {
1008 CStdioFile f(file, CFile::modeRead | CFile::shareDenyNone);
1009 CString extline;
1010 if (f.ReadString(extline))
1011 {
1012 if ((extline.GetLength() > 15 ) &&
1013 ((extline.Left(15).Compare(_T("// extensions: ")) == 0) ||
1014 (extline.Left(14).Compare(_T("' extensions: ")) == 0)))
1015 {
1016 if (extline[0] == '/')
1017 extline = extline.Mid(15);
1018 else
1019 extline = extline.Mid(14);
1020 CString sToken;
1021 int curPos = 0;
1022 sToken = extline.Tokenize(_T(";"), curPos);
1023 while (!sToken.IsEmpty())
1024 {
1025 if (!sToken.IsEmpty())
1026 {
1027 if (sToken[0] != '.')
1028 sToken = _T(".") + sToken;
1029 extensions.insert(sToken);
1030 }
1031 sToken = extline.Tokenize(_T(";"), curPos);
1032 }
1033 }
1034 }
1035 f.Close();
1036 }
1037 catch (CFileException* e)
1038 {
1039 e->Delete();
1040 }
1041
1042 for (std::set<CString>::const_iterator it = extensions.begin(); it != extensions.end(); ++it)
1043 {
1044 if (type.IsEmpty() || (type.Compare(_T("Diff")) == 0))
1045 {
1046 if (filename.Left(5).CompareNoCase(_T("diff-")) == 0)
1047 {
1048 CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + *it);
1049 CString diffregstring = diffreg;
1050 if (force || (diffregstring.IsEmpty()) || (diffregstring.Find(filename) >= 0))
1051 diffreg = _T("wscript.exe \"") + file + _T("\" %base %mine") + kind;
1052 }
1053 }
1054 if (type.IsEmpty() || (type.Compare(_T("Merge"))==0))
1055 {
1056 if (filename.Left(6).CompareNoCase(_T("merge-"))==0)
1057 {
1058 CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\MergeTools\\") + *it);
1059 CString diffregstring = diffreg;
1060 if (force || (diffregstring.IsEmpty()) || (diffregstring.Find(filename) >= 0))
1061 diffreg = _T("wscript.exe \"") + file + _T("\" %merged %theirs %mine %base") + kind;
1062 }
1063 }
1064 }
1065 }
1066
1067 return true;
1068 }
1069
1070 bool CAppUtils::Export(CString *BashHash)
1071 {
1072 // ask from where the export has to be done
1073 CExportDlg dlg;
1074 if(BashHash)
1075 dlg.m_Revision=*BashHash;
1076
1077 if (dlg.DoModal() == IDOK)
1078 {
1079 CString cmd;
1080 cmd.Format(_T("git.exe archive --output=\"%s\" --format=zip --verbose %s"),
1081 dlg.m_strExportDirectory, g_Git.FixBranchName(dlg.m_VersionName));
1082
1083 CProgressDlg pro;
1084 pro.m_GitCmd=cmd;
1085 return (pro.DoModal() == IDOK);
1086 }
1087 return false;
1088 }
1089
1090 bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash, bool switch_new_brach)
1091 {
1092 CCreateBranchTagDlg dlg;
1093 dlg.m_bIsTag=IsTag;
1094 dlg.m_bSwitch=switch_new_brach;
1095
1096 if(CommitHash)
1097 dlg.m_initialRefName = *CommitHash;
1098
1099 if(dlg.DoModal()==IDOK)
1100 {
1101 CString cmd;
1102 CString force;
1103 CString track;
1104 if(dlg.m_bTrack == TRUE)
1105 track=_T(" --track ");
1106 else if(dlg.m_bTrack == FALSE)
1107 track=_T(" --no-track");
1108
1109 if(dlg.m_bForce)
1110 force=_T(" -f ");
1111
1112 if(IsTag)
1113 {
1114 CString sign;
1115 if(dlg.m_bSign)
1116 sign=_T("-s");
1117
1118 cmd.Format(_T("git.exe tag %s %s %s %s"),
1119 force,
1120 sign,
1121 dlg.m_BranchTagName,
1122 g_Git.FixBranchName(dlg.m_VersionName)
1123 );
1124
1125 CString tempfile=::GetTempFile();
1126 if(!dlg.m_Message.Trim().IsEmpty())
1127 {
1128 CAppUtils::SaveCommitUnicodeFile(tempfile,dlg.m_Message);
1129 cmd += _T(" -F ")+tempfile;
1130 }
1131 }
1132 else
1133 {
1134 cmd.Format(_T("git.exe branch %s %s %s %s"),
1135 track,
1136 force,
1137 dlg.m_BranchTagName,
1138 g_Git.FixBranchName(dlg.m_VersionName)
1139 );
1140 }
1141 CString out;
1142 if(g_Git.Run(cmd,&out,CP_UTF8))
1143 {
1144 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
1145 return FALSE;
1146 }
1147 if( !IsTag && dlg.m_bSwitch )
1148 {
1149 // it is a new branch and the user has requested to switch to it
1150 cmd.Format(_T("git.exe checkout %s"), dlg.m_BranchTagName);
1151 g_Git.Run(cmd,&out,CP_UTF8);
1152 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
1153 }
1154
1155 return TRUE;
1156 }
1157 return FALSE;
1158 }
1159
1160 bool CAppUtils::Switch(CString initialRefName, bool autoclose)
1161 {
1162 CGitSwitchDlg dlg;
1163 if(!initialRefName.IsEmpty())
1164 dlg.m_initialRefName = initialRefName;
1165
1166 if (dlg.DoModal() == IDOK)
1167 {
1168 CString branch;
1169 if (dlg.m_bBranch)
1170 branch = dlg.m_NewBranch;
1171
1172 // if refs/heads/ is not stripped, checkout will detach HEAD
1173 // checkout prefers branches on name clashes (with tags)
1174 if (dlg.m_VersionName.Left(11) ==_T("refs/heads/") && dlg.m_bBranchOverride != TRUE)
1175 dlg.m_VersionName = dlg.m_VersionName.Mid(11);
1176
1177 return PerformSwitch(dlg.m_VersionName, dlg.m_bForce == TRUE , branch, dlg.m_bBranchOverride == TRUE, dlg.m_bTrack, autoclose);
1178 }
1179 return FALSE;
1180 }
1181
1182 bool CAppUtils::PerformSwitch(CString ref, bool bForce /* false */, CString sNewBranch /* CString() */, bool bBranchOverride /* false */, BOOL bTrack /* 2 */, bool autoClose /* false */)
1183 {
1184 CString cmd;
1185 CString track;
1186 CString force;
1187 CString branch;
1188
1189 if(!sNewBranch.IsEmpty()){
1190 if (bBranchOverride)
1191 {
1192 branch.Format(_T("-B %s"), sNewBranch);
1193 }
1194 else
1195 {
1196 branch.Format(_T("-b %s"), sNewBranch);
1197 }
1198 if (bTrack == TRUE)
1199 track = _T("--track");
1200 else if (bTrack == FALSE)
1201 track = _T("--no-track");
1202 }
1203 if (bForce)
1204 force = _T("-f");
1205
1206 cmd.Format(_T("git.exe checkout %s %s %s %s"),
1207 force,
1208 track,
1209 branch,
1210 g_Git.FixBranchName(ref));
1211
1212 CProgressDlg progress;
1213 progress.m_bAutoCloseOnSuccess = autoClose;
1214 progress.m_GitCmd = cmd;
1215
1216 CTGitPath gitPath = g_Git.m_CurrentDir;
1217 if (gitPath.HasSubmodules())
1218 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE)));
1219
1220 INT_PTR ret = progress.DoModal();
1221 if (gitPath.HasSubmodules() && ret == IDC_PROGRESS_BUTTON1)
1222 {
1223 CString sCmd;
1224 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
1225
1226 RunTortoiseGitProc(sCmd);
1227 return TRUE;
1228 }
1229 else if (ret == IDOK)
1230 return TRUE;
1231
1232 return FALSE;
1233 }
1234
1235 bool CAppUtils::OpenIgnoreFile(CStdioFile &file, const CString& filename)
1236 {
1237 if (!file.Open(filename, CFile::modeCreate | CFile::modeReadWrite | CFile::modeNoTruncate))
1238 {
1239 CMessageBox::Show(NULL, filename + _T(" Open Failure"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
1240 return false;
1241 }
1242
1243 if (file.GetLength() > 0)
1244 {
1245 file.Seek(file.GetLength() - 1, 0);
1246 std::unique_ptr<TCHAR[]> buf(new TCHAR[1]);
1247 file.Read(buf.get(), 1);
1248 file.SeekToEnd();
1249 if (buf.get()[0] != _T('\n'))
1250 file.WriteString(_T("\n"));
1251 }
1252 else
1253 file.SeekToEnd();
1254
1255 return true;
1256 }
1257
1258 bool CAppUtils::IgnoreFile(CTGitPathList &path,bool IsMask)
1259 {
1260 CIgnoreDlg ignoreDlg;
1261 if (ignoreDlg.DoModal() == IDOK)
1262 {
1263 CString ignorefile;
1264 ignorefile = g_Git.m_CurrentDir + _T("\\");
1265
1266 switch (ignoreDlg.m_IgnoreFile)
1267 {
1268 case 0:
1269 ignorefile += _T(".gitignore");
1270 break;
1271 case 2:
1272 g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, ignorefile);
1273 ignorefile += _T("info/exclude");
1274 break;
1275 }
1276
1277 CStdioFile file;
1278 try
1279 {
1280 if (ignoreDlg.m_IgnoreFile != 1 && !OpenIgnoreFile(file, ignorefile))
1281 return false;
1282
1283 for (int i = 0; i < path.GetCount(); ++i)
1284 {
1285 if (ignoreDlg.m_IgnoreFile == 1)
1286 {
1287 ignorefile = g_Git.m_CurrentDir + _T("\\") + path[i].GetContainingDirectory().GetWinPathString() + _T("\\.gitignore");
1288 if (!OpenIgnoreFile(file, ignorefile))
1289 return false;
1290 }
1291
1292 CString ignorePattern;
1293 if (ignoreDlg.m_IgnoreType == 0)
1294 {
1295 if (ignoreDlg.m_IgnoreFile != 1 && !path[i].GetContainingDirectory().GetGitPathString().IsEmpty())
1296 ignorePattern += _T("/") + path[i].GetContainingDirectory().GetGitPathString();
1297
1298 ignorePattern += _T("/");
1299 }
1300 if (IsMask)
1301 {
1302 ignorePattern += _T("*") + path[i].GetFileExtension();
1303 }
1304 else
1305 {
1306 ignorePattern += path[i].GetFileOrDirectoryName();
1307 }
1308
1309 // escape [ and ] so that files get ignored correctly
1310 ignorePattern.Replace(_T("["), _T("\\["));
1311 ignorePattern.Replace(_T("]"), _T("\\]"));
1312
1313 ignorePattern += _T("\n");
1314 CStringA ignorePatternA = CUnicodeUtils::GetUTF8(ignorePattern);
1315 file.Write(ignorePatternA.GetBuffer(), ignorePatternA.GetLength());
1316 ignorePatternA.ReleaseBuffer();
1317
1318 if (ignoreDlg.m_IgnoreFile == 1)
1319 file.Close();
1320 }
1321
1322 if (ignoreDlg.m_IgnoreFile != 1)
1323 file.Close();
1324 }
1325 catch(...)
1326 {
1327 file.Abort();
1328 return false;
1329 }
1330
1331 return true;
1332 }
1333 return false;
1334 }
1335
1336
1337 bool CAppUtils::GitReset(CString *CommitHash,int type)
1338 {
1339 CResetDlg dlg;
1340 dlg.m_ResetType=type;
1341 dlg.m_ResetToVersion=*CommitHash;
1342 dlg.m_initialRefName = *CommitHash;
1343 if (dlg.DoModal() == IDOK)
1344 {
1345 CString cmd;
1346 CString type;
1347 switch(dlg.m_ResetType)
1348 {
1349 case 0:
1350 type=_T("--soft");
1351 break;
1352 case 1:
1353 type=_T("--mixed");
1354 break;
1355 case 2:
1356 type=_T("--hard");
1357 break;
1358 default:
1359 type=_T("--mixed");
1360 break;
1361 }
1362 cmd.Format(_T("git.exe reset %s %s"),type, dlg.m_ResetToVersion);
1363
1364 while (true)
1365 {
1366 CProgressDlg progress;
1367 progress.m_GitCmd=cmd;
1368
1369 CTGitPath gitPath = g_Git.m_CurrentDir;
1370 if (gitPath.HasSubmodules() && dlg.m_ResetType == 2)
1371 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE)));
1372
1373 progress.m_PostFailCmdList.Add(CString(MAKEINTRESOURCE(IDS_MSGBOX_RETRY)));
1374
1375 INT_PTR ret = progress.DoModal();
1376 if (progress.m_GitStatus == 0 && gitPath.HasSubmodules() && dlg.m_ResetType == 2 && ret == IDC_PROGRESS_BUTTON1)
1377 {
1378 CString sCmd;
1379 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
1380
1381 RunTortoiseGitProc(sCmd);
1382 return TRUE;
1383 }
1384 else if (progress.m_GitStatus != 0 && ret == IDC_PROGRESS_BUTTON1)
1385 continue; // retry
1386 else if (ret == IDOK)
1387 return TRUE;
1388 else
1389 break;
1390 }
1391 }
1392 return FALSE;
1393 }
1394
1395 void CAppUtils::DescribeFile(bool mode, bool base,CString &descript)
1396 {
1397 if(mode == FALSE)
1398 {
1399 descript = CString(MAKEINTRESOURCE(IDS_SVNACTION_DELETE));
1400 return;
1401 }
1402 if(base)
1403 {
1404 descript = CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED));
1405 return;
1406 }
1407 descript = CString(MAKEINTRESOURCE(IDS_PROC_CREATED));
1408 return;
1409 }
1410
1411 void CAppUtils::RemoveTempMergeFile(CTGitPath &path)
1412 {
1413 CString tempmergefile;
1414 try
1415 {
1416 tempmergefile = CAppUtils::GetMergeTempFile(_T("LOCAL"),path);
1417 CFile::Remove(tempmergefile);
1418 }catch(...)
1419 {
1420 }
1421
1422 try
1423 {
1424 tempmergefile = CAppUtils::GetMergeTempFile(_T("REMOTE"),path);
1425 CFile::Remove(tempmergefile);
1426 }catch(...)
1427 {
1428 }
1429
1430 try
1431 {
1432 tempmergefile = CAppUtils::GetMergeTempFile(_T("BASE"),path);
1433 CFile::Remove(tempmergefile);
1434 }catch(...)
1435 {
1436 }
1437 }
1438 CString CAppUtils::GetMergeTempFile(CString type,CTGitPath &merge)
1439 {
1440 CString file;
1441 file=g_Git.m_CurrentDir+_T("\\") + merge.GetWinPathString()+_T(".")+type+merge.GetFileExtension();
1442
1443 return file;
1444 }
1445
1446 bool ParseHashesFromLsFile(BYTE_VECTOR &out, CString &hash1, CString &hash2, CString &hash3)
1447 {
1448 unsigned int pos = 0;
1449 CString one;
1450 CString part;
1451
1452 while (pos >= 0 && pos < out.size())
1453 {
1454 one.Empty();
1455
1456 g_Git.StringAppend(&one, &out[pos], CP_UTF8);
1457 int tabstart = 0;
1458 one.Tokenize(_T("\t"), tabstart);
1459
1460 tabstart = 0;
1461 part = one.Tokenize(_T(" "), tabstart); //Tag
1462 part = one.Tokenize(_T(" "), tabstart); //Mode
1463 part = one.Tokenize(_T(" "), tabstart); //Hash
1464 CString hash = part;
1465 part = one.Tokenize(_T("\t"), tabstart); //Stage
1466 int stage = _ttol(part);
1467 if (stage == 1)
1468 hash1 = hash;
1469 else if (stage == 2)
1470 hash2 = hash;
1471 else if (stage == 3)
1472 {
1473 hash3 = hash;
1474 return true;
1475 }
1476
1477 pos = out.findNextString(pos);
1478 }
1479
1480 return false;
1481 }
1482
1483 bool CAppUtils::ConflictEdit(CTGitPath &path,bool /*bAlternativeTool*/,bool revertTheirMy)
1484 {
1485 bool bRet = false;
1486
1487 CTGitPath merge=path;
1488 CTGitPath directory = merge.GetDirectory();
1489
1490 // we have the conflicted file (%merged)
1491 // now look for the other required files
1492 //GitStatus stat;
1493 //stat.GetStatus(merge);
1494 //if (stat.status == NULL)
1495 // return false;
1496
1497 BYTE_VECTOR vector;
1498
1499 CString cmd;
1500 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge.GetGitPathString());
1501
1502 if (g_Git.Run(cmd, &vector))
1503 {
1504 return FALSE;
1505 }
1506
1507 if (merge.IsDirectory())
1508 {
1509 CString baseHash, localHash, remoteHash;
1510 if (!ParseHashesFromLsFile(vector, baseHash, localHash, remoteHash))
1511 return FALSE;
1512
1513 CString msg;
1514 msg.Format(_T("BASE: %s\nLOCAL: %s\nREMOTE: %s"), baseHash, localHash, remoteHash);
1515 CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_OK);
1516 return TRUE;
1517 }
1518
1519 CTGitPathList list;
1520 list.ParserFromLsFile(vector);
1521
1522 if(list.GetCount() == 0)
1523 return FALSE;
1524
1525 CTGitPath theirs;
1526 CTGitPath mine;
1527 CTGitPath base;
1528
1529 if (revertTheirMy)
1530 {
1531 mine.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge));
1532 theirs.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge));
1533 }
1534 else
1535 {
1536 mine.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge));
1537 theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge));
1538 }
1539 base.SetFromGit(GetMergeTempFile(_T("BASE"),merge));
1540
1541 CString format;
1542
1543 //format=_T("git.exe cat-file blob \":%d:%s\"");
1544 format = _T("git checkout-index --temp --stage=%d -- \"%s\"");
1545 CFile tempfile;
1546 //create a empty file, incase stage is not three
1547 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1548 tempfile.Close();
1549 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1550 tempfile.Close();
1551 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
1552 tempfile.Close();
1553
1554 bool b_base=false, b_local=false, b_remote=false;
1555
1556 for (int i = 0; i< list.GetCount(); ++i)
1557 {
1558 CString cmd;
1559 CString outfile;
1560 cmd.Empty();
1561 outfile.Empty();
1562
1563 if( list[i].m_Stage == 1)
1564 {
1565 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1566 b_base = true;
1567 outfile = base.GetWinPathString();
1568
1569 }
1570 if( list[i].m_Stage == 2 )
1571 {
1572 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1573 b_local = true;
1574 outfile = mine.GetWinPathString();
1575
1576 }
1577 if( list[i].m_Stage == 3 )
1578 {
1579 cmd.Format(format, list[i].m_Stage, list[i].GetGitPathString());
1580 b_remote = true;
1581 outfile = theirs.GetWinPathString();
1582 }
1583 CString output, err;
1584 if(!outfile.IsEmpty())
1585 if (!g_Git.Run(cmd, &output, &err, CP_UTF8))
1586 {
1587 CString file;
1588 int start =0 ;
1589 file = output.Tokenize(_T("\t"), start);
1590 ::MoveFileEx(file,outfile,MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED);
1591 }
1592 else
1593 {
1594 CMessageBox::Show(NULL, output + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
1595 }
1596 }
1597
1598 if(b_local && b_remote )
1599 {
1600 merge.SetFromWin(g_Git.m_CurrentDir+_T("\\")+merge.GetWinPathString());
1601 if( revertTheirMy )
1602 bRet = !!CAppUtils::StartExtMerge(base, mine, theirs, merge, _T("BASE"), _T("REMOTE"), _T("LOCAL"));
1603 else
1604 bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"), _T("REMOTE"), _T("LOCAL"));
1605
1606 }
1607 else
1608 {
1609 CFile::Remove(mine.GetWinPathString());
1610 CFile::Remove(theirs.GetWinPathString());
1611 CFile::Remove(base.GetWinPathString());
1612
1613 CDeleteConflictDlg dlg;
1614 DescribeFile(b_local, b_base,dlg.m_LocalStatus);
1615 DescribeFile(b_remote,b_base,dlg.m_RemoteStatus);
1616 dlg.m_bShowModifiedButton=b_base;
1617 dlg.m_File=merge.GetGitPathString();
1618 if(dlg.DoModal() == IDOK)
1619 {
1620 CString cmd,out;
1621 if(dlg.m_bIsDelete)
1622 {
1623 cmd.Format(_T("git.exe rm -- \"%s\""),merge.GetGitPathString());
1624 }
1625 else
1626 cmd.Format(_T("git.exe add -- \"%s\""),merge.GetGitPathString());
1627
1628 if (g_Git.Run(cmd, &out, CP_UTF8))
1629 {
1630 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
1631 return FALSE;
1632 }
1633 return TRUE;
1634 }
1635 else
1636 return FALSE;
1637 }
1638
1639 #if 0
1640 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1641 base, theirs, mine, merge);
1642 #endif
1643 #if 0
1644 if (stat.status->text_status == svn_wc_status_conflicted)
1645 {
1646 // we have a text conflict, use our merge tool to resolve the conflict
1647
1648 CTSVNPath theirs(directory);
1649 CTSVNPath mine(directory);
1650 CTSVNPath base(directory);
1651 bool bConflictData = false;
1652
1653 if ((stat.status->entry)&&(stat.status->entry->conflict_new))
1654 {
1655 theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));
1656 bConflictData = true;
1657 }
1658 if ((stat.status->entry)&&(stat.status->entry->conflict_old))
1659 {
1660 base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));
1661 bConflictData = true;
1662 }
1663 if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))
1664 {
1665 mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));
1666 bConflictData = true;
1667 }
1668 else
1669 {
1670 mine = merge;
1671 }
1672 if (bConflictData)
1673 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1674 base, theirs, mine, merge);
1675 }
1676
1677 if (stat.status->prop_status == svn_wc_status_conflicted)
1678 {
1679 // we have a property conflict
1680 CTSVNPath prej(directory);
1681 if ((stat.status->entry)&&(stat.status->entry->prejfile))
1682 {
1683 prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));
1684 // there's a problem: the prej file contains a _description_ of the conflict, and
1685 // that description string might be translated. That means we have no way of parsing
1686 // the file to find out the conflicting values.
1687 // The only thing we can do: show a dialog with the conflict description, then
1688 // let the user either accept the existing property or open the property edit dialog
1689 // to manually change the properties and values. And a button to mark the conflict as
1690 // resolved.
1691 CEditPropConflictDlg dlg;
1692 dlg.SetPrejFile(prej);
1693 dlg.SetConflictedItem(merge);
1694 bRet = (dlg.DoModal() != IDCANCEL);
1695 }
1696 }
1697
1698 if (stat.status->tree_conflict)
1699 {
1700 // we have a tree conflict
1701 SVNInfo info;
1702 const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());
1703 if (pInfoData)
1704 {
1705 if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)
1706 {
1707 CTSVNPath theirs(directory);
1708 CTSVNPath mine(directory);
1709 CTSVNPath base(directory);
1710 bool bConflictData = false;
1711
1712 if (pInfoData->treeconflict_theirfile)
1713 {
1714 theirs.AppendPathString(pInfoData->treeconflict_theirfile);
1715 bConflictData = true;
1716 }
1717 if (pInfoData->treeconflict_basefile)
1718 {
1719 base.AppendPathString(pInfoData->treeconflict_basefile);
1720 bConflictData = true;
1721 }
1722 if (pInfoData->treeconflict_myfile)
1723 {
1724 mine.AppendPathString(pInfoData->treeconflict_myfile);
1725 bConflictData = true;
1726 }
1727 else
1728 {
1729 mine = merge;
1730 }
1731 if (bConflictData)
1732 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
1733 base, theirs, mine, merge);
1734 }
1735 else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)
1736 {
1737 CString sConflictAction;
1738 CString sConflictReason;
1739 CString sResolveTheirs;
1740 CString sResolveMine;
1741 CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);
1742 CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();
1743
1744 if (pInfoData->treeconflict_nodekind == svn_node_file)
1745 {
1746 switch (pInfoData->treeconflict_operation)
1747 {
1748 case svn_wc_operation_update:
1749 switch (pInfoData->treeconflict_action)
1750 {
1751 case svn_wc_conflict_action_edit:
1752 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);
1753 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1754 break;
1755 case svn_wc_conflict_action_add:
1756 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);
1757 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1758 break;
1759 case svn_wc_conflict_action_delete:
1760 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);
1761 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
1762 break;
1763 }
1764 break;
1765 case svn_wc_operation_switch:
1766 switch (pInfoData->treeconflict_action)
1767 {
1768 case svn_wc_conflict_action_edit:
1769 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);
1770 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1771 break;
1772 case svn_wc_conflict_action_add:
1773 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);
1774 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1775 break;
1776 case svn_wc_conflict_action_delete:
1777 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);
1778 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
1779 break;
1780 }
1781 break;
1782 case svn_wc_operation_merge:
1783 switch (pInfoData->treeconflict_action)
1784 {
1785 case svn_wc_conflict_action_edit:
1786 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);
1787 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1788 break;
1789 case svn_wc_conflict_action_add:
1790 sResolveTheirs.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);
1791 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
1792 break;
1793 case svn_wc_conflict_action_delete:
1794 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);
1795 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
1796 break;
1797 }
1798 break;
1799 }
1800 }
1801 else if (pInfoData->treeconflict_nodekind == svn_node_dir)
1802 {
1803 switch (pInfoData->treeconflict_operation)
1804 {
1805 case svn_wc_operation_update:
1806 switch (pInfoData->treeconflict_action)
1807 {
1808 case svn_wc_conflict_action_edit:
1809 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);
1810 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1811 break;
1812 case svn_wc_conflict_action_add:
1813 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);
1814 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1815 break;
1816 case svn_wc_conflict_action_delete:
1817 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);
1818 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
1819 break;
1820 }
1821 break;
1822 case svn_wc_operation_switch:
1823 switch (pInfoData->treeconflict_action)
1824 {
1825 case svn_wc_conflict_action_edit:
1826 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);
1827 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1828 break;
1829 case svn_wc_conflict_action_add:
1830 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);
1831 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1832 break;
1833 case svn_wc_conflict_action_delete:
1834 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);
1835 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
1836 break;
1837 }
1838 break;
1839 case svn_wc_operation_merge:
1840 switch (pInfoData->treeconflict_action)
1841 {
1842 case svn_wc_conflict_action_edit:
1843 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);
1844 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1845 break;
1846 case svn_wc_conflict_action_add:
1847 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);
1848 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
1849 break;
1850 case svn_wc_conflict_action_delete:
1851 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);
1852 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
1853 break;
1854 }
1855 break;
1856 }
1857 }
1858
1859 UINT uReasonID = 0;
1860 switch (pInfoData->treeconflict_reason)
1861 {
1862 case svn_wc_conflict_reason_edited:
1863 uReasonID = IDS_TREECONFLICT_REASON_EDITED;
1864 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
1865 break;
1866 case svn_wc_conflict_reason_obstructed:
1867 uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;
1868 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
1869 break;
1870 case svn_wc_conflict_reason_deleted:
1871 uReasonID = IDS_TREECONFLICT_REASON_DELETED;
1872 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
1873 break;
1874 case svn_wc_conflict_reason_added:
1875 uReasonID = IDS_TREECONFLICT_REASON_ADDED;
1876 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
1877 break;
1878 case svn_wc_conflict_reason_missing:
1879 uReasonID = IDS_TREECONFLICT_REASON_MISSING;
1880 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
1881 break;
1882 case svn_wc_conflict_reason_unversioned:
1883 uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;
1884 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
1885 break;
1886 }
1887 sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);
1888
1889 CTreeConflictEditorDlg dlg;
1890 dlg.SetConflictInfoText(sConflictReason);
1891 dlg.SetResolveTexts(sResolveTheirs, sResolveMine);
1892 dlg.SetPath(treeConflictPath);
1893 INT_PTR dlgRet = dlg.DoModal();
1894 bRet = (dlgRet != IDCANCEL);
1895 }
1896 }
1897 }
1898 #endif
1899 return bRet;
1900 }
1901
1902 bool CAppUtils::IsSSHPutty()
1903 {
1904 CString sshclient=g_Git.m_Environment.GetEnv(_T("GIT_SSH"));
1905 sshclient=sshclient.MakeLower();
1906 if(sshclient.Find(_T("plink.exe"),0)>=0)
1907 {
1908 return true;
1909 }
1910 return false;
1911 }
1912
1913 CString CAppUtils::GetClipboardLink()
1914 {
1915 if (!OpenClipboard(NULL))
1916 return CString();
1917
1918 CString sClipboardText;
1919 HGLOBAL hglb = GetClipboardData(CF_TEXT);
1920 if (hglb)
1921 {
1922 LPCSTR lpstr = (LPCSTR)GlobalLock(hglb);
1923 sClipboardText = CString(lpstr);
1924 GlobalUnlock(hglb);
1925 }
1926 hglb = GetClipboardData(CF_UNICODETEXT);
1927 if (hglb)
1928 {
1929 LPCTSTR lpstr = (LPCTSTR)GlobalLock(hglb);
1930 sClipboardText = lpstr;
1931 GlobalUnlock(hglb);
1932 }
1933 CloseClipboard();
1934
1935 if(!sClipboardText.IsEmpty())
1936 {
1937 if(sClipboardText[0] == _T('\"') && sClipboardText[sClipboardText.GetLength()-1] == _T('\"'))
1938 sClipboardText=sClipboardText.Mid(1,sClipboardText.GetLength()-2);
1939
1940 if(sClipboardText.Find( _T("http://")) == 0)
1941 return sClipboardText;
1942
1943 if(sClipboardText.Find( _T("https://")) == 0)
1944 return sClipboardText;
1945
1946 if(sClipboardText.Find( _T("git://")) == 0)
1947 return sClipboardText;
1948
1949 if(sClipboardText.Find( _T("ssh://")) == 0)
1950 return sClipboardText;
1951
1952 if(sClipboardText.GetLength()>=2)
1953 if( sClipboardText[1] == _T(':') )
1954 if( (sClipboardText[0] >= 'A' && sClipboardText[0] <= 'Z')
1955 || (sClipboardText[0] >= 'a' && sClipboardText[0] <= 'z') )
1956 return sClipboardText;
1957 }
1958
1959 return CString(_T(""));
1960 }
1961
1962 CString CAppUtils::ChooseRepository(CString *path)
1963 {
1964 CBrowseFolder browseFolder;
1965 CRegString regLastResopitory = CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\LastRepo"),_T(""));
1966
1967 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
1968 CString strCloneDirectory;
1969 if(path)
1970 strCloneDirectory=*path;
1971 else
1972 {
1973 strCloneDirectory = regLastResopitory;
1974 }
1975
1976 CString title;
1977 title.LoadString(IDS_CHOOSE_REPOSITORY);
1978
1979 browseFolder.SetInfo(title);
1980
1981 if (browseFolder.Show(NULL, strCloneDirectory) == CBrowseFolder::OK)
1982 {
1983 regLastResopitory = strCloneDirectory;
1984 return strCloneDirectory;
1985 }
1986 else
1987 {
1988 return CString();
1989 }
1990 }
1991
1992 bool CAppUtils::SendPatchMail(CTGitPathList &list,bool autoclose)
1993 {
1994 CSendMailDlg dlg;
1995
1996 dlg.m_PathList = list;
1997
1998 if(dlg.DoModal()==IDOK)
1999 {
2000 if(dlg.m_PathList.GetCount() == 0)
2001 return FALSE;
2002
2003 CGitProgressDlg progDlg;
2004
2005 theApp.m_pMainWnd = &progDlg;
2006 progDlg.SetCommand(CGitProgressList::GitProgress_SendMail);
2007
2008 progDlg.SetAutoClose(autoclose);
2009
2010 progDlg.SetPathList(dlg.m_PathList);
2011 //ProjectProperties props;
2012 //props.ReadPropsPathList(dlg.m_pathList);
2013 //progDlg.SetProjectProperties(props);
2014 progDlg.SetItemCount(dlg.m_PathList.GetCount());
2015
2016 CSendMailPatch sendMailPatch(dlg.m_To, dlg.m_CC, dlg.m_Subject, !!dlg.m_bAttachment, !!dlg.m_bCombine, !!dlg.m_bUseMAPI);
2017 progDlg.SetSendMailOption(&sendMailPatch);
2018
2019 progDlg.DoModal();
2020
2021 return true;
2022 }
2023 return false;
2024 }
2025
2026 bool CAppUtils::SendPatchMail(CString &cmd,CString &formatpatchoutput,bool autoclose)
2027 {
2028 CTGitPathList list;
2029 CString log=formatpatchoutput;
2030 int start=log.Find(cmd);
2031 if(start >=0)
2032 CString one=log.Tokenize(_T("\n"),start);
2033 else
2034 start = 0;
2035
2036 while(start>=0)
2037 {
2038 CString one=log.Tokenize(_T("\n"),start);
2039 one=one.Trim();
2040 if(one.IsEmpty() || one.Find(_T("Success")) == 0)
2041 continue;
2042 one.Replace(_T('/'),_T('\\'));
2043 CTGitPath path;
2044 path.SetFromWin(one);
2045 list.AddPath(path);
2046 }
2047 if (list.GetCount() > 0)
2048 {
2049 return SendPatchMail(list, autoclose);
2050 }
2051 else
2052 {
2053 CMessageBox::Show(NULL, IDS_ERR_NOPATCHES, IDS_APPNAME, MB_ICONINFORMATION);
2054 return true;
2055 }
2056 }
2057
2058
2059 int CAppUtils::GetLogOutputEncode(CGit *pGit)
2060 {
2061 CString cmd,output;
2062 int start=0;
2063
2064 output = pGit->GetConfigValue(_T("i18n.logOutputEncoding"));
2065 if(output.IsEmpty())
2066 {
2067 output = pGit->GetConfigValue(_T("i18n.commitencoding"));
2068 if(output.IsEmpty())
2069 return CP_UTF8;
2070
2071 int start=0;
2072 output=output.Tokenize(_T("\n"),start);
2073 return CUnicodeUtils::GetCPCode(output);
2074
2075 }
2076 else
2077 {
2078 output=output.Tokenize(_T("\n"),start);
2079 return CUnicodeUtils::GetCPCode(output);
2080 }
2081 }
2082 int CAppUtils::GetCommitTemplate(CString &temp)
2083 {
2084 CString cmd,output;
2085
2086 output = g_Git.GetConfigValue(_T("commit.template"), CP_UTF8);
2087 if( output.IsEmpty() )
2088 return -1;
2089
2090 if( output.GetLength()<1)
2091 return -1;
2092
2093 if( output[0] == _T('/'))
2094 {
2095 if(output.GetLength()>=3)
2096 if(output[2] == _T('/'))
2097 {
2098 output.GetBuffer()[0] = output[1];
2099 output.GetBuffer()[1] = _T(':');
2100 }
2101 }
2102
2103 int start=0;
2104 output=output.Tokenize(_T("\n"),start);
2105
2106 output.Replace(_T('/'),_T('\\'));
2107
2108 try
2109 {
2110 CStdioFile file(output,CFile::modeRead|CFile::typeText);
2111 CString str;
2112 while(file.ReadString(str))
2113 {
2114 temp+=str+_T("\n");
2115 }
2116
2117 }catch(...)
2118 {
2119 return -1;
2120 }
2121 return 0;
2122 }
2123 int CAppUtils::SaveCommitUnicodeFile(CString &filename, CString &message)
2124 {
2125 CFile file(filename,CFile::modeReadWrite|CFile::modeCreate );
2126 CString cmd,output;
2127 int cp=CP_UTF8;
2128
2129 output= g_Git.GetConfigValue(_T("i18n.commitencoding"));
2130 if(output.IsEmpty())
2131 cp=CP_UTF8;
2132
2133 int start=0;
2134 output=output.Tokenize(_T("\n"),start);
2135 cp=CUnicodeUtils::GetCPCode(output);
2136
2137 int len=message.GetLength();
2138
2139 std::unique_ptr<char[]> buf(new char[len * 4 + 4]);
2140 SecureZeroMemory(buf.get(), len * 4 + 4);
2141
2142 int lengthIncTerminator = WideCharToMultiByte(cp, 0, message, -1, buf.get(), len * 4, NULL, NULL);
2143
2144 file.Write(buf.get(), lengthIncTerminator - 1);
2145 file.Close();
2146 return 0;
2147 }
2148
2149 bool CAppUtils::Fetch(CString remoteName, bool allowRebase, bool autoClose)
2150 {
2151 CPullFetchDlg dlg;
2152 dlg.m_PreSelectRemote = remoteName;
2153 dlg.m_bAllowRebase = allowRebase;
2154 dlg.m_IsPull=FALSE;
2155
2156 if(dlg.DoModal()==IDOK)
2157 {
2158 if(dlg.m_bAutoLoad)
2159 {
2160 if (dlg.m_bAllRemotes)
2161 {
2162 STRING_VECTOR list;
2163 g_Git.GetRemoteList(list);
2164
2165 STRING_VECTOR::const_iterator it = list.begin();
2166 while (it != list.end())
2167 {
2168 CString remote(*it);
2169 CAppUtils::LaunchPAgent(NULL, &remote);
2170 ++it;
2171 }
2172 }
2173 else
2174 CAppUtils::LaunchPAgent(NULL, &dlg.m_RemoteURL);
2175 }
2176
2177 CString url;
2178 url=dlg.m_RemoteURL;
2179 CString cmd;
2180 CString arg;
2181
2182 int ver = CAppUtils::GetMsysgitVersion();
2183
2184 if(ver >= 0x01070203) //above 1.7.0.2
2185 arg = _T("--progress ");
2186
2187 if (dlg.m_bPrune) {
2188 arg += _T("--prune ");
2189 }
2190
2191 if (dlg.m_bFetchTags == 1)
2192 {
2193 arg += _T("--tags ");
2194 }
2195 else if (dlg.m_bFetchTags == 0)
2196 {
2197 arg += _T("--no-tags ");
2198 }
2199
2200 if (dlg.m_bAllRemotes)
2201 cmd.Format(_T("git.exe fetch --all -v %s"), arg);
2202 else
2203 cmd.Format(_T("git.exe fetch -v %s \"%s\" %s"), arg, url, dlg.m_RemoteBranchName);
2204
2205 CProgressDlg progress;
2206
2207 progress.m_bAutoCloseOnSuccess = autoClose;
2208
2209 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
2210 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_RESET)));
2211
2212 if(!dlg.m_bRebase && !g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir))
2213 {
2214 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE)));
2215 }
2216
2217 progress.m_GitCmd=cmd;
2218 INT_PTR userResponse;
2219
2220 if (g_Git.UsingLibGit2(CGit::GIT_CMD_FETCH))
2221 {
2222 CGitProgressDlg gitdlg;
2223 if (!dlg.m_bAllRemotes)
2224 gitdlg.SetUrl(url);
2225 gitdlg.SetCommand(CGitProgressList::GitProgress_Fetch);
2226 gitdlg.SetAutoTag(dlg.m_bFetchTags ? GIT_REMOTE_DOWNLOAD_TAGS_ALL : GIT_REMOTE_DOWNLOAD_TAGS_NONE);
2227 if (!dlg.m_bAllRemotes)
2228 gitdlg.SetRefSpec(dlg.m_RemoteBranchName);
2229 userResponse = gitdlg.DoModal();
2230
2231 }
2232 else
2233 userResponse = progress.DoModal();
2234
2235 if (userResponse == IDC_PROGRESS_BUTTON1)
2236 {
2237 CString cmd = _T("/command:log");
2238 cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
2239 RunTortoiseGitProc(cmd);
2240 return TRUE;
2241 }
2242 else if (userResponse == IDC_PROGRESS_BUTTON1 + 1)
2243 {
2244 CString currentBranch = g_Git.GetSymbolicRef();
2245 CString configName;
2246 configName.Format(_T("branch.%s.remote"), currentBranch);
2247 CString pullRemote = g_Git.GetConfigValue(configName);
2248
2249 //Select pull-branch from current branch
2250 configName.Format(_T("branch.%s.merge"), currentBranch);
2251 CString pullBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
2252
2253 CString defaultUpstream;
2254 if (!pullRemote.IsEmpty() && !pullBranch.IsEmpty())
2255 defaultUpstream.Format(_T("remotes/%s/%s"), pullRemote, pullBranch);
2256 GitReset(&defaultUpstream, 2);
2257 return TRUE;
2258 }
2259 else if ((userResponse == IDC_PROGRESS_BUTTON1 + 2) || (progress.m_GitStatus == 0 && dlg.m_bRebase))
2260 {
2261 while(1)
2262 {
2263 CRebaseDlg dlg;
2264 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
2265 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENUDESSENDMAIL)));
2266 dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE)));
2267 INT_PTR response = dlg.DoModal();
2268 if(response == IDOK)
2269 {
2270 return TRUE;
2271 }
2272 else if (response == IDC_REBASE_POST_BUTTON)
2273 {
2274 CString cmd = _T("/command:log");
2275 cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
2276 RunTortoiseGitProc(cmd);
2277 return TRUE;
2278 }
2279 else if (response == IDC_REBASE_POST_BUTTON + 1)
2280 {
2281 CString cmd, out, err;
2282 cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
2283 g_Git.m_CurrentDir,
2284 g_Git.FixBranchName(dlg.m_Upstream),
2285 g_Git.FixBranchName(dlg.m_Branch));
2286 if (g_Git.Run(cmd, &out, &err, CP_UTF8))
2287 {
2288 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
2289 return FALSE;
2290 }
2291
2292 CAppUtils::SendPatchMail(cmd,out);
2293 return TRUE;
2294 }
2295 else if (response == IDC_REBASE_POST_BUTTON + 2)
2296 continue;
2297 else if(response == IDCANCEL)
2298 return FALSE;
2299 }
2300 return TRUE;
2301 }
2302 else if (userResponse != IDCANCEL)
2303 return TRUE;
2304 }
2305 return FALSE;
2306 }
2307
2308 bool CAppUtils::Push(CString selectLocalBranch, bool autoClose)
2309 {
2310 CPushDlg dlg;
2311 dlg.m_BranchSourceName = selectLocalBranch;
2312 CString error;
2313 DWORD exitcode = 0xFFFFFFFF;
2314 CTGitPathList list;
2315 list.AddPath(CTGitPath(g_Git.m_CurrentDir));
2316 if (CHooks::Instance().PrePush(list,exitcode, error))
2317 {
2318 if (exitcode)
2319 {
2320 CString temp;
2321 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2322 //ReportError(temp);
2323 CMessageBox::Show(NULL,temp,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2324 return false;
2325 }
2326 }
2327
2328 if(dlg.DoModal()==IDOK)
2329 {
2330 CString arg;
2331
2332 if(dlg.m_bPack)
2333 arg += _T("--thin ");
2334 if(dlg.m_bTags && !dlg.m_bPushAllBranches)
2335 arg += _T("--tags ");
2336 if(dlg.m_bForce)
2337 arg += _T("--force ");
2338 if (dlg.m_bSetUpstream)
2339 arg += _T("--set-upstream ");
2340 if (dlg.m_RecurseSubmodules == 1)
2341 arg += _T("--recurse-submodules=check ");
2342 if (dlg.m_RecurseSubmodules == 2)
2343 arg += _T("--recurse-submodules=on-demand ");
2344
2345 int ver = CAppUtils::GetMsysgitVersion();
2346
2347 if(ver >= 0x01070203) //above 1.7.0.2
2348 arg += _T("--progress ");
2349
2350 CProgressDlg progress;
2351 progress.m_bAutoCloseOnSuccess=autoClose;
2352
2353 STRING_VECTOR remotesList;
2354 if (dlg.m_bPushAllRemotes)
2355 g_Git.GetRemoteList(remotesList);
2356 else
2357 remotesList.push_back(dlg.m_URL);
2358
2359 for (unsigned int i = 0; i < remotesList.size(); ++i)
2360 {
2361 if (dlg.m_bAutoLoad)
2362 CAppUtils::LaunchPAgent(NULL, &remotesList[i]);
2363
2364 CString cmd;
2365 if (dlg.m_bPushAllBranches)
2366 {
2367 cmd.Format(_T("git.exe push --all %s \"%s\""),
2368 arg,
2369 remotesList[i]);
2370
2371 if (dlg.m_bTags)
2372 {
2373 progress.m_GitCmdList.push_back(cmd);
2374 cmd.Format(_T("git.exe push --tags %s \"%s\""), arg, remotesList[i]);
2375 }
2376 }
2377 else
2378 {
2379 cmd.Format(_T("git.exe push %s \"%s\" %s"),
2380 arg,
2381 remotesList[i],
2382 dlg.m_BranchSourceName);
2383 if (!dlg.m_BranchRemoteName.IsEmpty())
2384 {
2385 cmd += _T(":") + dlg.m_BranchRemoteName;
2386 }
2387 }
2388 progress.m_GitCmdList.push_back(cmd);
2389 }
2390
2391 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_REQUESTPULL)));
2392 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH)));
2393 INT_PTR ret = progress.DoModal();
2394
2395 if(!progress.m_GitStatus)
2396 {
2397 if (CHooks::Instance().PostPush(list,exitcode, error))
2398 {
2399 if (exitcode)
2400 {
2401 CString temp;
2402 temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
2403 //ReportError(temp);
2404 CMessageBox::Show(NULL,temp,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2405 return false;
2406 }
2407 }
2408 if(ret == IDC_PROGRESS_BUTTON1)
2409 {
2410 RequestPull(dlg.m_BranchRemoteName);
2411 }
2412 else if(ret == IDC_PROGRESS_BUTTON1 + 1)
2413 {
2414 Push();
2415 }
2416 return TRUE;
2417 }
2418
2419 }
2420 return FALSE;
2421 }
2422
2423 bool CAppUtils::RequestPull(CString endrevision, CString repositoryUrl)
2424 {
2425 CRequestPullDlg dlg;
2426 dlg.m_RepositoryURL = repositoryUrl;
2427 dlg.m_EndRevision = endrevision;
2428 if (dlg.DoModal()==IDOK)
2429 {
2430 CString cmd;
2431 cmd.Format(_T("git.exe request-pull %s \"%s\" %s"), dlg.m_StartRevision, dlg.m_RepositoryURL, dlg.m_EndRevision);
2432
2433 CSysProgressDlg sysProgressDlg;
2434 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
2435 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_CREATINGPULLREUQEST)));
2436 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
2437 sysProgressDlg.SetShowProgressBar(false);
2438 sysProgressDlg.ShowModeless((HWND)NULL, true);
2439
2440 CString tempFileName = GetTempFile();
2441 if (g_Git.RunLogFile(cmd, tempFileName))
2442 {
2443 CMessageBox::Show(NULL, IDS_ERR_PULLREUQESTFAILED, IDS_APPNAME, MB_OK);
2444 return false;
2445 }
2446
2447 if (sysProgressDlg.HasUserCancelled())
2448 {
2449 CMessageBox::Show(NULL, IDS_SVN_USERCANCELLED, IDS_APPNAME, MB_OK);
2450 ::DeleteFile(tempFileName);
2451 return false;
2452 }
2453
2454 sysProgressDlg.Stop();
2455
2456 if (dlg.m_bSendMail)
2457 {
2458 CSendMailDlg dlg;
2459 dlg.m_PathList = CTGitPathList(CTGitPath(tempFileName));
2460 dlg.m_bCustomSubject = true;
2461
2462 if (dlg.DoModal() == IDOK)
2463 {
2464 if(dlg.m_PathList.GetCount() == 0)
2465 return FALSE;
2466
2467 CGitProgressDlg progDlg;
2468
2469 theApp.m_pMainWnd = &progDlg;
2470 progDlg.SetCommand(CGitProgressList::GitProgress_SendMail);
2471
2472 progDlg.SetPathList(dlg.m_PathList);
2473 progDlg.SetItemCount(dlg.m_PathList.GetCount());
2474
2475 CSendMailCombineable sendMailCombineable(dlg.m_To, dlg.m_CC, dlg.m_Subject, !!dlg.m_bAttachment, !!dlg.m_bCombine, !!dlg.m_bUseMAPI);
2476 progDlg.SetSendMailOption(&sendMailCombineable);
2477
2478 progDlg.DoModal();
2479
2480 return true;
2481 }
2482 return false;
2483 }
2484
2485 CAppUtils::LaunchAlternativeEditor(tempFileName);
2486 }
2487 return true;
2488 }
2489
2490 bool CAppUtils::CreateMultipleDirectory(const CString& szPath)
2491 {
2492 CString strDir(szPath);
2493 if (strDir.GetAt(strDir.GetLength()-1)!=_T('\\'))
2494 {
2495 strDir.AppendChar(_T('\\'));
2496 }
2497 std::vector<CString> vPath;
2498 CString strTemp;
2499 bool bSuccess = false;
2500
2501 for (int i=0;i<strDir.GetLength();++i)
2502 {
2503 if (strDir.GetAt(i) != _T('\\'))
2504 {
2505 strTemp.AppendChar(strDir.GetAt(i));
2506 }
2507 else
2508 {
2509 vPath.push_back(strTemp);
2510 strTemp.AppendChar(_T('\\'));
2511 }
2512 }
2513
2514 for (auto vIter = vPath.begin(); vIter != vPath.end(); ++vIter)
2515 {
2516 bSuccess = CreateDirectory(*vIter, NULL) ? true : false;
2517 }
2518
2519 return bSuccess;
2520 }
2521
2522 void CAppUtils::RemoveTrailSlash(CString &path)
2523 {
2524 if(path.IsEmpty())
2525 return ;
2526
2527 while(path[path.GetLength()-1] == _T('\\') || path[path.GetLength()-1] == _T('/' ) )
2528 {
2529 path=path.Left(path.GetLength()-1);
2530 if(path.IsEmpty())
2531 return;
2532 }
2533 }
2534
2535 bool CAppUtils::CheckUserData()
2536 {
2537 while(g_Git.GetUserName().IsEmpty() || g_Git.GetUserEmail().IsEmpty())
2538 {
2539 if(CMessageBox::Show(NULL, IDS_PROC_NOUSERDATA, IDS_APPNAME, MB_YESNO| MB_ICONERROR) == IDYES)
2540 {
2541 CTGitPath path(g_Git.m_CurrentDir);
2542 CSettings dlg(IDS_PROC_SETTINGS_TITLE,&path);
2543 dlg.SetTreeViewMode(TRUE, TRUE, TRUE);
2544 dlg.SetTreeWidth(220);
2545 dlg.m_DefaultPage = _T("gitconfig");
2546
2547 dlg.DoModal();
2548 dlg.HandleRestart();
2549
2550 }
2551 else
2552 return false;
2553 }
2554
2555 return true;
2556 }
2557
2558 BOOL CAppUtils::Commit(CString bugid,BOOL bWholeProject,CString &sLogMsg,
2559 CTGitPathList &pathList,
2560 CTGitPathList &selectedList,
2561 bool bSelectFilesForCommit,
2562 bool autoClose)
2563 {
2564 bool bFailed = true;
2565
2566 if (!CheckUserData())
2567 return false;
2568
2569 while (bFailed)
2570 {
2571 bFailed = false;
2572 CCommitDlg dlg;
2573 dlg.m_sBugID = bugid;
2574
2575 dlg.m_bWholeProject = bWholeProject;
2576
2577 dlg.m_sLogMessage = sLogMsg;
2578 dlg.m_pathList = pathList;
2579 dlg.m_checkedPathList = selectedList;
2580 dlg.m_bSelectFilesForCommit = bSelectFilesForCommit;
2581 dlg.m_bAutoClose = autoClose;
2582 if (dlg.DoModal() == IDOK)
2583 {
2584 if (dlg.m_pathList.GetCount()==0)
2585 return false;
2586 // if the user hasn't changed the list of selected items
2587 // we don't use that list. Because if we would use the list
2588 // of pre-checked items, the dialog would show different
2589 // checked items on the next startup: it would only try
2590 // to check the parent folder (which might not even show)
2591 // instead, we simply use an empty list and let the
2592 // default checking do its job.
2593 if (!dlg.m_pathList.IsEqual(pathList))
2594 selectedList = dlg.m_pathList;
2595 pathList = dlg.m_updatedPathList;
2596 sLogMsg = dlg.m_sLogMessage;
2597 bSelectFilesForCommit = true;
2598
2599 if( dlg.m_bPushAfterCommit )
2600 {
2601 switch(dlg.m_PostCmd)
2602 {
2603 case GIT_POST_CMD_DCOMMIT:
2604 CAppUtils::SVNDCommit();
2605 break;
2606 default:
2607 CAppUtils::Push();
2608 }
2609 }
2610 else if (dlg.m_bCreateTagAfterCommit)
2611 {
2612 CAppUtils::CreateBranchTag(TRUE);
2613 }
2614
2615 // CGitProgressDlg progDlg;
2616 // progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);
2617 // if (parser.HasVal(_T("closeonend")))
2618 // progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
2619 // progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);
2620 // progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);
2621 // progDlg.SetPathList(dlg.m_pathList);
2622 // progDlg.SetCommitMessage(dlg.m_sLogMessage);
2623 // progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);
2624 // progDlg.SetSelectedList(dlg.m_selectedPathList);
2625 // progDlg.SetItemCount(dlg.m_itemsCount);
2626 // progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);
2627 // progDlg.DoModal();
2628 // CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
2629 // err = (DWORD)progDlg.DidErrorsOccur();
2630 // bFailed = progDlg.DidErrorsOccur();
2631 // bRet = progDlg.DidErrorsOccur();
2632 // CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);
2633 // if (DWORD(bFailRepeat)==0)
2634 // bFailed = false; // do not repeat if the user chose not to in the settings.
2635 }
2636 }
2637 return true;
2638 }
2639
2640
2641 BOOL CAppUtils::SVNDCommit()
2642 {
2643 CSVNDCommitDlg dcommitdlg;
2644 CString gitSetting = g_Git.GetConfigValue(_T("svn.rmdir"));
2645 if (gitSetting == _T("")) {
2646 if (dcommitdlg.DoModal() != IDOK)
2647 {
2648 return false;
2649 }
2650 else
2651 {
2652 if (dcommitdlg.m_remember)
2653 {
2654 if (dcommitdlg.m_rmdir)
2655 {
2656 gitSetting = _T("true");
2657 }
2658 else
2659 {
2660 gitSetting = _T("false");
2661 }
2662 if(g_Git.SetConfigValue(_T("svn.rmdir"),gitSetting))
2663 {
2664 CString msg;
2665 msg.Format(IDS_PROC_SAVECONFIGFAILED, _T("svn.rmdir"), gitSetting);
2666 CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2667 }
2668 }
2669 }
2670 }
2671
2672 BOOL IsStash = false;
2673 if(!g_Git.CheckCleanWorkTree())
2674 {
2675 if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
2676 {
2677 CSysProgressDlg sysProgressDlg;
2678 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
2679 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
2680 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
2681 sysProgressDlg.SetShowProgressBar(false);
2682 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
2683 sysProgressDlg.ShowModeless((HWND)NULL, true);
2684
2685 CString cmd,out;
2686 cmd=_T("git.exe stash");
2687 if (g_Git.Run(cmd, &out, CP_UTF8))
2688 {
2689 sysProgressDlg.Stop();
2690 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
2691 return false;
2692 }
2693 sysProgressDlg.Stop();
2694
2695 IsStash =true;
2696 }
2697 else
2698 {
2699 return false;
2700 }
2701 }
2702
2703 CProgressDlg progress;
2704 if (dcommitdlg.m_rmdir)
2705 {
2706 progress.m_GitCmd=_T("git.exe svn dcommit --rmdir");
2707 }
2708 else
2709 {
2710 progress.m_GitCmd=_T("git.exe svn dcommit");
2711 }
2712 if(progress.DoModal()==IDOK && progress.m_GitStatus == 0)
2713 {
2714 if( IsStash)
2715 {
2716 if(CMessageBox::Show(NULL,IDS_DCOMMIT_STASH_POP,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
2717 {
2718 CSysProgressDlg sysProgressDlg;
2719 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
2720 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
2721 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
2722 sysProgressDlg.SetShowProgressBar(false);
2723 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
2724 sysProgressDlg.ShowModeless((HWND)NULL, true);
2725
2726 CString cmd,out;
2727 cmd=_T("git.exe stash pop");
2728 if (g_Git.Run(cmd, &out, CP_UTF8))
2729 {
2730 sysProgressDlg.Stop();
2731 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
2732 return false;
2733 }
2734 sysProgressDlg.Stop();
2735 }
2736 else
2737 {
2738 return false;
2739 }
2740 }
2741 return TRUE;
2742 }
2743 return FALSE;
2744 }
2745
2746 static void MergeCallback(CProgressDlg *dlg, void * /*caller*/, int result)
2747 {
2748 if (result)
2749 {
2750 dlg->m_PostCmdList.RemoveAll();
2751
2752 CTGitPathList list;
2753 if (!g_Git.ListConflictFile(list) && list.GetCount() > 0)
2754 {
2755 // there are conflict files
2756 dlg->m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE)));
2757 }
2758 }
2759 }
2760
2761 BOOL CAppUtils::Merge(CString *commit)
2762 {
2763 if (!CheckUserData())
2764 return FALSE;
2765
2766 CMergeDlg dlg;
2767 if(commit)
2768 dlg.m_initialRefName = *commit;
2769
2770 if(dlg.DoModal()==IDOK)
2771 {
2772 CString cmd;
2773 CString args;
2774
2775 if(dlg.m_bNoFF)
2776 args += _T(" --no-ff");
2777
2778 if(dlg.m_bSquash)
2779 args += _T(" --squash");
2780
2781 if(dlg.m_bNoCommit)
2782 args += _T(" --no-commit");
2783
2784 if (dlg.m_bLog)
2785 {
2786 CString fmt;
2787 fmt.Format(_T(" --log=%d"), dlg.m_nLog);
2788 args += fmt;
2789 }
2790
2791 if (!dlg.m_MergeStrategy.IsEmpty())
2792 {
2793 args += _T(" --strategy=") + dlg.m_MergeStrategy;
2794 if (!dlg.m_StrategyOption.IsEmpty())
2795 {
2796 args += _T(" --strategy-option=") + dlg.m_StrategyOption;
2797 if (!dlg.m_StrategyParam.IsEmpty())
2798 args += _T("=") + dlg.m_StrategyParam;
2799 }
2800 }
2801
2802 if(!dlg.m_strLogMesage.IsEmpty())
2803 {
2804 CString logmsg = dlg.m_strLogMesage;
2805 logmsg.Replace(_T("\""), _T("\\\""));
2806 args += _T(" -m \"") + logmsg + _T("\"");
2807 }
2808 cmd.Format(_T("git.exe merge %s %s"), args, g_Git.FixBranchName(dlg.m_VersionName));
2809
2810 CProgressDlg Prodlg;
2811 Prodlg.m_GitCmd = cmd;
2812
2813 if (dlg.m_bNoCommit)
2814 Prodlg.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUCOMMIT)));
2815 else if (dlg.m_bIsBranch)
2816 Prodlg.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_REMOVEBRANCH)));
2817
2818 Prodlg.m_PostCmdCallback = MergeCallback;
2819
2820 INT_PTR ret = Prodlg.DoModal();
2821 if (Prodlg.m_GitStatus != 0 && ret == IDC_PROGRESS_BUTTON1)
2822 {
2823 CTGitPathList pathlist;
2824 CTGitPathList selectedlist;
2825 pathlist.AddPath(g_Git.m_CurrentDir);
2826 bool bSelectFilesForCommit = !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
2827 CString str;
2828 CAppUtils::Commit(CString(), false, str, pathlist, selectedlist, bSelectFilesForCommit);
2829 }
2830 else if (ret == IDC_PROGRESS_BUTTON1)
2831 {
2832 if (dlg.m_bNoCommit)
2833 {
2834 CString sLogMsg;
2835 CTGitPathList pathList;
2836 CTGitPathList selectedList;
2837 return Commit(_T(""), TRUE, sLogMsg, pathList, selectedList, true);
2838 }
2839 else if (dlg.m_bIsBranch)
2840 {
2841 CString msg;
2842 msg.Format(IDS_PROC_DELETEBRANCHTAG, dlg.m_VersionName);
2843 if (CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 2, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
2844 {
2845 CString cmd, out;
2846 cmd.Format(_T("git.exe branch -D -- %s"), dlg.m_VersionName);
2847 if (g_Git.Run(cmd, &out, CP_UTF8))
2848 MessageBox(NULL, out, _T("TortoiseGit"), MB_OK);
2849 }
2850 }
2851 }
2852
2853 return !Prodlg.m_GitStatus;
2854 }
2855 return false;
2856 }
2857
2858 void CAppUtils::EditNote(GitRev *rev)
2859 {
2860 if (!CheckUserData())
2861 return;
2862
2863 CInputDlg dlg;
2864 dlg.m_sHintText = CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES));
2865 dlg.m_sInputText = rev->m_Notes;
2866 dlg.m_sTitle = CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES));
2867 //dlg.m_pProjectProperties = &m_ProjectProperties;
2868 dlg.m_bUseLogWidth = true;
2869 if(dlg.DoModal() == IDOK)
2870 {
2871 CString cmd,output;
2872 cmd=_T("notes add -f -F \"");
2873
2874 CString tempfile=::GetTempFile();
2875 CAppUtils::SaveCommitUnicodeFile(tempfile,dlg.m_sInputText);
2876 cmd += tempfile;
2877 cmd += _T("\" ");
2878 cmd += rev->m_CommitHash.ToString();
2879
2880 try
2881 {
2882 if (git_run_cmd("notes", CUnicodeUtils::GetMulti(cmd, CP_UTF8).GetBuffer()))
2883 {
2884 CMessageBox::Show(NULL, IDS_PROC_FAILEDSAVINGNOTES, IDS_APPNAME, MB_OK | MB_ICONERROR);
2885
2886 }
2887 else
2888 {
2889 rev->m_Notes = dlg.m_sInputText;
2890 }
2891 }catch(...)
2892 {
2893 CMessageBox::Show(NULL, IDS_PROC_FAILEDSAVINGNOTES, IDS_APPNAME, MB_OK | MB_ICONERROR);
2894 }
2895 CFile::Remove(tempfile);
2896
2897 }
2898 }
2899
2900 int CAppUtils::GetMsysgitVersion(CString *versionstr)
2901 {
2902 CString cmd;
2903 CString versiondebug;
2904 CString version;
2905
2906 CRegDWORD regTime = CRegDWORD(_T("Software\\TortoiseGit\\git_file_time"));
2907 CRegDWORD regVersion = CRegDWORD(_T("Software\\TortoiseGit\\git_cached_version"));
2908
2909 CString gitpath = CGit::ms_LastMsysGitDir+_T("\\git.exe");
2910
2911 __int64 time=0;
2912 if(!g_Git.GetFileModifyTime(gitpath, &time) && !versionstr)
2913 {
2914 if((DWORD)time == regTime)
2915 {
2916 return regVersion;
2917 }
2918 }
2919
2920 if(versionstr)
2921 version = *versionstr;
2922 else
2923 {
2924 CString err;
2925 cmd = _T("git.exe --version");
2926 if (g_Git.Run(cmd, &version, &err, CP_UTF8))
2927 {
2928 CMessageBox::Show(NULL, _T("git have not installed (") + err + _T(")"), _T("TortoiseGit"), MB_OK|MB_ICONERROR);
2929 return false;
2930 }
2931 }
2932
2933 int start=0;
2934 int ver = 0;
2935
2936 versiondebug = version;
2937
2938 try
2939 {
2940 CString str=version.Tokenize(_T("."), start);
2941 int space = str.ReverseFind(_T(' '));
2942 str = str.Mid(space+1,start);
2943 ver = _ttol(str);
2944 ver <<=24;
2945
2946 version = version.Mid(start);
2947 start = 0;
2948
2949 str = version.Tokenize(_T("."), start);
2950
2951 ver |= (_ttol(str) & 0xFF) << 16;
2952
2953 str = version.Tokenize(_T("."), start);
2954 ver |= (_ttol(str) & 0xFF) << 8;
2955
2956 str = version.Tokenize(_T("."), start);
2957 ver |= (_ttol(str) & 0xFF);
2958 }
2959 catch(...)
2960 {
2961 if (!ver)
2962 {
2963 CMessageBox::Show(NULL, _T("Could not parse git.exe version number: \"") + versiondebug + _T("\""), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2964 return false;
2965 }
2966 }
2967
2968 regTime = time&0xFFFFFFFF;
2969 regVersion = ver;
2970
2971 return ver;
2972 }
2973
2974 void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd)
2975 {
2976 typedef HRESULT (WINAPI *SHGPSFW) (HWND hwnd,REFIID riid,void** ppv);
2977
2978 CAutoLibrary hShell = AtlLoadSystemLibraryUsingFullPath(_T("Shell32.dll"));
2979
2980 if (hShell.IsValid()) {
2981 SHGPSFW pfnSHGPSFW = (SHGPSFW)::GetProcAddress(hShell, "SHGetPropertyStoreForWindow");
2982 if (pfnSHGPSFW) {
2983 IPropertyStore *pps;
2984 HRESULT hr = pfnSHGPSFW(hWnd, IID_PPV_ARGS(&pps));
2985 if (SUCCEEDED(hr)) {
2986 PROPVARIANT var;
2987 var.vt = VT_BOOL;
2988 var.boolVal = VARIANT_TRUE;
2989 hr = pps->SetValue(PKEY_AppUserModel_PreventPinning, var);
2990 pps->Release();
2991 }
2992 }
2993 }
2994 }
2995
2996 void CAppUtils::SetWindowTitle(HWND hWnd, const CString& urlorpath, const CString& dialogname)
2997 {
2998 ASSERT(dialogname.GetLength() < 70);
2999 ASSERT(urlorpath.GetLength() < MAX_PATH);
3000 WCHAR pathbuf[MAX_PATH] = {0};
3001
3002 PathCompactPathEx(pathbuf, urlorpath, 70 - dialogname.GetLength(), 0);
3003
3004 wcscat_s(pathbuf, L" - ");
3005 wcscat_s(pathbuf, dialogname);
3006 wcscat_s(pathbuf, L" - ");
3007 wcscat_s(pathbuf, CString(MAKEINTRESOURCE(IDS_APPNAME)));
3008 SetWindowText(hWnd, pathbuf);
3009 }
3010
3011 bool CAppUtils::BisectStart(CString lastGood, CString firstBad, bool autoClose)
3012 {
3013 if (!g_Git.CheckCleanWorkTree())
3014 {
3015 if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
3016 {
3017 CSysProgressDlg sysProgressDlg;
3018 sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
3019 sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
3020 sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
3021 sysProgressDlg.SetShowProgressBar(false);
3022 sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
3023 sysProgressDlg.ShowModeless((HWND)NULL, true);
3024
3025 CString cmd, out;
3026 cmd = _T("git.exe stash");
3027 if (g_Git.Run(cmd, &out, CP_UTF8))
3028 {
3029 sysProgressDlg.Stop();
3030 CMessageBox::Show(NULL, out, _T("TortoiseGit"), MB_OK);
3031 return false;
3032 }
3033 sysProgressDlg.Stop();
3034 }
3035 else
3036 return false;
3037 }
3038
3039 CBisectStartDlg bisectStartDlg;
3040
3041 if (!lastGood.IsEmpty())
3042 bisectStartDlg.m_sLastGood = lastGood;
3043 if (!firstBad.IsEmpty())
3044 bisectStartDlg.m_sFirstBad = firstBad;
3045
3046 if (bisectStartDlg.DoModal() == IDOK)
3047 {
3048 CProgressDlg progress;
3049 theApp.m_pMainWnd = &progress;
3050 progress.m_bAutoCloseOnSuccess = autoClose;
3051 progress.m_GitCmdList.push_back(_T("git.exe bisect start"));
3052 progress.m_GitCmdList.push_back(_T("git.exe bisect good ") + bisectStartDlg.m_LastGoodRevision);
3053 progress.m_GitCmdList.push_back(_T("git.exe bisect bad ") + bisectStartDlg.m_FirstBadRevision);
3054
3055 CTGitPath path(g_Git.m_CurrentDir);
3056
3057 if (path.HasSubmodules())
3058 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE)));
3059
3060 INT_PTR ret = progress.DoModal();
3061 if (path.HasSubmodules() && ret == IDC_PROGRESS_BUTTON1)
3062 {
3063 CString sCmd;
3064 sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
3065
3066 CAppUtils::RunTortoiseGitProc(sCmd);
3067 return true;
3068 }
3069 else if (ret == IDOK)
3070 return true;
3071 }
3072
3073 return false;
3074 }
3075
3076 int CAppUtils::Git2GetUserPassword(git_cred **out, const char *url, const char *username_from_url, unsigned int /*allowed_types*/, void * /*payload*/)
3077 {
3078 CUserPassword dlg;
3079 dlg.m_URL = CUnicodeUtils::GetUnicode(url, CP_UTF8);
3080 if (username_from_url)
3081 dlg.m_UserName = CUnicodeUtils::GetUnicode(username_from_url, CP_UTF8);
3082
3083 CStringA username, password;
3084 if (dlg.DoModal() == IDOK)
3085 {
3086 username = CUnicodeUtils::GetMulti(dlg.m_UserName, CP_UTF8);
3087 password = CUnicodeUtils::GetMulti(dlg.m_Password, CP_UTF8);
3088 return git_cred_userpass_plaintext_new(out, username, password);
3089 }
3090 return -1;
3091 }
Windows Explorer Extension to Operate Git