1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2011 - TortoiseSVN
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.
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.
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.
22 #include "TortoiseProc.h"
23 #include "PathUtils.h"
25 //#include "GitProperties.h"
26 #include "StringUtils.h"
27 #include "MessageBox.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"
45 #include "DeleteConflictDlg.h"
46 #include "ChangedDlg.h"
47 #include "SendMailDlg.h"
48 #include "GITProgressDlg.h"
50 #include "CommitDlg.h"
53 #include "..\Settings\Settings.h"
55 #include "SVNDCommitDlg.h"
56 #include "requestpulldlg.h"
57 #include "PullFetchDlg.h"
58 #include "RebaseDlg.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"
67 CAppUtils::CAppUtils(void)
71 CAppUtils::~CAppUtils(void)
75 bool CAppUtils::StashSave()
79 if (dlg
.DoModal() == IDOK
)
82 cmd
= _T("git.exe stash save");
84 if (CAppUtils::GetMsysgitVersion() >= 0x01070700)
86 if (dlg
.m_bIncludeUntracked
)
87 cmd
+= _T(" --include-untracked");
92 if (!dlg
.m_sMessage
.IsEmpty())
94 CString message
= dlg
.m_sMessage
;
95 message
.Replace(_T("\""), _T("\"\""));
96 cmd
+= _T(" \"") + message
+ _T("\"");
99 CSysProgressDlg sysProgressDlg
;
100 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
101 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
102 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
103 sysProgressDlg
.SetShowProgressBar(false);
104 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
105 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
107 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
109 sysProgressDlg
.Stop();
110 CMessageBox::Show(NULL
, CString(MAKEINTRESOURCE(IDS_PROC_STASHFAILED
)) + _T("\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
114 sysProgressDlg
.Stop();
115 CMessageBox::Show(NULL
, CString(MAKEINTRESOURCE(IDS_PROC_STASHSUCCESS
)) + _T("\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
122 bool CAppUtils::StashApply(CString ref
, bool showChanges
/* true */)
125 cmd
= _T("git.exe stash apply ");
126 if (ref
.Find(_T("refs/")) == 0)
128 if (ref
.Find(_T("stash{")) == 0)
129 ref
= _T("stash@") + ref
.Mid(5);
132 CSysProgressDlg sysProgressDlg
;
133 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
134 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
135 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
136 sysProgressDlg
.SetShowProgressBar(false);
137 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
138 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
140 int ret
= g_Git
.Run(cmd
, &out
, CP_UTF8
);
142 sysProgressDlg
.Stop();
144 bool hasConflicts
= (out
.Find(_T("CONFLICT")) >= 0);
145 if (ret
&& !(ret
== 1 && hasConflicts
))
147 CMessageBox::Show(NULL
, CString(MAKEINTRESOURCE(IDS_PROC_STASHAPPLYFAILED
)) + _T("\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
152 message
.LoadString(IDS_PROC_STASHAPPLYSUCCESS
);
154 message
.LoadString(IDS_PROC_STASHAPPLYFAILEDCONFLICTS
);
157 if(CMessageBox::Show(NULL
,message
+ _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES
))
158 ,_T("TortoiseGit"),MB_YESNO
|MB_ICONINFORMATION
) == IDYES
)
161 dlg
.m_pathList
.AddPath(CTGitPath());
168 CMessageBox::Show(NULL
, message
,_T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
175 bool CAppUtils::StashPop(bool showChanges
/* true */)
178 cmd
=_T("git.exe stash pop ");
180 CSysProgressDlg sysProgressDlg
;
181 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
182 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
183 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
184 sysProgressDlg
.SetShowProgressBar(false);
185 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
186 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
188 int ret
= g_Git
.Run(cmd
, &out
, CP_UTF8
);
190 sysProgressDlg
.Stop();
192 bool hasConflicts
= (out
.Find(_T("CONFLICT")) >= 0);
193 if (ret
&& !(ret
== 1 && hasConflicts
))
195 CMessageBox::Show(NULL
,CString(MAKEINTRESOURCE(IDS_PROC_STASHPOPFAILED
)) + _T("\n") + out
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
200 message
.LoadString(IDS_PROC_STASHPOPSUCCESS
);
202 message
.LoadString(IDS_PROC_STASHPOPFAILEDCONFLICTS
);
205 if(CMessageBox::Show(NULL
,CString(message
+ _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES
)))
206 ,_T("TortoiseGit"),MB_YESNO
|MB_ICONINFORMATION
) == IDYES
)
209 dlg
.m_pathList
.AddPath(CTGitPath());
216 CMessageBox::Show(NULL
, message
,_T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
223 bool CAppUtils::GetMimeType(const CTGitPath
& /*file*/, CString
& /*mimetype*/)
226 GitProperties
props(file
, GitRev::REV_WC
, false);
227 for (int i
= 0; i
< props
.GetCount(); ++i
)
229 if (props
.GetItemName(i
).compare(_T("svn:mime-type"))==0)
231 mimetype
= props
.GetItemValue(i
).c_str();
239 BOOL
CAppUtils::StartExtMerge(
240 const CTGitPath
& basefile
, const CTGitPath
& theirfile
, const CTGitPath
& yourfile
, const CTGitPath
& mergedfile
,
241 const CString
& basename
, const CString
& theirname
, const CString
& yourname
, const CString
& mergedname
, bool bReadOnly
)
244 CRegString regCom
= CRegString(_T("Software\\TortoiseGit\\Merge"));
245 CString ext
= mergedfile
.GetFileExtension();
246 CString com
= regCom
;
247 bool bInternal
= false;
252 // is there an extension specific merge tool?
253 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext
.MakeLower());
254 if (CString(mergetool
) != "")
259 if (GetMimeType(yourfile
, mimetype
) || GetMimeType(theirfile
, mimetype
) || GetMimeType(basefile
, mimetype
))
261 // is there a mime type specific merge tool?
262 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype
);
263 if (CString(mergetool
) != "")
268 // is there a filename specific merge tool?
269 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\.") + mergedfile
.GetFilename().MakeLower());
270 if (CString(mergetool
) != "")
275 if (com
.IsEmpty()||(com
.Left(1).Compare(_T("#"))==0))
279 CRegString
tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE
);
280 com
= tortoiseMergePath
;
283 com
= CPathUtils::GetAppDirectory();
284 com
+= _T("TortoiseMerge.exe");
286 com
= _T("\"") + com
+ _T("\"");
287 com
= com
+ _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
288 com
= com
+ _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
290 // check if the params are set. If not, just add the files to the command line
291 if ((com
.Find(_T("%merged"))<0)&&(com
.Find(_T("%base"))<0)&&(com
.Find(_T("%theirs"))<0)&&(com
.Find(_T("%mine"))<0))
293 com
+= _T(" \"")+basefile
.GetWinPathString()+_T("\"");
294 com
+= _T(" \"")+theirfile
.GetWinPathString()+_T("\"");
295 com
+= _T(" \"")+yourfile
.GetWinPathString()+_T("\"");
296 com
+= _T(" \"")+mergedfile
.GetWinPathString()+_T("\"");
298 if (basefile
.IsEmpty())
300 com
.Replace(_T("/base:%base"), _T(""));
301 com
.Replace(_T("%base"), _T(""));
304 com
.Replace(_T("%base"), _T("\"") + basefile
.GetWinPathString() + _T("\""));
305 if (theirfile
.IsEmpty())
307 com
.Replace(_T("/theirs:%theirs"), _T(""));
308 com
.Replace(_T("%theirs"), _T(""));
311 com
.Replace(_T("%theirs"), _T("\"") + theirfile
.GetWinPathString() + _T("\""));
312 if (yourfile
.IsEmpty())
314 com
.Replace(_T("/mine:%mine"), _T(""));
315 com
.Replace(_T("%mine"), _T(""));
318 com
.Replace(_T("%mine"), _T("\"") + yourfile
.GetWinPathString() + _T("\""));
319 if (mergedfile
.IsEmpty())
321 com
.Replace(_T("/merged:%merged"), _T(""));
322 com
.Replace(_T("%merged"), _T(""));
325 com
.Replace(_T("%merged"), _T("\"") + mergedfile
.GetWinPathString() + _T("\""));
326 if (basename
.IsEmpty())
328 if (basefile
.IsEmpty())
330 com
.Replace(_T("/basename:%bname"), _T(""));
331 com
.Replace(_T("%bname"), _T(""));
335 com
.Replace(_T("%bname"), _T("\"") + basefile
.GetUIFileOrDirectoryName() + _T("\""));
339 com
.Replace(_T("%bname"), _T("\"") + basename
+ _T("\""));
340 if (theirname
.IsEmpty())
342 if (theirfile
.IsEmpty())
344 com
.Replace(_T("/theirsname:%tname"), _T(""));
345 com
.Replace(_T("%tname"), _T(""));
349 com
.Replace(_T("%tname"), _T("\"") + theirfile
.GetUIFileOrDirectoryName() + _T("\""));
353 com
.Replace(_T("%tname"), _T("\"") + theirname
+ _T("\""));
354 if (yourname
.IsEmpty())
356 if (yourfile
.IsEmpty())
358 com
.Replace(_T("/minename:%yname"), _T(""));
359 com
.Replace(_T("%yname"), _T(""));
363 com
.Replace(_T("%yname"), _T("\"") + yourfile
.GetUIFileOrDirectoryName() + _T("\""));
367 com
.Replace(_T("%yname"), _T("\"") + yourname
+ _T("\""));
368 if (mergedname
.IsEmpty())
370 if (mergedfile
.IsEmpty())
372 com
.Replace(_T("/mergedname:%mname"), _T(""));
373 com
.Replace(_T("%mname"), _T(""));
377 com
.Replace(_T("%mname"), _T("\"") + mergedfile
.GetUIFileOrDirectoryName() + _T("\""));
381 com
.Replace(_T("%mname"), _T("\"") + mergedname
+ _T("\""));
383 if ((bReadOnly
)&&(bInternal
))
384 com
+= _T(" /readonly");
386 if(!LaunchApplication(com
, IDS_ERR_EXTMERGESTART
, false))
394 BOOL
CAppUtils::StartExtPatch(const CTGitPath
& patchfile
, const CTGitPath
& dir
, const CString
& sOriginalDescription
, const CString
& sPatchedDescription
, BOOL bReversed
, BOOL bWait
)
398 viewer
= CPathUtils::GetAppDirectory();
399 viewer
+= _T("TortoiseMerge.exe");
401 viewer
= _T("\"") + viewer
+ _T("\"");
402 viewer
= viewer
+ _T(" /diff:\"") + patchfile
.GetWinPathString() + _T("\"");
403 viewer
= viewer
+ _T(" /patchpath:\"") + dir
.GetWinPathString() + _T("\"");
405 viewer
+= _T(" /reversedpatch");
406 if (!sOriginalDescription
.IsEmpty())
407 viewer
= viewer
+ _T(" /patchoriginal:\"") + sOriginalDescription
+ _T("\"");
408 if (!sPatchedDescription
.IsEmpty())
409 viewer
= viewer
+ _T(" /patchpatched:\"") + sPatchedDescription
+ _T("\"");
410 if(!LaunchApplication(viewer
, IDS_ERR_DIFFVIEWSTART
, !!bWait
))
417 CString
CAppUtils::PickDiffTool(const CTGitPath
& file1
, const CTGitPath
& file2
)
419 CString difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file2
.GetFilename().MakeLower());
420 if (!difftool
.IsEmpty())
422 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file1
.GetFilename().MakeLower());
423 if (!difftool
.IsEmpty())
426 // Is there a mime type specific diff tool?
428 if (GetMimeType(file1
, mimetype
) || GetMimeType(file2
, mimetype
))
430 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype
);
431 if (!difftool
.IsEmpty())
435 // Is there an extension specific diff tool?
436 CString ext
= file2
.GetFileExtension().MakeLower();
439 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext
);
440 if (!difftool
.IsEmpty())
442 // Maybe we should use TortoiseIDiff?
443 if ((ext
== _T(".jpg")) || (ext
== _T(".jpeg")) ||
444 (ext
== _T(".bmp")) || (ext
== _T(".gif")) ||
445 (ext
== _T(".png")) || (ext
== _T(".ico")) ||
446 (ext
== _T(".dib")) || (ext
== _T(".emf")))
449 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseIDiff.exe") + _T("\"") +
450 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname");
454 // Finally, pick a generic external diff tool
455 difftool
= CRegString(_T("Software\\TortoiseGit\\Diff"));
459 bool CAppUtils::StartExtDiff(
460 const CString
& file1
, const CString
& file2
,
461 const CString
& sName1
, const CString
& sName2
,
462 const CString
& originalFile1
, const CString
& originalFile2
,
463 const git_revnum_t
& hash1
, const git_revnum_t
& hash2
,
464 const DiffFlags
& flags
)
468 CRegDWORD
blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE
);
469 if (!flags
.bBlame
|| !(DWORD
)blamediff
)
471 viewer
= PickDiffTool(file1
, file2
);
472 // If registry entry for a diff program is commented out, use TortoiseMerge.
473 bool bCommentedOut
= viewer
.Left(1) == _T("#");
474 if (flags
.bAlternativeTool
)
476 // Invert external vs. internal diff tool selection.
478 viewer
.Delete(0); // uncomment
482 else if (bCommentedOut
)
486 bool bInternal
= viewer
.IsEmpty();
490 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseMerge.exe") + _T("\"") +
491 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
493 viewer
+= _T(" /blame");
495 // check if the params are set. If not, just add the files to the command line
496 if ((viewer
.Find(_T("%base"))<0)&&(viewer
.Find(_T("%mine"))<0))
498 viewer
+= _T(" \"")+file1
+_T("\"");
499 viewer
+= _T(" \"")+file2
+_T("\"");
501 if (viewer
.Find(_T("%base")) >= 0)
503 viewer
.Replace(_T("%base"), _T("\"")+file1
+_T("\""));
505 if (viewer
.Find(_T("%mine")) >= 0)
507 viewer
.Replace(_T("%mine"), _T("\"")+file2
+_T("\""));
510 if (sName1
.IsEmpty())
511 viewer
.Replace(_T("%bname"), _T("\"") + file1
+ _T("\""));
513 viewer
.Replace(_T("%bname"), _T("\"") + sName1
+ _T("\""));
515 if (sName2
.IsEmpty())
516 viewer
.Replace(_T("%yname"), _T("\"") + file2
+ _T("\""));
518 viewer
.Replace(_T("%yname"), _T("\"") + sName2
+ _T("\""));
520 viewer
.Replace(_T("%bpath"), _T("\"") + originalFile1
+ _T("\""));
521 viewer
.Replace(_T("%ypath"), _T("\"") + originalFile2
+ _T("\""));
523 viewer
.Replace(_T("%brev"), _T("\"") + hash1
+ _T("\""));
524 viewer
.Replace(_T("%yrev"), _T("\"") + hash2
+ _T("\""));
526 if (flags
.bReadOnly
&& bInternal
)
527 viewer
+= _T(" /readonly");
529 return LaunchApplication(viewer
, IDS_ERR_EXTDIFFSTART
, flags
.bWait
);
532 BOOL
CAppUtils::StartUnifiedDiffViewer(const CString
& patchfile
, const CString
& title
, BOOL bWait
)
535 CRegString v
= CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
537 if (viewer
.IsEmpty() || (viewer
.Left(1).Compare(_T("#"))==0))
540 viewer
= CPathUtils::GetAppDirectory();
541 viewer
+= _T("TortoiseUDiff.exe");
542 // enquote the path to TortoiseUDiff
543 viewer
= _T("\"") + viewer
+ _T("\"");
545 viewer
= viewer
+ _T(" /patchfile:%1 /title:\"%title\"");
548 if (viewer
.Find(_T("%1"))>=0)
550 if (viewer
.Find(_T("\"%1\"")) >= 0)
551 viewer
.Replace(_T("%1"), patchfile
);
553 viewer
.Replace(_T("%1"), _T("\"") + patchfile
+ _T("\""));
556 viewer
+= _T(" \"") + patchfile
+ _T("\"");
557 if (viewer
.Find(_T("%title")) >= 0)
559 viewer
.Replace(_T("%title"), title
);
562 if(!LaunchApplication(viewer
, IDS_ERR_DIFFVIEWSTART
, !!bWait
))
569 BOOL
CAppUtils::StartTextViewer(CString file
)
572 CRegString txt
= CRegString(_T(".txt\\"), _T(""), FALSE
, HKEY_CLASSES_ROOT
);
574 viewer
= viewer
+ _T("\\Shell\\Open\\Command\\");
575 CRegString txtexe
= CRegString(viewer
, _T(""), FALSE
, HKEY_CLASSES_ROOT
);
578 DWORD len
= ExpandEnvironmentStrings(viewer
, NULL
, 0);
579 TCHAR
* buf
= new TCHAR
[len
+1];
580 ExpandEnvironmentStrings(viewer
, buf
, len
);
583 len
= ExpandEnvironmentStrings(file
, NULL
, 0);
584 buf
= new TCHAR
[len
+1];
585 ExpandEnvironmentStrings(file
, buf
, len
);
588 file
= _T("\"")+file
+_T("\"");
589 if (viewer
.IsEmpty())
591 viewer
= _T("RUNDLL32 Shell32,OpenAs_RunDLL");
593 if (viewer
.Find(_T("\"%1\"")) >= 0)
595 viewer
.Replace(_T("\"%1\""), file
);
597 else if (viewer
.Find(_T("%1")) >= 0)
599 viewer
.Replace(_T("%1"), file
);
607 if(!LaunchApplication(viewer
, IDS_ERR_TEXTVIEWSTART
, false))
614 BOOL
CAppUtils::CheckForEmptyDiff(const CTGitPath
& sDiffPath
)
617 CAutoFile hFile
= ::CreateFile(sDiffPath
.GetWinPath(), GENERIC_READ
, FILE_SHARE_READ
| FILE_SHARE_WRITE
, NULL
, OPEN_EXISTING
, NULL
, NULL
);
620 length
= ::GetFileSize(hFile
, NULL
);
627 void CAppUtils::CreateFontForLogs(CFont
& fontToCreate
)
630 HDC hScreenDC
= ::GetDC(NULL
);
631 logFont
.lfHeight
= -MulDiv((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC
, LOGPIXELSY
), 72);
632 ::ReleaseDC(NULL
, hScreenDC
);
634 logFont
.lfEscapement
= 0;
635 logFont
.lfOrientation
= 0;
636 logFont
.lfWeight
= FW_NORMAL
;
637 logFont
.lfItalic
= 0;
638 logFont
.lfUnderline
= 0;
639 logFont
.lfStrikeOut
= 0;
640 logFont
.lfCharSet
= DEFAULT_CHARSET
;
641 logFont
.lfOutPrecision
= OUT_DEFAULT_PRECIS
;
642 logFont
.lfClipPrecision
= CLIP_DEFAULT_PRECIS
;
643 logFont
.lfQuality
= DRAFT_QUALITY
;
644 logFont
.lfPitchAndFamily
= FF_DONTCARE
| FIXED_PITCH
;
645 _tcscpy_s(logFont
.lfFaceName
, 32, (LPCTSTR
)(CString
)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
646 VERIFY(fontToCreate
.CreateFontIndirect(&logFont
));
649 bool CAppUtils::LaunchPAgent(CString
*keyfile
,CString
* pRemote
)
663 cmd
.Format(_T("remote.%s.puttykeyfile"),remote
);
664 key
= g_Git
.GetConfigValue(cmd
);
666 key
= key
.Tokenize(_T("\n"),start
);
674 CString proc
=CPathUtils::GetAppDirectory();
675 proc
+= _T("pageant.exe \"");
679 CString tempfile
= GetTempFile();
680 ::DeleteFile(tempfile
);
682 proc
+= _T(" -c \"");
683 proc
+= CPathUtils::GetAppDirectory();
684 proc
+= _T("touch.exe\"");
689 CString appDir
= CPathUtils::GetAppDirectory();
690 bool b
= LaunchApplication(proc
, IDS_ERR_PAGEANT
, true, &appDir
);
695 while(!::PathFileExists(tempfile
))
700 break; //timeout 5 minutes
705 CMessageBox::Show(NULL
, IDS_ERR_PAEGENTTIMEOUT
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
707 ::DeleteFile(tempfile
);
710 bool CAppUtils::LaunchAlternativeEditor(const CString
& filename
, bool uac
)
712 CString editTool
= CRegString(_T("Software\\TortoiseGit\\AlternativeEditor"));
713 if (editTool
.IsEmpty() || (editTool
.Left(1).Compare(_T("#"))==0)) {
714 editTool
= CPathUtils::GetAppDirectory() + _T("notepad2.exe");
718 sCmd
.Format(_T("\"%s\" \"%s\""), editTool
, filename
);
720 LaunchApplication(sCmd
, NULL
, false, NULL
, uac
);
723 bool CAppUtils::LaunchRemoteSetting()
725 CTGitPath
path(g_Git
.m_CurrentDir
);
726 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
, &path
);
727 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
728 dlg
.SetTreeWidth(220);
729 dlg
.m_DefaultPage
= _T("gitremote");
736 * Launch the external blame viewer
738 bool CAppUtils::LaunchTortoiseBlame(const CString
& sBlameFile
,CString Rev
,const CString
& sParams
)
740 CString viewer
= _T("\"") + CPathUtils::GetAppDirectory();
741 viewer
+= _T("TortoiseGitBlame.exe");
742 viewer
+= _T("\" \"") + sBlameFile
+ _T("\"");
743 //viewer += _T(" \"") + sLogFile + _T("\"");
744 //viewer += _T(" \"") + sOriginalFile + _T("\"");
745 if(!Rev
.IsEmpty() && Rev
!= GIT_REV_ZERO
)
746 viewer
+= CString(_T(" /rev:"))+Rev
;
747 viewer
+= _T(" ")+sParams
;
749 return LaunchApplication(viewer
, IDS_ERR_TGITBLAME
, false);
752 bool CAppUtils::FormatTextInRichEditControl(CWnd
* pWnd
)
757 bool bStyled
= false;
758 pWnd
->GetWindowText(sText
);
759 // the rich edit control doesn't count the CR char!
760 // to be exact: CRLF is treated as one char.
763 // style each line separately
768 nNewlinePos
= sText
.Find('\n', offset
);
769 CString sLine
= sText
.Mid(offset
);
771 sLine
= sLine
.Left(nNewlinePos
-offset
);
774 while (FindStyleChars(sLine
, '*', start
, end
))
776 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
777 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
779 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
780 format
.cbSize
= sizeof(CHARFORMAT2
);
781 format
.dwMask
= CFM_BOLD
;
782 format
.dwEffects
= CFE_BOLD
;
783 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
789 while (FindStyleChars(sLine
, '^', start
, end
))
791 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
792 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
794 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
795 format
.cbSize
= sizeof(CHARFORMAT2
);
796 format
.dwMask
= CFM_ITALIC
;
797 format
.dwEffects
= CFE_ITALIC
;
798 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
804 while (FindStyleChars(sLine
, '_', start
, end
))
806 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
807 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
809 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
810 format
.cbSize
= sizeof(CHARFORMAT2
);
811 format
.dwMask
= CFM_UNDERLINE
;
812 format
.dwEffects
= CFE_UNDERLINE
;
813 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
817 offset
= nNewlinePos
+1;
818 } while(nNewlinePos
>=0);
822 bool CAppUtils::FindStyleChars(const CString
& sText
, TCHAR stylechar
, int& start
, int& end
)
825 bool bFoundMarker
= false;
826 // find a starting marker
827 while (sText
[i
] != 0)
829 if (sText
[i
] == stylechar
)
831 if (((i
+1)<sText
.GetLength())&&(IsCharAlphaNumeric(sText
[i
+1])) &&
832 (((i
>0)&&(!IsCharAlphaNumeric(sText
[i
-1])))||(i
==0)))
844 // find ending marker
845 bFoundMarker
= false;
846 while (sText
[i
] != 0)
848 if (sText
[i
] == stylechar
)
850 if ((IsCharAlphaNumeric(sText
[i
-1])) &&
851 ((((i
+1)<sText
.GetLength())&&(!IsCharAlphaNumeric(sText
[i
+1])))||(i
+1)==sText
.GetLength()))
864 CString
CAppUtils::GetProjectNameFromURL(CString url
)
867 while (name
.IsEmpty() || (name
.CompareNoCase(_T("branches"))==0) ||
868 (name
.CompareNoCase(_T("tags"))==0) ||
869 (name
.CompareNoCase(_T("trunk"))==0))
871 name
= url
.Mid(url
.ReverseFind('/')+1);
872 url
= url
.Left(url
.ReverseFind('/'));
874 if ((name
.Compare(_T("svn")) == 0)||(name
.Compare(_T("svnroot")) == 0))
876 // a name of svn or svnroot indicates that it's not really the project name. In that
877 // case, we try the first part of the URL
878 // of course, this won't work in all cases (but it works for Google project hosting)
879 url
.Replace(_T("http://"), _T(""));
880 url
.Replace(_T("https://"), _T(""));
881 url
.Replace(_T("svn://"), _T(""));
882 url
.Replace(_T("svn+ssh://"), _T(""));
883 url
.TrimLeft(_T("/"));
884 name
= url
.Left(url
.Find('.'));
889 bool CAppUtils::StartShowUnifiedDiff(HWND
/*hWnd*/, const CTGitPath
& url1
, const git_revnum_t
& rev1
,
890 const CTGitPath
& /*url2*/, const git_revnum_t
& rev2
,
891 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
892 bool /*bAlternateDiff*/ /* = false */, bool /*bIgnoreAncestry*/ /* = false */, bool /* blame = false */, bool bMerge
)
895 CString tempfile
=GetTempFile();
897 if(rev2
== GitRev::GetWorkingCopy())
899 cmd
.Format(_T("git.exe diff --stat -p %s "), rev1
);
901 else if (rev1
== GitRev::GetWorkingCopy())
903 cmd
.Format(_T("git.exe diff -R --stat -p %s "), rev2
);
911 cmd
.Format(_T("git.exe diff-tree -r -p %s --stat %s %s"),merge
, rev1
,rev2
);
914 if( !url1
.IsEmpty() )
917 cmd
+= url1
.GetGitPathString();
920 g_Git
.RunLogFile(cmd
,tempfile
);
921 CAppUtils::StartUnifiedDiffViewer(tempfile
, rev1
+ _T(":") + rev2
);
926 sCmd
.Format(_T("%s /command:showcompare /unified"),
927 (LPCTSTR
)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));
928 sCmd
+= _T(" /url1:\"") + url1
.GetGitPathString() + _T("\"");
930 sCmd
+= _T(" /revision1:") + rev1
.ToString();
931 sCmd
+= _T(" /url2:\"") + url2
.GetGitPathString() + _T("\"");
933 sCmd
+= _T(" /revision2:") + rev2
.ToString();
935 sCmd
+= _T(" /pegrevision:") + peg
.ToString();
936 if (headpeg
.IsValid())
937 sCmd
+= _T(" /headpegrevision:") + headpeg
.ToString();
940 sCmd
+= _T(" /alternatediff");
943 sCmd
+= _T(" /ignoreancestry");
947 sCmd
+= _T(" /hwnd:");
949 _stprintf_s(buf
, 30, _T("%d"), hWnd
);
953 return CAppUtils::LaunchApplication(sCmd
, NULL
, false);
958 bool CAppUtils::SetupDiffScripts(bool force
, const CString
& type
)
960 CString scriptsdir
= CPathUtils::GetAppParentDirectory();
961 scriptsdir
+= _T("Diff-Scripts");
962 CSimpleFileFind
files(scriptsdir
);
963 while (files
.FindNextFileNoDirectories())
965 CString file
= files
.GetFilePath();
966 CString filename
= files
.GetFileName();
967 CString ext
= file
.Mid(file
.ReverseFind('-') + 1);
968 ext
= _T(".") + ext
.Left(ext
.ReverseFind('.'));
969 std::set
<CString
> extensions
;
970 extensions
.insert(ext
);
972 if (file
.Right(3).CompareNoCase(_T("vbs"))==0)
974 kind
= _T(" //E:vbscript");
976 if (file
.Right(2).CompareNoCase(_T("js"))==0)
978 kind
= _T(" //E:javascript");
980 // open the file, read the first line and find possible extensions
981 // this script can handle
984 CStdioFile
f(file
, CFile::modeRead
| CFile::shareDenyNone
);
986 if (f
.ReadString(extline
))
988 if ((extline
.GetLength() > 15 ) &&
989 ((extline
.Left(15).Compare(_T("// extensions: ")) == 0) ||
990 (extline
.Left(14).Compare(_T("' extensions: ")) == 0)))
992 if (extline
[0] == '/')
993 extline
= extline
.Mid(15);
995 extline
= extline
.Mid(14);
998 sToken
= extline
.Tokenize(_T(";"), curPos
);
999 while (!sToken
.IsEmpty())
1001 if (!sToken
.IsEmpty())
1003 if (sToken
[0] != '.')
1004 sToken
= _T(".") + sToken
;
1005 extensions
.insert(sToken
);
1007 sToken
= extline
.Tokenize(_T(";"), curPos
);
1013 catch (CFileException
* e
)
1018 for (std::set
<CString
>::const_iterator it
= extensions
.begin(); it
!= extensions
.end(); ++it
)
1020 if (type
.IsEmpty() || (type
.Compare(_T("Diff")) == 0))
1022 if (filename
.Left(5).CompareNoCase(_T("diff-")) == 0)
1024 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + *it
);
1025 CString diffregstring
= diffreg
;
1026 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1027 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %base %mine") + kind
;
1030 if (type
.IsEmpty() || (type
.Compare(_T("Merge"))==0))
1032 if (filename
.Left(6).CompareNoCase(_T("merge-"))==0)
1034 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\MergeTools\\") + *it
);
1035 CString diffregstring
= diffreg
;
1036 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1037 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %merged %theirs %mine %base") + kind
;
1046 bool CAppUtils::Export(CString
*BashHash
)
1048 // ask from where the export has to be done
1051 dlg
.m_Revision
=*BashHash
;
1053 if (dlg
.DoModal() == IDOK
)
1056 cmd
.Format(_T("git.exe archive --output=\"%s\" --format=zip --verbose %s"),
1057 dlg
.m_strExportDirectory
, g_Git
.FixBranchName(dlg
.m_VersionName
));
1061 return (pro
.DoModal() == IDOK
);
1066 bool CAppUtils::CreateBranchTag(bool IsTag
,CString
*CommitHash
, bool switch_new_brach
)
1068 CCreateBranchTagDlg dlg
;
1070 dlg
.m_bSwitch
=switch_new_brach
;
1073 dlg
.m_initialRefName
= *CommitHash
;
1075 if(dlg
.DoModal()==IDOK
)
1080 if(dlg
.m_bTrack
== TRUE
)
1081 track
=_T(" --track ");
1082 else if(dlg
.m_bTrack
== FALSE
)
1083 track
=_T(" --no-track");
1094 cmd
.Format(_T("git.exe tag %s %s %s %s"),
1097 dlg
.m_BranchTagName
,
1098 g_Git
.FixBranchName(dlg
.m_VersionName
)
1101 CString tempfile
=::GetTempFile();
1102 if(!dlg
.m_Message
.Trim().IsEmpty())
1104 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_Message
);
1105 cmd
+= _T(" -F ")+tempfile
;
1110 cmd
.Format(_T("git.exe branch %s %s %s %s"),
1113 dlg
.m_BranchTagName
,
1114 g_Git
.FixBranchName(dlg
.m_VersionName
)
1118 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1120 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1123 if( !IsTag
&& dlg
.m_bSwitch
)
1125 // it is a new branch and the user has requested to switch to it
1126 cmd
.Format(_T("git.exe checkout %s"), dlg
.m_BranchTagName
);
1127 g_Git
.Run(cmd
,&out
,CP_UTF8
);
1128 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1136 bool CAppUtils::Switch(CString initialRefName
, bool autoclose
)
1139 if(!initialRefName
.IsEmpty())
1140 dlg
.m_initialRefName
= initialRefName
;
1142 if (dlg
.DoModal() == IDOK
)
1146 branch
= dlg
.m_NewBranch
;
1148 // if refs/heads/ is not stripped, checkout will detach HEAD
1149 // checkout prefers branches on name clashes (with tags)
1150 if (dlg
.m_VersionName
.Left(11) ==_T("refs/heads/") && dlg
.m_bBranchOverride
!= TRUE
)
1151 dlg
.m_VersionName
= dlg
.m_VersionName
.Mid(11);
1153 return PerformSwitch(dlg
.m_VersionName
, dlg
.m_bForce
== TRUE
, branch
, dlg
.m_bBranchOverride
== TRUE
, dlg
.m_bTrack
, autoclose
);
1158 bool CAppUtils::PerformSwitch(CString ref
, bool bForce
/* false */, CString sNewBranch
/* CString() */, bool bBranchOverride
/* false */, BOOL bTrack
/* 2 */, bool autoClose
/* false */)
1165 if(!sNewBranch
.IsEmpty()){
1166 if (bBranchOverride
)
1168 branch
.Format(_T("-B %s"), sNewBranch
);
1172 branch
.Format(_T("-b %s"), sNewBranch
);
1175 track
= _T("--track");
1176 else if (bTrack
== FALSE
)
1177 track
= _T("--no-track");
1182 cmd
.Format(_T("git.exe checkout %s %s %s %s"),
1186 g_Git
.FixBranchName(ref
));
1188 CProgressDlg progress
;
1189 progress
.m_bAutoCloseOnSuccess
= autoClose
;
1190 progress
.m_GitCmd
= cmd
;
1192 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1193 if (gitPath
.HasSubmodules())
1194 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1196 INT_PTR ret
= progress
.DoModal();
1197 if (gitPath
.HasSubmodules() && ret
== IDC_PROGRESS_BUTTON1
)
1200 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1202 RunTortoiseProc(sCmd
);
1205 else if (ret
== IDOK
)
1211 bool CAppUtils::OpenIgnoreFile(CStdioFile
&file
, const CString
& filename
)
1213 if (!file
.Open(filename
, CFile::modeCreate
| CFile::modeReadWrite
| CFile::modeNoTruncate
))
1215 CMessageBox::Show(NULL
, filename
+ _T(" Open Failure"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1219 if (file
.GetLength() > 0)
1221 file
.Seek(file
.GetLength() - 1, 0);
1222 auto_buffer
<TCHAR
> buf(1);
1225 if (buf
[0] != _T('\n'))
1226 file
.WriteString(_T("\n"));
1234 bool CAppUtils::IgnoreFile(CTGitPathList
&path
,bool IsMask
)
1236 CIgnoreDlg ignoreDlg
;
1237 if (ignoreDlg
.DoModal() == IDOK
)
1240 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\");
1242 switch (ignoreDlg
.m_IgnoreFile
)
1245 ignorefile
+= _T(".gitignore");
1248 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, ignorefile
);
1249 ignorefile
+= _T("info/exclude");
1256 if (ignoreDlg
.m_IgnoreFile
!= 1 && !OpenIgnoreFile(file
, ignorefile
))
1259 for (int i
= 0; i
< path
.GetCount(); i
++)
1261 if (ignoreDlg
.m_IgnoreFile
== 1)
1263 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\") + path
[i
].GetContainingDirectory().GetWinPathString() + _T("\\.gitignore");
1264 if (!OpenIgnoreFile(file
, ignorefile
))
1268 CString ignorePattern
;
1269 if (ignoreDlg
.m_IgnoreType
== 0)
1271 if (ignoreDlg
.m_IgnoreFile
!= 1 && !path
[i
].GetContainingDirectory().GetGitPathString().IsEmpty())
1272 ignorePattern
+= _T("/") + path
[i
].GetContainingDirectory().GetGitPathString();
1274 ignorePattern
+= _T("/");
1278 ignorePattern
+= _T("*") + path
[i
].GetFileExtension();
1282 ignorePattern
+= path
[i
].GetFileOrDirectoryName();
1285 // escape [ and ] so that files get ignored correctly
1286 ignorePattern
.Replace(_T("["), _T("\\["));
1287 ignorePattern
.Replace(_T("]"), _T("\\]"));
1289 ignorePattern
+= _T("\n");
1290 CStringA ignorePatternA
= CUnicodeUtils::GetUTF8(ignorePattern
);
1291 file
.Write(ignorePatternA
.GetBuffer(), ignorePatternA
.GetLength());
1292 ignorePatternA
.ReleaseBuffer();
1294 if (ignoreDlg
.m_IgnoreFile
== 1)
1298 if (ignoreDlg
.m_IgnoreFile
!= 1)
1313 bool CAppUtils::GitReset(CString
*CommitHash
,int type
)
1316 dlg
.m_ResetType
=type
;
1317 dlg
.m_ResetToVersion
=*CommitHash
;
1318 if (dlg
.DoModal() == IDOK
)
1322 switch(dlg
.m_ResetType
)
1337 cmd
.Format(_T("git.exe reset %s %s"),type
, *CommitHash
);
1341 CProgressDlg progress
;
1342 progress
.m_GitCmd
=cmd
;
1344 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1345 if (gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2)
1346 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1348 progress
.m_PostFailCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MSGBOX_RETRY
)));
1350 INT_PTR ret
= progress
.DoModal();
1351 if (progress
.m_GitStatus
== 0 && gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2 && ret
== IDC_PROGRESS_BUTTON1
)
1354 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1356 RunTortoiseProc(sCmd
);
1359 else if (progress
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
1361 else if (ret
== IDOK
)
1370 void CAppUtils::DescribeFile(bool mode
, bool base
,CString
&descript
)
1374 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_DELETE
));
1379 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED
));
1382 descript
= CString(MAKEINTRESOURCE(IDS_PROC_CREATED
));
1386 void CAppUtils::RemoveTempMergeFile(CTGitPath
&path
)
1388 CString tempmergefile
;
1391 tempmergefile
= CAppUtils::GetMergeTempFile(_T("LOCAL"),path
);
1392 CFile::Remove(tempmergefile
);
1399 tempmergefile
= CAppUtils::GetMergeTempFile(_T("REMOTE"),path
);
1400 CFile::Remove(tempmergefile
);
1407 tempmergefile
= CAppUtils::GetMergeTempFile(_T("BASE"),path
);
1408 CFile::Remove(tempmergefile
);
1413 CString
CAppUtils::GetMergeTempFile(CString type
,CTGitPath
&merge
)
1416 file
=g_Git
.m_CurrentDir
+_T("\\") + merge
.GetWinPathString()+_T(".")+type
+merge
.GetFileExtension();
1421 bool CAppUtils::ConflictEdit(CTGitPath
&path
,bool /*bAlternativeTool*/,bool revertTheirMy
)
1425 CTGitPath merge
=path
;
1426 CTGitPath directory
= merge
.GetDirectory();
1428 // we have the conflicted file (%merged)
1429 // now look for the other required files
1431 //stat.GetStatus(merge);
1432 //if (stat.status == NULL)
1438 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge
.GetGitPathString());
1440 if (g_Git
.Run(cmd
, &vector
))
1446 list
.ParserFromLsFile(vector
);
1448 if(list
.GetCount() == 0)
1457 mine
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1458 theirs
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1462 mine
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1463 theirs
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1465 base
.SetFromGit(GetMergeTempFile(_T("BASE"),merge
));
1469 //format=_T("git.exe cat-file blob \":%d:%s\"");
1470 format
= _T("git checkout-index --temp --stage=%d -- \"%s\"");
1472 //create a empty file, incase stage is not three
1473 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1475 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1477 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1480 bool b_base
=false, b_local
=false, b_remote
=false;
1482 for(int i
=0;i
<list
.GetCount();i
++)
1489 if( list
[i
].m_Stage
== 1)
1491 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1493 outfile
= base
.GetWinPathString();
1496 if( list
[i
].m_Stage
== 2 )
1498 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1500 outfile
= mine
.GetWinPathString();
1503 if( list
[i
].m_Stage
== 3 )
1505 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1507 outfile
= theirs
.GetWinPathString();
1509 CString output
, err
;
1510 if(!outfile
.IsEmpty())
1511 if (!g_Git
.Run(cmd
, &output
, &err
, CP_UTF8
))
1515 file
= output
.Tokenize(_T("\t"), start
);
1516 ::MoveFileEx(file
,outfile
,MOVEFILE_REPLACE_EXISTING
|MOVEFILE_COPY_ALLOWED
);
1520 CMessageBox::Show(NULL
, output
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1524 if(b_local
&& b_remote
)
1526 merge
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+merge
.GetWinPathString());
1528 bRet
= !!CAppUtils::StartExtMerge(base
, mine
, theirs
, merge
, _T("BASE"), _T("REMOTE"), _T("LOCAL"));
1530 bRet
= !!CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"), _T("REMOTE"), _T("LOCAL"));
1535 CFile::Remove(mine
.GetWinPathString());
1536 CFile::Remove(theirs
.GetWinPathString());
1537 CFile::Remove(base
.GetWinPathString());
1539 CDeleteConflictDlg dlg
;
1540 DescribeFile(b_local
, b_base
,dlg
.m_LocalStatus
);
1541 DescribeFile(b_remote
,b_base
,dlg
.m_RemoteStatus
);
1542 dlg
.m_bShowModifiedButton
=b_base
;
1543 dlg
.m_File
=merge
.GetGitPathString();
1544 if(dlg
.DoModal() == IDOK
)
1549 cmd
.Format(_T("git.exe rm -- \"%s\""),merge
.GetGitPathString());
1552 cmd
.Format(_T("git.exe add -- \"%s\""),merge
.GetGitPathString());
1554 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1556 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1566 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1567 base
, theirs
, mine
, merge
);
1570 if (stat
.status
->text_status
== svn_wc_status_conflicted
)
1572 // we have a text conflict, use our merge tool to resolve the conflict
1574 CTSVNPath
theirs(directory
);
1575 CTSVNPath
mine(directory
);
1576 CTSVNPath
base(directory
);
1577 bool bConflictData
= false;
1579 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_new
))
1581 theirs
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_new
));
1582 bConflictData
= true;
1584 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_old
))
1586 base
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_old
));
1587 bConflictData
= true;
1589 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_wrk
))
1591 mine
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_wrk
));
1592 bConflictData
= true;
1599 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1600 base
, theirs
, mine
, merge
);
1603 if (stat
.status
->prop_status
== svn_wc_status_conflicted
)
1605 // we have a property conflict
1606 CTSVNPath
prej(directory
);
1607 if ((stat
.status
->entry
)&&(stat
.status
->entry
->prejfile
))
1609 prej
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->prejfile
));
1610 // there's a problem: the prej file contains a _description_ of the conflict, and
1611 // that description string might be translated. That means we have no way of parsing
1612 // the file to find out the conflicting values.
1613 // The only thing we can do: show a dialog with the conflict description, then
1614 // let the user either accept the existing property or open the property edit dialog
1615 // to manually change the properties and values. And a button to mark the conflict as
1617 CEditPropConflictDlg dlg
;
1618 dlg
.SetPrejFile(prej
);
1619 dlg
.SetConflictedItem(merge
);
1620 bRet
= (dlg
.DoModal() != IDCANCEL
);
1624 if (stat
.status
->tree_conflict
)
1626 // we have a tree conflict
1628 const SVNInfoData
* pInfoData
= info
.GetFirstFileInfo(merge
, SVNRev(), SVNRev());
1631 if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_text
)
1633 CTSVNPath
theirs(directory
);
1634 CTSVNPath
mine(directory
);
1635 CTSVNPath
base(directory
);
1636 bool bConflictData
= false;
1638 if (pInfoData
->treeconflict_theirfile
)
1640 theirs
.AppendPathString(pInfoData
->treeconflict_theirfile
);
1641 bConflictData
= true;
1643 if (pInfoData
->treeconflict_basefile
)
1645 base
.AppendPathString(pInfoData
->treeconflict_basefile
);
1646 bConflictData
= true;
1648 if (pInfoData
->treeconflict_myfile
)
1650 mine
.AppendPathString(pInfoData
->treeconflict_myfile
);
1651 bConflictData
= true;
1658 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1659 base
, theirs
, mine
, merge
);
1661 else if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_tree
)
1663 CString sConflictAction
;
1664 CString sConflictReason
;
1665 CString sResolveTheirs
;
1666 CString sResolveMine
;
1667 CTSVNPath treeConflictPath
= CTSVNPath(pInfoData
->treeconflict_path
);
1668 CString sItemName
= treeConflictPath
.GetUIFileOrDirectoryName();
1670 if (pInfoData
->treeconflict_nodekind
== svn_node_file
)
1672 switch (pInfoData
->treeconflict_operation
)
1674 case svn_wc_operation_update
:
1675 switch (pInfoData
->treeconflict_action
)
1677 case svn_wc_conflict_action_edit
:
1678 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEEDIT
, (LPCTSTR
)sItemName
);
1679 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1681 case svn_wc_conflict_action_add
:
1682 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEADD
, (LPCTSTR
)sItemName
);
1683 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1685 case svn_wc_conflict_action_delete
:
1686 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEDELETE
, (LPCTSTR
)sItemName
);
1687 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1691 case svn_wc_operation_switch
:
1692 switch (pInfoData
->treeconflict_action
)
1694 case svn_wc_conflict_action_edit
:
1695 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHEDIT
, (LPCTSTR
)sItemName
);
1696 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1698 case svn_wc_conflict_action_add
:
1699 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHADD
, (LPCTSTR
)sItemName
);
1700 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1702 case svn_wc_conflict_action_delete
:
1703 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHDELETE
, (LPCTSTR
)sItemName
);
1704 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1708 case svn_wc_operation_merge
:
1709 switch (pInfoData
->treeconflict_action
)
1711 case svn_wc_conflict_action_edit
:
1712 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEEDIT
, (LPCTSTR
)sItemName
);
1713 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1715 case svn_wc_conflict_action_add
:
1716 sResolveTheirs
.Format(IDS_TREECONFLICT_FILEMERGEADD
, (LPCTSTR
)sItemName
);
1717 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1719 case svn_wc_conflict_action_delete
:
1720 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEDELETE
, (LPCTSTR
)sItemName
);
1721 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1727 else if (pInfoData
->treeconflict_nodekind
== svn_node_dir
)
1729 switch (pInfoData
->treeconflict_operation
)
1731 case svn_wc_operation_update
:
1732 switch (pInfoData
->treeconflict_action
)
1734 case svn_wc_conflict_action_edit
:
1735 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEEDIT
, (LPCTSTR
)sItemName
);
1736 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1738 case svn_wc_conflict_action_add
:
1739 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEADD
, (LPCTSTR
)sItemName
);
1740 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1742 case svn_wc_conflict_action_delete
:
1743 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEDELETE
, (LPCTSTR
)sItemName
);
1744 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1748 case svn_wc_operation_switch
:
1749 switch (pInfoData
->treeconflict_action
)
1751 case svn_wc_conflict_action_edit
:
1752 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHEDIT
, (LPCTSTR
)sItemName
);
1753 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1755 case svn_wc_conflict_action_add
:
1756 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHADD
, (LPCTSTR
)sItemName
);
1757 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1759 case svn_wc_conflict_action_delete
:
1760 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHDELETE
, (LPCTSTR
)sItemName
);
1761 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1765 case svn_wc_operation_merge
:
1766 switch (pInfoData
->treeconflict_action
)
1768 case svn_wc_conflict_action_edit
:
1769 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEEDIT
, (LPCTSTR
)sItemName
);
1770 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1772 case svn_wc_conflict_action_add
:
1773 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEADD
, (LPCTSTR
)sItemName
);
1774 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1776 case svn_wc_conflict_action_delete
:
1777 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEDELETE
, (LPCTSTR
)sItemName
);
1778 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1786 switch (pInfoData
->treeconflict_reason
)
1788 case svn_wc_conflict_reason_edited
:
1789 uReasonID
= IDS_TREECONFLICT_REASON_EDITED
;
1790 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1792 case svn_wc_conflict_reason_obstructed
:
1793 uReasonID
= IDS_TREECONFLICT_REASON_OBSTRUCTED
;
1794 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1796 case svn_wc_conflict_reason_deleted
:
1797 uReasonID
= IDS_TREECONFLICT_REASON_DELETED
;
1798 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1800 case svn_wc_conflict_reason_added
:
1801 uReasonID
= IDS_TREECONFLICT_REASON_ADDED
;
1802 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1804 case svn_wc_conflict_reason_missing
:
1805 uReasonID
= IDS_TREECONFLICT_REASON_MISSING
;
1806 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1808 case svn_wc_conflict_reason_unversioned
:
1809 uReasonID
= IDS_TREECONFLICT_REASON_UNVERSIONED
;
1810 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1813 sConflictReason
.Format(uReasonID
, (LPCTSTR
)sConflictAction
);
1815 CTreeConflictEditorDlg dlg
;
1816 dlg
.SetConflictInfoText(sConflictReason
);
1817 dlg
.SetResolveTexts(sResolveTheirs
, sResolveMine
);
1818 dlg
.SetPath(treeConflictPath
);
1819 INT_PTR dlgRet
= dlg
.DoModal();
1820 bRet
= (dlgRet
!= IDCANCEL
);
1828 bool CAppUtils::IsSSHPutty()
1830 CString sshclient
=g_Git
.m_Environment
.GetEnv(_T("GIT_SSH"));
1831 sshclient
=sshclient
.MakeLower();
1832 if(sshclient
.Find(_T("plink.exe"),0)>=0)
1839 CString
CAppUtils::GetClipboardLink()
1841 if (!OpenClipboard(NULL
))
1844 CString sClipboardText
;
1845 HGLOBAL hglb
= GetClipboardData(CF_TEXT
);
1848 LPCSTR lpstr
= (LPCSTR
)GlobalLock(hglb
);
1849 sClipboardText
= CString(lpstr
);
1852 hglb
= GetClipboardData(CF_UNICODETEXT
);
1855 LPCTSTR lpstr
= (LPCTSTR
)GlobalLock(hglb
);
1856 sClipboardText
= lpstr
;
1861 if(!sClipboardText
.IsEmpty())
1863 if(sClipboardText
[0] == _T('\"') && sClipboardText
[sClipboardText
.GetLength()-1] == _T('\"'))
1864 sClipboardText
=sClipboardText
.Mid(1,sClipboardText
.GetLength()-2);
1866 if(sClipboardText
.Find( _T("http://")) == 0)
1867 return sClipboardText
;
1869 if(sClipboardText
.Find( _T("https://")) == 0)
1870 return sClipboardText
;
1872 if(sClipboardText
.Find( _T("git://")) == 0)
1873 return sClipboardText
;
1875 if(sClipboardText
.Find( _T("ssh://")) == 0)
1876 return sClipboardText
;
1878 if(sClipboardText
.GetLength()>=2)
1879 if( sClipboardText
[1] == _T(':') )
1880 if( (sClipboardText
[0] >= 'A' && sClipboardText
[0] <= 'Z')
1881 || (sClipboardText
[0] >= 'a' && sClipboardText
[0] <= 'z') )
1882 return sClipboardText
;
1885 return CString(_T(""));
1888 CString
CAppUtils::ChooseRepository(CString
*path
)
1890 CBrowseFolder browseFolder
;
1891 CRegString regLastResopitory
= CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\LastRepo"),_T(""));
1893 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
1894 CString strCloneDirectory
;
1896 strCloneDirectory
=*path
;
1899 strCloneDirectory
= regLastResopitory
;
1903 title
.LoadString(IDS_CHOOSE_REPOSITORY
);
1905 browseFolder
.SetInfo(title
);
1907 if (browseFolder
.Show(NULL
, strCloneDirectory
) == CBrowseFolder::OK
)
1909 regLastResopitory
= strCloneDirectory
;
1910 return strCloneDirectory
;
1918 bool CAppUtils::SendPatchMail(CTGitPathList
&list
,bool autoclose
)
1922 dlg
.m_PathList
= list
;
1924 if(dlg
.DoModal()==IDOK
)
1926 if(dlg
.m_PathList
.GetCount() == 0)
1929 CGitProgressDlg progDlg
;
1931 theApp
.m_pMainWnd
= &progDlg
;
1932 progDlg
.SetCommand(CGitProgressDlg::GitProgress_SendMail
);
1934 progDlg
.SetAutoClose(autoclose
);
1936 progDlg
.SetPathList(dlg
.m_PathList
);
1937 //ProjectProperties props;
1938 //props.ReadPropsPathList(dlg.m_pathList);
1939 //progDlg.SetProjectProperties(props);
1940 progDlg
.SetItemCount(dlg
.m_PathList
.GetCount());
1943 if(dlg
.m_bAttachment
)
1944 flags
|= SENDMAIL_ATTACHMENT
;
1946 flags
|= SENDMAIL_COMBINED
;
1948 flags
|= SENDMAIL_MAPI
;
1950 progDlg
.SetSendMailOption(dlg
.m_To
,dlg
.m_CC
,dlg
.m_Subject
,flags
);
1959 bool CAppUtils::SendPatchMail(CString
&cmd
,CString
&formatpatchoutput
,bool autoclose
)
1962 CString log
=formatpatchoutput
;
1963 int start
=log
.Find(cmd
);
1965 CString one
=log
.Tokenize(_T("\n"),start
);
1971 CString one
=log
.Tokenize(_T("\n"),start
);
1973 if(one
.IsEmpty() || one
.Find(_T("Success")) == 0)
1975 one
.Replace(_T('/'),_T('\\'));
1977 path
.SetFromWin(one
);
1980 if (list
.GetCount() > 0)
1982 return SendPatchMail(list
, autoclose
);
1986 CMessageBox::Show(NULL
, IDS_ERR_NOPATCHES
, IDS_APPNAME
, MB_ICONINFORMATION
);
1992 int CAppUtils::GetLogOutputEncode(CGit
*pGit
)
1997 output
= pGit
->GetConfigValue(_T("i18n.logOutputEncoding"));
1998 if(output
.IsEmpty())
2000 output
= pGit
->GetConfigValue(_T("i18n.commitencoding"));
2001 if(output
.IsEmpty())
2005 output
=output
.Tokenize(_T("\n"),start
);
2006 return CUnicodeUtils::GetCPCode(output
);
2011 output
=output
.Tokenize(_T("\n"),start
);
2012 return CUnicodeUtils::GetCPCode(output
);
2015 int CAppUtils::GetCommitTemplate(CString
&temp
)
2019 output
= g_Git
.GetConfigValue(_T("commit.template"), CP_UTF8
);
2020 if( output
.IsEmpty() )
2023 if( output
.GetLength()<1)
2026 if( output
[0] == _T('/'))
2028 if(output
.GetLength()>=3)
2029 if(output
[2] == _T('/'))
2031 output
.GetBuffer()[0] = output
[1];
2032 output
.GetBuffer()[1] = _T(':');
2037 output
=output
.Tokenize(_T("\n"),start
);
2039 output
.Replace(_T('/'),_T('\\'));
2043 CStdioFile
file(output
,CFile::modeRead
|CFile::typeText
);
2045 while(file
.ReadString(str
))
2056 int CAppUtils::SaveCommitUnicodeFile(CString
&filename
, CString
&message
)
2058 CFile
file(filename
,CFile::modeReadWrite
|CFile::modeCreate
);
2062 output
= g_Git
.GetConfigValue(_T("i18n.commitencoding"));
2063 if(output
.IsEmpty())
2067 output
=output
.Tokenize(_T("\n"),start
);
2068 cp
=CUnicodeUtils::GetCPCode(output
);
2070 int len
=message
.GetLength();
2073 buf
= new char[len
*4 + 4];
2074 SecureZeroMemory(buf
, (len
*4 + 4));
2076 int lengthIncTerminator
= WideCharToMultiByte(cp
, 0, message
, -1, buf
, len
*4, NULL
, NULL
);
2078 file
.Write(buf
,lengthIncTerminator
-1);
2084 bool CAppUtils::Fetch(CString remoteName
, bool allowRebase
, bool autoClose
)
2087 dlg
.m_PreSelectRemote
= remoteName
;
2088 dlg
.m_bAllowRebase
= allowRebase
;
2091 if(dlg
.DoModal()==IDOK
)
2095 if (dlg
.m_bAllRemotes
)
2098 g_Git
.GetRemoteList(list
);
2100 STRING_VECTOR::const_iterator it
= list
.begin();
2101 while (it
!= list
.end())
2103 CString
remote(*it
);
2104 CAppUtils::LaunchPAgent(NULL
, &remote
);
2109 CAppUtils::LaunchPAgent(NULL
, &dlg
.m_RemoteURL
);
2113 url
=dlg
.m_RemoteURL
;
2117 int ver
= CAppUtils::GetMsysgitVersion();
2119 if(ver
>= 0x01070203) //above 1.7.0.2
2120 arg
= _T("--progress ");
2123 arg
+= _T("--prune ");
2126 if (dlg
.m_bFetchTags
== 1)
2128 arg
+= _T("--tags ");
2130 else if (dlg
.m_bFetchTags
== 0)
2132 arg
+= _T("--no-tags ");
2135 if (dlg
.m_bAllRemotes
)
2136 cmd
.Format(_T("git.exe fetch --all -v %s"), arg
);
2138 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"), arg
, url
, dlg
.m_RemoteBranchName
);
2140 CProgressDlg progress
;
2142 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2144 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2146 if(!dlg
.m_bRebase
&& !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
))
2148 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2151 progress
.m_GitCmd
=cmd
;
2152 INT_PTR userResponse
= progress
.DoModal();
2154 if (userResponse
== IDC_PROGRESS_BUTTON1
)
2156 CString cmd
= _T("/command:log");
2157 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2158 RunTortoiseProc(cmd
);
2161 else if ((userResponse
== IDC_PROGRESS_BUTTON1
+ 1) || (progress
.m_GitStatus
== 0 && dlg
.m_bRebase
))
2166 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2167 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUDESSENDMAIL
)));
2168 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2169 INT_PTR response
= dlg
.DoModal();
2170 if(response
== IDOK
)
2174 else if (response
== IDC_REBASE_POST_BUTTON
)
2176 CString cmd
= _T("/command:log");
2177 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2178 RunTortoiseProc(cmd
);
2181 else if (response
== IDC_REBASE_POST_BUTTON
+ 1)
2183 CString cmd
, out
, err
;
2184 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
2186 g_Git
.FixBranchName(dlg
.m_Upstream
),
2187 g_Git
.FixBranchName(dlg
.m_Branch
));
2188 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
2190 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
2194 CAppUtils::SendPatchMail(cmd
,out
);
2197 else if (response
== IDC_REBASE_POST_BUTTON
+ 2)
2199 else if(response
== IDCANCEL
)
2204 else if (userResponse
!= IDCANCEL
)
2210 bool CAppUtils::Push(CString selectLocalBranch
, bool autoClose
)
2213 dlg
.m_BranchSourceName
= selectLocalBranch
;
2215 DWORD exitcode
= 0xFFFFFFFF;
2217 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
2218 if (CHooks::Instance().PrePush(list
,exitcode
, error
))
2223 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2224 //ReportError(temp);
2225 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2230 if(dlg
.DoModal()==IDOK
)
2235 arg
+= _T("--thin ");
2236 if(dlg
.m_bTags
&& !dlg
.m_bPushAllBranches
)
2237 arg
+= _T("--tags ");
2239 arg
+= _T("--force ");
2240 if (dlg
.m_bSetUpstream
)
2241 arg
+= _T("--set-upstream ");
2243 int ver
= CAppUtils::GetMsysgitVersion();
2245 if(ver
>= 0x01070203) //above 1.7.0.2
2246 arg
+= _T("--progress ");
2248 CProgressDlg progress
;
2249 progress
.m_bAutoCloseOnSuccess
=autoClose
;
2251 STRING_VECTOR remotesList
;
2252 if (dlg
.m_bPushAllRemotes
)
2253 g_Git
.GetRemoteList(remotesList
);
2255 remotesList
.push_back(dlg
.m_URL
);
2257 for (unsigned int i
= 0; i
< remotesList
.size(); i
++)
2259 if (dlg
.m_bAutoLoad
)
2260 CAppUtils::LaunchPAgent(NULL
, &remotesList
[i
]);
2263 if (dlg
.m_bPushAllBranches
)
2265 cmd
.Format(_T("git.exe push --all %s \"%s\""),
2271 cmd
.Format(_T("git.exe push %s \"%s\" %s"),
2274 dlg
.m_BranchSourceName
);
2275 if (!dlg
.m_BranchRemoteName
.IsEmpty())
2277 cmd
+= _T(":") + dlg
.m_BranchRemoteName
;
2280 progress
.m_GitCmdList
.push_back(cmd
);
2283 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REQUESTPULL
)));
2284 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
2285 INT_PTR ret
= progress
.DoModal();
2287 if(!progress
.m_GitStatus
)
2289 if (CHooks::Instance().PostPush(list
,exitcode
, error
))
2294 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2295 //ReportError(temp);
2296 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2300 if(ret
== IDC_PROGRESS_BUTTON1
)
2302 RequestPull(dlg
.m_BranchRemoteName
);
2304 else if(ret
== IDC_PROGRESS_BUTTON1
+ 1)
2315 bool CAppUtils::RequestPull(CString endrevision
, CString repositoryUrl
)
2317 CRequestPullDlg dlg
;
2318 dlg
.m_RepositoryURL
= repositoryUrl
;
2319 dlg
.m_EndRevision
= endrevision
;
2320 if (dlg
.DoModal()==IDOK
)
2323 cmd
.Format(_T("git.exe request-pull %s \"%s\" %s"), dlg
.m_StartRevision
, dlg
.m_RepositoryURL
, dlg
.m_EndRevision
);
2325 CSysProgressDlg sysProgressDlg
;
2326 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2327 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_CREATINGPULLREUQEST
)));
2328 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2329 sysProgressDlg
.SetShowProgressBar(false);
2330 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2332 CString tempFileName
= GetTempFile();
2333 if (g_Git
.RunLogFile(cmd
, tempFileName
))
2335 CMessageBox::Show(NULL
, IDS_ERR_PULLREUQESTFAILED
, IDS_APPNAME
, MB_OK
);
2339 if (sysProgressDlg
.HasUserCancelled())
2341 CMessageBox::Show(NULL
, IDS_SVN_USERCANCELLED
, IDS_APPNAME
, MB_OK
);
2342 ::DeleteFile(tempFileName
);
2346 sysProgressDlg
.Stop();
2348 CAppUtils::LaunchAlternativeEditor(tempFileName
);
2353 bool CAppUtils::CreateMultipleDirectory(const CString
& szPath
)
2355 CString
strDir(szPath
);
2356 if (strDir
.GetAt(strDir
.GetLength()-1)!=_T('\\'))
2358 strDir
.AppendChar(_T('\\'));
2360 std::vector
<CString
> vPath
;
2362 bool bSuccess
= false;
2364 for (int i
=0;i
<strDir
.GetLength();++i
)
2366 if (strDir
.GetAt(i
) != _T('\\'))
2368 strTemp
.AppendChar(strDir
.GetAt(i
));
2372 vPath
.push_back(strTemp
);
2373 strTemp
.AppendChar(_T('\\'));
2377 std::vector
<CString
>::const_iterator vIter
;
2378 for (vIter
= vPath
.begin(); vIter
!= vPath
.end(); vIter
++)
2380 bSuccess
= CreateDirectory(*vIter
, NULL
) ? true : false;
2386 void CAppUtils::RemoveTrailSlash(CString
&path
)
2391 while(path
[path
.GetLength()-1] == _T('\\') || path
[path
.GetLength()-1] == _T('/' ) )
2393 path
=path
.Left(path
.GetLength()-1);
2399 bool CAppUtils::CheckUserData()
2401 while(g_Git
.GetUserName().IsEmpty() || g_Git
.GetUserEmail().IsEmpty())
2403 if(CMessageBox::Show(NULL
, IDS_PROC_NOUSERDATA
, IDS_APPNAME
, MB_YESNO
| MB_ICONERROR
) == IDYES
)
2405 CTGitPath
path(g_Git
.m_CurrentDir
);
2406 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
,&path
);
2407 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
2408 dlg
.SetTreeWidth(220);
2409 dlg
.m_DefaultPage
= _T("gitconfig");
2412 dlg
.HandleRestart();
2422 BOOL
CAppUtils::Commit(CString bugid
,BOOL bWholeProject
,CString
&sLogMsg
,
2423 CTGitPathList
&pathList
,
2424 CTGitPathList
&selectedList
,
2425 bool bSelectFilesForCommit
,
2428 bool bFailed
= true;
2430 if (!CheckUserData())
2437 dlg
.m_sBugID
= bugid
;
2439 dlg
.m_bWholeProject
= bWholeProject
;
2441 dlg
.m_sLogMessage
= sLogMsg
;
2442 dlg
.m_pathList
= pathList
;
2443 dlg
.m_checkedPathList
= selectedList
;
2444 dlg
.m_bSelectFilesForCommit
= bSelectFilesForCommit
;
2445 dlg
.m_bAutoClose
= autoClose
;
2446 if (dlg
.DoModal() == IDOK
)
2448 if (dlg
.m_pathList
.GetCount()==0)
2450 // if the user hasn't changed the list of selected items
2451 // we don't use that list. Because if we would use the list
2452 // of pre-checked items, the dialog would show different
2453 // checked items on the next startup: it would only try
2454 // to check the parent folder (which might not even show)
2455 // instead, we simply use an empty list and let the
2456 // default checking do its job.
2457 if (!dlg
.m_pathList
.IsEqual(pathList
))
2458 selectedList
= dlg
.m_pathList
;
2459 pathList
= dlg
.m_updatedPathList
;
2460 sLogMsg
= dlg
.m_sLogMessage
;
2461 bSelectFilesForCommit
= true;
2463 if( dlg
.m_bPushAfterCommit
)
2465 switch(dlg
.m_PostCmd
)
2467 case GIT_POST_CMD_DCOMMIT
:
2468 CAppUtils::SVNDCommit();
2474 else if (dlg
.m_bCreateTagAfterCommit
)
2476 CAppUtils::CreateBranchTag(TRUE
);
2479 // CGitProgressDlg progDlg;
2480 // progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);
2481 // if (parser.HasVal(_T("closeonend")))
2482 // progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
2483 // progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);
2484 // progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);
2485 // progDlg.SetPathList(dlg.m_pathList);
2486 // progDlg.SetCommitMessage(dlg.m_sLogMessage);
2487 // progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);
2488 // progDlg.SetSelectedList(dlg.m_selectedPathList);
2489 // progDlg.SetItemCount(dlg.m_itemsCount);
2490 // progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);
2491 // progDlg.DoModal();
2492 // CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
2493 // err = (DWORD)progDlg.DidErrorsOccur();
2494 // bFailed = progDlg.DidErrorsOccur();
2495 // bRet = progDlg.DidErrorsOccur();
2496 // CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);
2497 // if (DWORD(bFailRepeat)==0)
2498 // bFailed = false; // do not repeat if the user chose not to in the settings.
2505 BOOL
CAppUtils::SVNDCommit()
2507 CSVNDCommitDlg dcommitdlg
;
2508 CString gitSetting
= g_Git
.GetConfigValue(_T("svn.rmdir"));
2509 if (gitSetting
== _T("")) {
2510 if (dcommitdlg
.DoModal() != IDOK
)
2516 if (dcommitdlg
.m_remember
)
2518 if (dcommitdlg
.m_rmdir
)
2520 gitSetting
= _T("true");
2524 gitSetting
= _T("false");
2526 if(g_Git
.SetConfigValue(_T("svn.rmdir"),gitSetting
))
2529 msg
.Format(IDS_PROC_SAVECONFIGFAILED
, _T("svn.rmdir"), gitSetting
);
2530 CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
2536 BOOL IsStash
= false;
2537 if(!g_Git
.CheckCleanWorkTree())
2539 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
2541 CSysProgressDlg sysProgressDlg
;
2542 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2543 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2544 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2545 sysProgressDlg
.SetShowProgressBar(false);
2546 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2547 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2550 cmd
=_T("git.exe stash");
2551 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2553 sysProgressDlg
.Stop();
2554 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2557 sysProgressDlg
.Stop();
2567 CProgressDlg progress
;
2568 if (dcommitdlg
.m_rmdir
)
2570 progress
.m_GitCmd
=_T("git.exe svn dcommit --rmdir");
2574 progress
.m_GitCmd
=_T("git.exe svn dcommit");
2576 if(progress
.DoModal()==IDOK
&& progress
.m_GitStatus
== 0)
2580 if(CMessageBox::Show(NULL
,IDS_DCOMMIT_STASH_POP
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
2582 CSysProgressDlg sysProgressDlg
;
2583 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2584 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2585 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2586 sysProgressDlg
.SetShowProgressBar(false);
2587 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2588 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2591 cmd
=_T("git.exe stash pop");
2592 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2594 sysProgressDlg
.Stop();
2595 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2598 sysProgressDlg
.Stop();
2610 BOOL
CAppUtils::Merge(CString
*commit
)
2614 dlg
.m_initialRefName
= *commit
;
2616 if(dlg
.DoModal()==IDOK
)
2628 squash
=_T("--squash");
2631 nocommit
=_T("--no-commit");
2633 if(!dlg
.m_strLogMesage
.IsEmpty())
2635 CString logmsg
= dlg
.m_strLogMesage
;
2636 logmsg
.Replace(_T("\""), _T("\\\""));
2637 msg
+= _T("-m \"") + logmsg
+ _T("\"");
2639 cmd
.Format(_T("git.exe merge %s %s %s %s %s"),
2644 g_Git
.FixBranchName(dlg
.m_VersionName
));
2646 CProgressDlg Prodlg
;
2647 Prodlg
.m_GitCmd
= cmd
;
2649 if (dlg
.m_bNoCommit
)
2650 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUCOMMIT
)));
2651 else if (dlg
.m_bIsBranch
)
2652 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REMOVEBRANCH
)));
2654 INT_PTR ret
= Prodlg
.DoModal();
2656 if (ret
== IDC_PROGRESS_BUTTON1
)
2657 if (dlg
.m_bNoCommit
)
2660 CTGitPathList pathList
;
2661 CTGitPathList selectedList
;
2662 return Commit(_T(""), TRUE
, sLogMsg
, pathList
, selectedList
, true);
2664 else if (dlg
.m_bIsBranch
)
2667 msg
.Format(IDS_PROC_DELETEBRANCHTAG
, dlg
.m_VersionName
);
2668 if (CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), 2, IDI_QUESTION
, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 1)
2671 cmd
.Format(_T("git.exe branch -D -- %s"), dlg
.m_VersionName
);
2672 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2673 MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
);
2677 return !Prodlg
.m_GitStatus
;
2682 void CAppUtils::EditNote(GitRev
*rev
)
2684 if (!CheckUserData())
2688 dlg
.m_sHintText
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
2689 dlg
.m_sInputText
= rev
->m_Notes
;
2690 dlg
.m_sTitle
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
2691 //dlg.m_pProjectProperties = &m_ProjectProperties;
2692 dlg
.m_bUseLogWidth
= true;
2693 if(dlg
.DoModal() == IDOK
)
2696 cmd
=_T("notes add -f -F \"");
2698 CString tempfile
=::GetTempFile();
2699 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_sInputText
);
2702 cmd
+= rev
->m_CommitHash
.ToString();
2706 if (git_run_cmd("notes", CUnicodeUtils::GetMulti(cmd
, CP_UTF8
).GetBuffer()))
2708 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2713 rev
->m_Notes
= dlg
.m_sInputText
;
2717 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2719 CFile::Remove(tempfile
);
2724 int CAppUtils::GetMsysgitVersion(CString
*versionstr
)
2727 CString versiondebug
;
2730 CRegDWORD regTime
= CRegDWORD(_T("Software\\TortoiseGit\\git_file_time"));
2731 CRegDWORD regVersion
= CRegDWORD(_T("Software\\TortoiseGit\\git_cached_version"));
2733 CString gitpath
= CGit::ms_LastMsysGitDir
+_T("\\git.exe");
2736 if(!g_Git
.GetFileModifyTime(gitpath
, &time
) && !versionstr
)
2738 if((DWORD
)time
== regTime
)
2745 version
= *versionstr
;
2749 cmd
= _T("git.exe --version");
2750 if (g_Git
.Run(cmd
, &version
, &err
, CP_UTF8
))
2752 CMessageBox::Show(NULL
, _T("git have not installed (") + err
+ _T(")"), _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
2760 versiondebug
= version
;
2764 CString str
=version
.Tokenize(_T("."), start
);
2765 int space
= str
.ReverseFind(_T(' '));
2766 str
= str
.Mid(space
+1,start
);
2770 version
= version
.Mid(start
);
2773 str
= version
.Tokenize(_T("."), start
);
2775 ver
|= (_ttol(str
) & 0xFF) << 16;
2777 str
= version
.Tokenize(_T("."), start
);
2778 ver
|= (_ttol(str
) & 0xFF) << 8;
2780 str
= version
.Tokenize(_T("."), start
);
2781 ver
|= (_ttol(str
) & 0xFF);
2787 CMessageBox::Show(NULL
, _T("Could not parse git.exe version number: \"") + versiondebug
+ _T("\""), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
2792 regTime
= time
&0xFFFFFFFF;
2798 void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd
)
2800 typedef HRESULT (WINAPI
*SHGPSFW
) (HWND hwnd
,REFIID riid
,void** ppv
);
2802 CAutoLibrary hShell
= LoadLibrary(_T("Shell32.dll"));
2804 if (hShell
.IsValid()) {
2805 SHGPSFW pfnSHGPSFW
= (SHGPSFW
)::GetProcAddress(hShell
, "SHGetPropertyStoreForWindow");
2807 IPropertyStore
*pps
;
2808 HRESULT hr
= pfnSHGPSFW(hWnd
, IID_PPV_ARGS(&pps
));
2809 if (SUCCEEDED(hr
)) {
2812 var
.boolVal
= VARIANT_TRUE
;
2813 hr
= pps
->SetValue(PKEY_AppUserModel_PreventPinning
, var
);
2820 void CAppUtils::SetWindowTitle(HWND hWnd
, const CString
& urlorpath
, const CString
& dialogname
)
2822 ASSERT(dialogname
.GetLength() < 70);
2823 ASSERT(urlorpath
.GetLength() < MAX_PATH
);
2824 WCHAR pathbuf
[MAX_PATH
] = {0};
2826 PathCompactPathEx(pathbuf
, urlorpath
, 70 - dialogname
.GetLength(), 0);
2828 wcscat_s(pathbuf
, L
" - ");
2829 wcscat_s(pathbuf
, dialogname
);
2830 wcscat_s(pathbuf
, L
" - ");
2831 wcscat_s(pathbuf
, CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2832 SetWindowText(hWnd
, pathbuf
);
2835 bool CAppUtils::BisectStart(CString lastGood
, CString firstBad
, bool autoClose
)
2837 if (!g_Git
.CheckCleanWorkTree())
2839 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
2841 CSysProgressDlg sysProgressDlg
;
2842 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2843 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2844 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2845 sysProgressDlg
.SetShowProgressBar(false);
2846 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2847 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2850 cmd
= _T("git.exe stash");
2851 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2853 sysProgressDlg
.Stop();
2854 CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), MB_OK
);
2857 sysProgressDlg
.Stop();
2863 CBisectStartDlg bisectStartDlg
;
2865 if (!lastGood
.IsEmpty())
2866 bisectStartDlg
.m_sLastGood
= lastGood
;
2867 if (!firstBad
.IsEmpty())
2868 bisectStartDlg
.m_sFirstBad
= firstBad
;
2870 if (bisectStartDlg
.DoModal() == IDOK
)
2872 CProgressDlg progress
;
2873 theApp
.m_pMainWnd
= &progress
;
2874 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2875 progress
.m_GitCmdList
.push_back(_T("git.exe bisect start"));
2876 progress
.m_GitCmdList
.push_back(_T("git.exe bisect good ") + bisectStartDlg
.m_LastGoodRevision
);
2877 progress
.m_GitCmdList
.push_back(_T("git.exe bisect bad ") + bisectStartDlg
.m_FirstBadRevision
);
2879 CTGitPath
path(g_Git
.m_CurrentDir
);
2881 if (path
.HasSubmodules())
2882 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
2884 INT_PTR ret
= progress
.DoModal();
2885 if (path
.HasSubmodules() && ret
== IDC_PROGRESS_BUTTON1
)
2888 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
2890 CAppUtils::RunTortoiseProc(sCmd
);
2893 else if (ret
== IDOK
)