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