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))
277 // use TortoiseGitMerge
279 CRegString
tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE
);
280 com
= tortoiseMergePath
;
283 com
= CPathUtils::GetAppDirectory();
284 com
+= _T("TortoiseGitMerge.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
)
397 // use TortoiseGitMerge
398 viewer
= CPathUtils::GetAppDirectory();
399 viewer
+= _T("TortoiseGitMerge.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("TortoiseGitIDiff.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 TortoiseGitMerge.
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("TortoiseGitMerge.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))
539 // use TortoiseGitUDiff
540 viewer
= CPathUtils::GetAppDirectory();
541 viewer
+= _T("TortoiseGitUDiff.exe");
542 // enquote the path to TortoiseGitUDiff
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 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[len
+ 1]);
580 ExpandEnvironmentStrings(viewer
, buf
.get(), len
);
582 len
= ExpandEnvironmentStrings(file
, NULL
, 0);
583 std::unique_ptr
<TCHAR
[]> buf2(new TCHAR
[len
+ 1]);
584 ExpandEnvironmentStrings(file
, buf2
.get(), len
);
586 file
= _T("\"")+file
+_T("\"");
587 if (viewer
.IsEmpty())
589 viewer
= _T("RUNDLL32 Shell32,OpenAs_RunDLL");
591 if (viewer
.Find(_T("\"%1\"")) >= 0)
593 viewer
.Replace(_T("\"%1\""), file
);
595 else if (viewer
.Find(_T("%1")) >= 0)
597 viewer
.Replace(_T("%1"), file
);
605 if(!LaunchApplication(viewer
, IDS_ERR_TEXTVIEWSTART
, false))
612 BOOL
CAppUtils::CheckForEmptyDiff(const CTGitPath
& sDiffPath
)
615 CAutoFile hFile
= ::CreateFile(sDiffPath
.GetWinPath(), GENERIC_READ
, FILE_SHARE_READ
| FILE_SHARE_WRITE
, NULL
, OPEN_EXISTING
, NULL
, NULL
);
618 length
= ::GetFileSize(hFile
, NULL
);
625 void CAppUtils::CreateFontForLogs(CFont
& fontToCreate
)
628 HDC hScreenDC
= ::GetDC(NULL
);
629 logFont
.lfHeight
= -MulDiv((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC
, LOGPIXELSY
), 72);
630 ::ReleaseDC(NULL
, hScreenDC
);
632 logFont
.lfEscapement
= 0;
633 logFont
.lfOrientation
= 0;
634 logFont
.lfWeight
= FW_NORMAL
;
635 logFont
.lfItalic
= 0;
636 logFont
.lfUnderline
= 0;
637 logFont
.lfStrikeOut
= 0;
638 logFont
.lfCharSet
= DEFAULT_CHARSET
;
639 logFont
.lfOutPrecision
= OUT_DEFAULT_PRECIS
;
640 logFont
.lfClipPrecision
= CLIP_DEFAULT_PRECIS
;
641 logFont
.lfQuality
= DRAFT_QUALITY
;
642 logFont
.lfPitchAndFamily
= FF_DONTCARE
| FIXED_PITCH
;
643 _tcscpy_s(logFont
.lfFaceName
, 32, (LPCTSTR
)(CString
)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
644 VERIFY(fontToCreate
.CreateFontIndirect(&logFont
));
647 bool CAppUtils::LaunchPAgent(CString
*keyfile
,CString
* pRemote
)
661 cmd
.Format(_T("remote.%s.puttykeyfile"),remote
);
662 key
= g_Git
.GetConfigValue(cmd
);
664 key
= key
.Tokenize(_T("\n"),start
);
672 CString proc
=CPathUtils::GetAppDirectory();
673 proc
+= _T("pageant.exe \"");
677 CString tempfile
= GetTempFile();
678 ::DeleteFile(tempfile
);
680 proc
+= _T(" -c \"");
681 proc
+= CPathUtils::GetAppDirectory();
682 proc
+= _T("touch.exe\"");
687 CString appDir
= CPathUtils::GetAppDirectory();
688 bool b
= LaunchApplication(proc
, IDS_ERR_PAGEANT
, true, &appDir
);
693 while(!::PathFileExists(tempfile
))
698 break; //timeout 5 minutes
703 CMessageBox::Show(NULL
, IDS_ERR_PAEGENTTIMEOUT
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
705 ::DeleteFile(tempfile
);
708 bool CAppUtils::LaunchAlternativeEditor(const CString
& filename
, bool uac
)
710 CString editTool
= CRegString(_T("Software\\TortoiseGit\\AlternativeEditor"));
711 if (editTool
.IsEmpty() || (editTool
.Left(1).Compare(_T("#"))==0)) {
712 editTool
= CPathUtils::GetAppDirectory() + _T("notepad2.exe");
716 sCmd
.Format(_T("\"%s\" \"%s\""), editTool
, filename
);
718 LaunchApplication(sCmd
, NULL
, false, NULL
, uac
);
721 bool CAppUtils::LaunchRemoteSetting()
723 CTGitPath
path(g_Git
.m_CurrentDir
);
724 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
, &path
);
725 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
726 dlg
.SetTreeWidth(220);
727 dlg
.m_DefaultPage
= _T("gitremote");
734 * Launch the external blame viewer
736 bool CAppUtils::LaunchTortoiseBlame(const CString
& sBlameFile
,CString Rev
,const CString
& sParams
)
738 CString viewer
= _T("\"") + CPathUtils::GetAppDirectory();
739 viewer
+= _T("TortoiseGitBlame.exe");
740 viewer
+= _T("\" \"") + sBlameFile
+ _T("\"");
741 //viewer += _T(" \"") + sLogFile + _T("\"");
742 //viewer += _T(" \"") + sOriginalFile + _T("\"");
743 if(!Rev
.IsEmpty() && Rev
!= GIT_REV_ZERO
)
744 viewer
+= CString(_T(" /rev:"))+Rev
;
745 viewer
+= _T(" ")+sParams
;
747 return LaunchApplication(viewer
, IDS_ERR_TGITBLAME
, false);
750 bool CAppUtils::FormatTextInRichEditControl(CWnd
* pWnd
)
755 bool bStyled
= false;
756 pWnd
->GetWindowText(sText
);
757 // the rich edit control doesn't count the CR char!
758 // to be exact: CRLF is treated as one char.
761 // style each line separately
766 nNewlinePos
= sText
.Find('\n', offset
);
767 CString sLine
= sText
.Mid(offset
);
769 sLine
= sLine
.Left(nNewlinePos
-offset
);
772 while (FindStyleChars(sLine
, '*', start
, end
))
774 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
775 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
777 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
778 format
.cbSize
= sizeof(CHARFORMAT2
);
779 format
.dwMask
= CFM_BOLD
;
780 format
.dwEffects
= CFE_BOLD
;
781 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
787 while (FindStyleChars(sLine
, '^', start
, end
))
789 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
790 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
792 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
793 format
.cbSize
= sizeof(CHARFORMAT2
);
794 format
.dwMask
= CFM_ITALIC
;
795 format
.dwEffects
= CFE_ITALIC
;
796 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
802 while (FindStyleChars(sLine
, '_', start
, end
))
804 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
805 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
807 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
808 format
.cbSize
= sizeof(CHARFORMAT2
);
809 format
.dwMask
= CFM_UNDERLINE
;
810 format
.dwEffects
= CFE_UNDERLINE
;
811 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
815 offset
= nNewlinePos
+1;
816 } while(nNewlinePos
>=0);
820 bool CAppUtils::FindStyleChars(const CString
& sText
, TCHAR stylechar
, int& start
, int& end
)
823 bool bFoundMarker
= false;
824 // find a starting marker
825 while (sText
[i
] != 0)
827 if (sText
[i
] == stylechar
)
829 if (((i
+1)<sText
.GetLength())&&(IsCharAlphaNumeric(sText
[i
+1])) &&
830 (((i
>0)&&(!IsCharAlphaNumeric(sText
[i
-1])))||(i
==0)))
842 // find ending marker
843 bFoundMarker
= false;
844 while (sText
[i
] != 0)
846 if (sText
[i
] == stylechar
)
848 if ((IsCharAlphaNumeric(sText
[i
-1])) &&
849 ((((i
+1)<sText
.GetLength())&&(!IsCharAlphaNumeric(sText
[i
+1])))||(i
+1)==sText
.GetLength()))
862 CString
CAppUtils::GetProjectNameFromURL(CString url
)
865 while (name
.IsEmpty() || (name
.CompareNoCase(_T("branches"))==0) ||
866 (name
.CompareNoCase(_T("tags"))==0) ||
867 (name
.CompareNoCase(_T("trunk"))==0))
869 name
= url
.Mid(url
.ReverseFind('/')+1);
870 url
= url
.Left(url
.ReverseFind('/'));
872 if ((name
.Compare(_T("svn")) == 0)||(name
.Compare(_T("svnroot")) == 0))
874 // a name of svn or svnroot indicates that it's not really the project name. In that
875 // case, we try the first part of the URL
876 // of course, this won't work in all cases (but it works for Google project hosting)
877 url
.Replace(_T("http://"), _T(""));
878 url
.Replace(_T("https://"), _T(""));
879 url
.Replace(_T("svn://"), _T(""));
880 url
.Replace(_T("svn+ssh://"), _T(""));
881 url
.TrimLeft(_T("/"));
882 name
= url
.Left(url
.Find('.'));
887 bool CAppUtils::StartShowUnifiedDiff(HWND
/*hWnd*/, const CTGitPath
& url1
, const git_revnum_t
& rev1
,
888 const CTGitPath
& /*url2*/, const git_revnum_t
& rev2
,
889 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
890 bool /*bAlternateDiff*/ /* = false */, bool /*bIgnoreAncestry*/ /* = false */, bool /* blame = false */, bool bMerge
)
893 CString tempfile
=GetTempFile();
895 if(rev2
== GitRev::GetWorkingCopy())
897 cmd
.Format(_T("git.exe diff --stat -p %s "), rev1
);
899 else if (rev1
== GitRev::GetWorkingCopy())
901 cmd
.Format(_T("git.exe diff -R --stat -p %s "), rev2
);
909 cmd
.Format(_T("git.exe diff-tree -r -p %s --stat %s %s"),merge
, rev1
,rev2
);
912 if( !url1
.IsEmpty() )
915 cmd
+= url1
.GetGitPathString();
918 g_Git
.RunLogFile(cmd
,tempfile
);
919 CAppUtils::StartUnifiedDiffViewer(tempfile
, rev1
+ _T(":") + rev2
);
924 sCmd
.Format(_T("%s /command:showcompare /unified"),
925 (LPCTSTR
)(CPathUtils::GetAppDirectory()+_T("TortoiseGitProc.exe")));
926 sCmd
+= _T(" /url1:\"") + url1
.GetGitPathString() + _T("\"");
928 sCmd
+= _T(" /revision1:") + rev1
.ToString();
929 sCmd
+= _T(" /url2:\"") + url2
.GetGitPathString() + _T("\"");
931 sCmd
+= _T(" /revision2:") + rev2
.ToString();
933 sCmd
+= _T(" /pegrevision:") + peg
.ToString();
934 if (headpeg
.IsValid())
935 sCmd
+= _T(" /headpegrevision:") + headpeg
.ToString();
938 sCmd
+= _T(" /alternatediff");
941 sCmd
+= _T(" /ignoreancestry");
945 sCmd
+= _T(" /hwnd:");
947 _stprintf_s(buf
, 30, _T("%d"), hWnd
);
951 return CAppUtils::LaunchApplication(sCmd
, NULL
, false);
956 bool CAppUtils::SetupDiffScripts(bool force
, const CString
& type
)
958 CString scriptsdir
= CPathUtils::GetAppParentDirectory();
959 scriptsdir
+= _T("Diff-Scripts");
960 CSimpleFileFind
files(scriptsdir
);
961 while (files
.FindNextFileNoDirectories())
963 CString file
= files
.GetFilePath();
964 CString filename
= files
.GetFileName();
965 CString ext
= file
.Mid(file
.ReverseFind('-') + 1);
966 ext
= _T(".") + ext
.Left(ext
.ReverseFind('.'));
967 std::set
<CString
> extensions
;
968 extensions
.insert(ext
);
970 if (file
.Right(3).CompareNoCase(_T("vbs"))==0)
972 kind
= _T(" //E:vbscript");
974 if (file
.Right(2).CompareNoCase(_T("js"))==0)
976 kind
= _T(" //E:javascript");
978 // open the file, read the first line and find possible extensions
979 // this script can handle
982 CStdioFile
f(file
, CFile::modeRead
| CFile::shareDenyNone
);
984 if (f
.ReadString(extline
))
986 if ((extline
.GetLength() > 15 ) &&
987 ((extline
.Left(15).Compare(_T("// extensions: ")) == 0) ||
988 (extline
.Left(14).Compare(_T("' extensions: ")) == 0)))
990 if (extline
[0] == '/')
991 extline
= extline
.Mid(15);
993 extline
= extline
.Mid(14);
996 sToken
= extline
.Tokenize(_T(";"), curPos
);
997 while (!sToken
.IsEmpty())
999 if (!sToken
.IsEmpty())
1001 if (sToken
[0] != '.')
1002 sToken
= _T(".") + sToken
;
1003 extensions
.insert(sToken
);
1005 sToken
= extline
.Tokenize(_T(";"), curPos
);
1011 catch (CFileException
* e
)
1016 for (std::set
<CString
>::const_iterator it
= extensions
.begin(); it
!= extensions
.end(); ++it
)
1018 if (type
.IsEmpty() || (type
.Compare(_T("Diff")) == 0))
1020 if (filename
.Left(5).CompareNoCase(_T("diff-")) == 0)
1022 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + *it
);
1023 CString diffregstring
= diffreg
;
1024 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1025 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %base %mine") + kind
;
1028 if (type
.IsEmpty() || (type
.Compare(_T("Merge"))==0))
1030 if (filename
.Left(6).CompareNoCase(_T("merge-"))==0)
1032 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\MergeTools\\") + *it
);
1033 CString diffregstring
= diffreg
;
1034 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1035 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %merged %theirs %mine %base") + kind
;
1044 bool CAppUtils::Export(CString
*BashHash
)
1046 // ask from where the export has to be done
1049 dlg
.m_Revision
=*BashHash
;
1051 if (dlg
.DoModal() == IDOK
)
1054 cmd
.Format(_T("git.exe archive --output=\"%s\" --format=zip --verbose %s"),
1055 dlg
.m_strExportDirectory
, g_Git
.FixBranchName(dlg
.m_VersionName
));
1059 return (pro
.DoModal() == IDOK
);
1064 bool CAppUtils::CreateBranchTag(bool IsTag
,CString
*CommitHash
, bool switch_new_brach
)
1066 CCreateBranchTagDlg dlg
;
1068 dlg
.m_bSwitch
=switch_new_brach
;
1071 dlg
.m_initialRefName
= *CommitHash
;
1073 if(dlg
.DoModal()==IDOK
)
1078 if(dlg
.m_bTrack
== TRUE
)
1079 track
=_T(" --track ");
1080 else if(dlg
.m_bTrack
== FALSE
)
1081 track
=_T(" --no-track");
1092 cmd
.Format(_T("git.exe tag %s %s %s %s"),
1095 dlg
.m_BranchTagName
,
1096 g_Git
.FixBranchName(dlg
.m_VersionName
)
1099 CString tempfile
=::GetTempFile();
1100 if(!dlg
.m_Message
.Trim().IsEmpty())
1102 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_Message
);
1103 cmd
+= _T(" -F ")+tempfile
;
1108 cmd
.Format(_T("git.exe branch %s %s %s %s"),
1111 dlg
.m_BranchTagName
,
1112 g_Git
.FixBranchName(dlg
.m_VersionName
)
1116 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1118 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1121 if( !IsTag
&& dlg
.m_bSwitch
)
1123 // it is a new branch and the user has requested to switch to it
1124 cmd
.Format(_T("git.exe checkout %s"), dlg
.m_BranchTagName
);
1125 g_Git
.Run(cmd
,&out
,CP_UTF8
);
1126 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1134 bool CAppUtils::Switch(CString initialRefName
, bool autoclose
)
1137 if(!initialRefName
.IsEmpty())
1138 dlg
.m_initialRefName
= initialRefName
;
1140 if (dlg
.DoModal() == IDOK
)
1144 branch
= dlg
.m_NewBranch
;
1146 // if refs/heads/ is not stripped, checkout will detach HEAD
1147 // checkout prefers branches on name clashes (with tags)
1148 if (dlg
.m_VersionName
.Left(11) ==_T("refs/heads/") && dlg
.m_bBranchOverride
!= TRUE
)
1149 dlg
.m_VersionName
= dlg
.m_VersionName
.Mid(11);
1151 return PerformSwitch(dlg
.m_VersionName
, dlg
.m_bForce
== TRUE
, branch
, dlg
.m_bBranchOverride
== TRUE
, dlg
.m_bTrack
, autoclose
);
1156 bool CAppUtils::PerformSwitch(CString ref
, bool bForce
/* false */, CString sNewBranch
/* CString() */, bool bBranchOverride
/* false */, BOOL bTrack
/* 2 */, bool autoClose
/* false */)
1163 if(!sNewBranch
.IsEmpty()){
1164 if (bBranchOverride
)
1166 branch
.Format(_T("-B %s"), sNewBranch
);
1170 branch
.Format(_T("-b %s"), sNewBranch
);
1173 track
= _T("--track");
1174 else if (bTrack
== FALSE
)
1175 track
= _T("--no-track");
1180 cmd
.Format(_T("git.exe checkout %s %s %s %s"),
1184 g_Git
.FixBranchName(ref
));
1186 CProgressDlg progress
;
1187 progress
.m_bAutoCloseOnSuccess
= autoClose
;
1188 progress
.m_GitCmd
= cmd
;
1190 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1191 if (gitPath
.HasSubmodules())
1192 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1194 INT_PTR ret
= progress
.DoModal();
1195 if (gitPath
.HasSubmodules() && ret
== IDC_PROGRESS_BUTTON1
)
1198 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1200 RunTortoiseGitProc(sCmd
);
1203 else if (ret
== IDOK
)
1209 bool CAppUtils::OpenIgnoreFile(CStdioFile
&file
, const CString
& filename
)
1211 if (!file
.Open(filename
, CFile::modeCreate
| CFile::modeReadWrite
| CFile::modeNoTruncate
))
1213 CMessageBox::Show(NULL
, filename
+ _T(" Open Failure"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1217 if (file
.GetLength() > 0)
1219 file
.Seek(file
.GetLength() - 1, 0);
1220 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[1]);
1221 file
.Read(buf
.get(), 1);
1223 if (buf
.get()[0] != _T('\n'))
1224 file
.WriteString(_T("\n"));
1232 bool CAppUtils::IgnoreFile(CTGitPathList
&path
,bool IsMask
)
1234 CIgnoreDlg ignoreDlg
;
1235 if (ignoreDlg
.DoModal() == IDOK
)
1238 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\");
1240 switch (ignoreDlg
.m_IgnoreFile
)
1243 ignorefile
+= _T(".gitignore");
1246 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, ignorefile
);
1247 ignorefile
+= _T("info/exclude");
1254 if (ignoreDlg
.m_IgnoreFile
!= 1 && !OpenIgnoreFile(file
, ignorefile
))
1257 for (int i
= 0; i
< path
.GetCount(); i
++)
1259 if (ignoreDlg
.m_IgnoreFile
== 1)
1261 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\") + path
[i
].GetContainingDirectory().GetWinPathString() + _T("\\.gitignore");
1262 if (!OpenIgnoreFile(file
, ignorefile
))
1266 CString ignorePattern
;
1267 if (ignoreDlg
.m_IgnoreType
== 0)
1269 if (ignoreDlg
.m_IgnoreFile
!= 1 && !path
[i
].GetContainingDirectory().GetGitPathString().IsEmpty())
1270 ignorePattern
+= _T("/") + path
[i
].GetContainingDirectory().GetGitPathString();
1272 ignorePattern
+= _T("/");
1276 ignorePattern
+= _T("*") + path
[i
].GetFileExtension();
1280 ignorePattern
+= path
[i
].GetFileOrDirectoryName();
1283 // escape [ and ] so that files get ignored correctly
1284 ignorePattern
.Replace(_T("["), _T("\\["));
1285 ignorePattern
.Replace(_T("]"), _T("\\]"));
1287 ignorePattern
+= _T("\n");
1288 CStringA ignorePatternA
= CUnicodeUtils::GetUTF8(ignorePattern
);
1289 file
.Write(ignorePatternA
.GetBuffer(), ignorePatternA
.GetLength());
1290 ignorePatternA
.ReleaseBuffer();
1292 if (ignoreDlg
.m_IgnoreFile
== 1)
1296 if (ignoreDlg
.m_IgnoreFile
!= 1)
1311 bool CAppUtils::GitReset(CString
*CommitHash
,int type
)
1314 dlg
.m_ResetType
=type
;
1315 dlg
.m_ResetToVersion
=*CommitHash
;
1316 dlg
.m_initialRefName
= *CommitHash
;
1317 if (dlg
.DoModal() == IDOK
)
1321 switch(dlg
.m_ResetType
)
1336 cmd
.Format(_T("git.exe reset %s %s"),type
, *CommitHash
);
1340 CProgressDlg progress
;
1341 progress
.m_GitCmd
=cmd
;
1343 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1344 if (gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2)
1345 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1347 progress
.m_PostFailCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MSGBOX_RETRY
)));
1349 INT_PTR ret
= progress
.DoModal();
1350 if (progress
.m_GitStatus
== 0 && gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2 && ret
== IDC_PROGRESS_BUTTON1
)
1353 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1355 RunTortoiseGitProc(sCmd
);
1358 else if (progress
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
1360 else if (ret
== IDOK
)
1369 void CAppUtils::DescribeFile(bool mode
, bool base
,CString
&descript
)
1373 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_DELETE
));
1378 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED
));
1381 descript
= CString(MAKEINTRESOURCE(IDS_PROC_CREATED
));
1385 void CAppUtils::RemoveTempMergeFile(CTGitPath
&path
)
1387 CString tempmergefile
;
1390 tempmergefile
= CAppUtils::GetMergeTempFile(_T("LOCAL"),path
);
1391 CFile::Remove(tempmergefile
);
1398 tempmergefile
= CAppUtils::GetMergeTempFile(_T("REMOTE"),path
);
1399 CFile::Remove(tempmergefile
);
1406 tempmergefile
= CAppUtils::GetMergeTempFile(_T("BASE"),path
);
1407 CFile::Remove(tempmergefile
);
1412 CString
CAppUtils::GetMergeTempFile(CString type
,CTGitPath
&merge
)
1415 file
=g_Git
.m_CurrentDir
+_T("\\") + merge
.GetWinPathString()+_T(".")+type
+merge
.GetFileExtension();
1420 bool CAppUtils::ConflictEdit(CTGitPath
&path
,bool /*bAlternativeTool*/,bool revertTheirMy
)
1424 CTGitPath merge
=path
;
1425 CTGitPath directory
= merge
.GetDirectory();
1427 // we have the conflicted file (%merged)
1428 // now look for the other required files
1430 //stat.GetStatus(merge);
1431 //if (stat.status == NULL)
1437 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge
.GetGitPathString());
1439 if (g_Git
.Run(cmd
, &vector
))
1445 list
.ParserFromLsFile(vector
);
1447 if(list
.GetCount() == 0)
1456 mine
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1457 theirs
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1461 mine
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1462 theirs
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1464 base
.SetFromGit(GetMergeTempFile(_T("BASE"),merge
));
1468 //format=_T("git.exe cat-file blob \":%d:%s\"");
1469 format
= _T("git checkout-index --temp --stage=%d -- \"%s\"");
1471 //create a empty file, incase stage is not three
1472 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1474 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1476 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1479 bool b_base
=false, b_local
=false, b_remote
=false;
1481 for(int i
=0;i
<list
.GetCount();i
++)
1488 if( list
[i
].m_Stage
== 1)
1490 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1492 outfile
= base
.GetWinPathString();
1495 if( list
[i
].m_Stage
== 2 )
1497 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1499 outfile
= mine
.GetWinPathString();
1502 if( list
[i
].m_Stage
== 3 )
1504 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1506 outfile
= theirs
.GetWinPathString();
1508 CString output
, err
;
1509 if(!outfile
.IsEmpty())
1510 if (!g_Git
.Run(cmd
, &output
, &err
, CP_UTF8
))
1514 file
= output
.Tokenize(_T("\t"), start
);
1515 ::MoveFileEx(file
,outfile
,MOVEFILE_REPLACE_EXISTING
|MOVEFILE_COPY_ALLOWED
);
1519 CMessageBox::Show(NULL
, output
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1523 if(b_local
&& b_remote
)
1525 merge
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+merge
.GetWinPathString());
1527 bRet
= !!CAppUtils::StartExtMerge(base
, mine
, theirs
, merge
, _T("BASE"), _T("REMOTE"), _T("LOCAL"));
1529 bRet
= !!CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"), _T("REMOTE"), _T("LOCAL"));
1534 CFile::Remove(mine
.GetWinPathString());
1535 CFile::Remove(theirs
.GetWinPathString());
1536 CFile::Remove(base
.GetWinPathString());
1538 CDeleteConflictDlg dlg
;
1539 DescribeFile(b_local
, b_base
,dlg
.m_LocalStatus
);
1540 DescribeFile(b_remote
,b_base
,dlg
.m_RemoteStatus
);
1541 dlg
.m_bShowModifiedButton
=b_base
;
1542 dlg
.m_File
=merge
.GetGitPathString();
1543 if(dlg
.DoModal() == IDOK
)
1548 cmd
.Format(_T("git.exe rm -- \"%s\""),merge
.GetGitPathString());
1551 cmd
.Format(_T("git.exe add -- \"%s\""),merge
.GetGitPathString());
1553 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1555 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1565 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1566 base
, theirs
, mine
, merge
);
1569 if (stat
.status
->text_status
== svn_wc_status_conflicted
)
1571 // we have a text conflict, use our merge tool to resolve the conflict
1573 CTSVNPath
theirs(directory
);
1574 CTSVNPath
mine(directory
);
1575 CTSVNPath
base(directory
);
1576 bool bConflictData
= false;
1578 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_new
))
1580 theirs
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_new
));
1581 bConflictData
= true;
1583 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_old
))
1585 base
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_old
));
1586 bConflictData
= true;
1588 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_wrk
))
1590 mine
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_wrk
));
1591 bConflictData
= true;
1598 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1599 base
, theirs
, mine
, merge
);
1602 if (stat
.status
->prop_status
== svn_wc_status_conflicted
)
1604 // we have a property conflict
1605 CTSVNPath
prej(directory
);
1606 if ((stat
.status
->entry
)&&(stat
.status
->entry
->prejfile
))
1608 prej
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->prejfile
));
1609 // there's a problem: the prej file contains a _description_ of the conflict, and
1610 // that description string might be translated. That means we have no way of parsing
1611 // the file to find out the conflicting values.
1612 // The only thing we can do: show a dialog with the conflict description, then
1613 // let the user either accept the existing property or open the property edit dialog
1614 // to manually change the properties and values. And a button to mark the conflict as
1616 CEditPropConflictDlg dlg
;
1617 dlg
.SetPrejFile(prej
);
1618 dlg
.SetConflictedItem(merge
);
1619 bRet
= (dlg
.DoModal() != IDCANCEL
);
1623 if (stat
.status
->tree_conflict
)
1625 // we have a tree conflict
1627 const SVNInfoData
* pInfoData
= info
.GetFirstFileInfo(merge
, SVNRev(), SVNRev());
1630 if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_text
)
1632 CTSVNPath
theirs(directory
);
1633 CTSVNPath
mine(directory
);
1634 CTSVNPath
base(directory
);
1635 bool bConflictData
= false;
1637 if (pInfoData
->treeconflict_theirfile
)
1639 theirs
.AppendPathString(pInfoData
->treeconflict_theirfile
);
1640 bConflictData
= true;
1642 if (pInfoData
->treeconflict_basefile
)
1644 base
.AppendPathString(pInfoData
->treeconflict_basefile
);
1645 bConflictData
= true;
1647 if (pInfoData
->treeconflict_myfile
)
1649 mine
.AppendPathString(pInfoData
->treeconflict_myfile
);
1650 bConflictData
= true;
1657 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1658 base
, theirs
, mine
, merge
);
1660 else if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_tree
)
1662 CString sConflictAction
;
1663 CString sConflictReason
;
1664 CString sResolveTheirs
;
1665 CString sResolveMine
;
1666 CTSVNPath treeConflictPath
= CTSVNPath(pInfoData
->treeconflict_path
);
1667 CString sItemName
= treeConflictPath
.GetUIFileOrDirectoryName();
1669 if (pInfoData
->treeconflict_nodekind
== svn_node_file
)
1671 switch (pInfoData
->treeconflict_operation
)
1673 case svn_wc_operation_update
:
1674 switch (pInfoData
->treeconflict_action
)
1676 case svn_wc_conflict_action_edit
:
1677 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEEDIT
, (LPCTSTR
)sItemName
);
1678 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1680 case svn_wc_conflict_action_add
:
1681 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEADD
, (LPCTSTR
)sItemName
);
1682 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1684 case svn_wc_conflict_action_delete
:
1685 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEDELETE
, (LPCTSTR
)sItemName
);
1686 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1690 case svn_wc_operation_switch
:
1691 switch (pInfoData
->treeconflict_action
)
1693 case svn_wc_conflict_action_edit
:
1694 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHEDIT
, (LPCTSTR
)sItemName
);
1695 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1697 case svn_wc_conflict_action_add
:
1698 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHADD
, (LPCTSTR
)sItemName
);
1699 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1701 case svn_wc_conflict_action_delete
:
1702 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHDELETE
, (LPCTSTR
)sItemName
);
1703 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1707 case svn_wc_operation_merge
:
1708 switch (pInfoData
->treeconflict_action
)
1710 case svn_wc_conflict_action_edit
:
1711 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEEDIT
, (LPCTSTR
)sItemName
);
1712 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1714 case svn_wc_conflict_action_add
:
1715 sResolveTheirs
.Format(IDS_TREECONFLICT_FILEMERGEADD
, (LPCTSTR
)sItemName
);
1716 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1718 case svn_wc_conflict_action_delete
:
1719 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEDELETE
, (LPCTSTR
)sItemName
);
1720 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1726 else if (pInfoData
->treeconflict_nodekind
== svn_node_dir
)
1728 switch (pInfoData
->treeconflict_operation
)
1730 case svn_wc_operation_update
:
1731 switch (pInfoData
->treeconflict_action
)
1733 case svn_wc_conflict_action_edit
:
1734 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEEDIT
, (LPCTSTR
)sItemName
);
1735 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1737 case svn_wc_conflict_action_add
:
1738 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEADD
, (LPCTSTR
)sItemName
);
1739 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1741 case svn_wc_conflict_action_delete
:
1742 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEDELETE
, (LPCTSTR
)sItemName
);
1743 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1747 case svn_wc_operation_switch
:
1748 switch (pInfoData
->treeconflict_action
)
1750 case svn_wc_conflict_action_edit
:
1751 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHEDIT
, (LPCTSTR
)sItemName
);
1752 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1754 case svn_wc_conflict_action_add
:
1755 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHADD
, (LPCTSTR
)sItemName
);
1756 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1758 case svn_wc_conflict_action_delete
:
1759 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHDELETE
, (LPCTSTR
)sItemName
);
1760 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1764 case svn_wc_operation_merge
:
1765 switch (pInfoData
->treeconflict_action
)
1767 case svn_wc_conflict_action_edit
:
1768 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEEDIT
, (LPCTSTR
)sItemName
);
1769 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1771 case svn_wc_conflict_action_add
:
1772 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEADD
, (LPCTSTR
)sItemName
);
1773 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1775 case svn_wc_conflict_action_delete
:
1776 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEDELETE
, (LPCTSTR
)sItemName
);
1777 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1785 switch (pInfoData
->treeconflict_reason
)
1787 case svn_wc_conflict_reason_edited
:
1788 uReasonID
= IDS_TREECONFLICT_REASON_EDITED
;
1789 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1791 case svn_wc_conflict_reason_obstructed
:
1792 uReasonID
= IDS_TREECONFLICT_REASON_OBSTRUCTED
;
1793 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1795 case svn_wc_conflict_reason_deleted
:
1796 uReasonID
= IDS_TREECONFLICT_REASON_DELETED
;
1797 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1799 case svn_wc_conflict_reason_added
:
1800 uReasonID
= IDS_TREECONFLICT_REASON_ADDED
;
1801 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1803 case svn_wc_conflict_reason_missing
:
1804 uReasonID
= IDS_TREECONFLICT_REASON_MISSING
;
1805 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1807 case svn_wc_conflict_reason_unversioned
:
1808 uReasonID
= IDS_TREECONFLICT_REASON_UNVERSIONED
;
1809 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1812 sConflictReason
.Format(uReasonID
, (LPCTSTR
)sConflictAction
);
1814 CTreeConflictEditorDlg dlg
;
1815 dlg
.SetConflictInfoText(sConflictReason
);
1816 dlg
.SetResolveTexts(sResolveTheirs
, sResolveMine
);
1817 dlg
.SetPath(treeConflictPath
);
1818 INT_PTR dlgRet
= dlg
.DoModal();
1819 bRet
= (dlgRet
!= IDCANCEL
);
1827 bool CAppUtils::IsSSHPutty()
1829 CString sshclient
=g_Git
.m_Environment
.GetEnv(_T("GIT_SSH"));
1830 sshclient
=sshclient
.MakeLower();
1831 if(sshclient
.Find(_T("plink.exe"),0)>=0)
1838 CString
CAppUtils::GetClipboardLink()
1840 if (!OpenClipboard(NULL
))
1843 CString sClipboardText
;
1844 HGLOBAL hglb
= GetClipboardData(CF_TEXT
);
1847 LPCSTR lpstr
= (LPCSTR
)GlobalLock(hglb
);
1848 sClipboardText
= CString(lpstr
);
1851 hglb
= GetClipboardData(CF_UNICODETEXT
);
1854 LPCTSTR lpstr
= (LPCTSTR
)GlobalLock(hglb
);
1855 sClipboardText
= lpstr
;
1860 if(!sClipboardText
.IsEmpty())
1862 if(sClipboardText
[0] == _T('\"') && sClipboardText
[sClipboardText
.GetLength()-1] == _T('\"'))
1863 sClipboardText
=sClipboardText
.Mid(1,sClipboardText
.GetLength()-2);
1865 if(sClipboardText
.Find( _T("http://")) == 0)
1866 return sClipboardText
;
1868 if(sClipboardText
.Find( _T("https://")) == 0)
1869 return sClipboardText
;
1871 if(sClipboardText
.Find( _T("git://")) == 0)
1872 return sClipboardText
;
1874 if(sClipboardText
.Find( _T("ssh://")) == 0)
1875 return sClipboardText
;
1877 if(sClipboardText
.GetLength()>=2)
1878 if( sClipboardText
[1] == _T(':') )
1879 if( (sClipboardText
[0] >= 'A' && sClipboardText
[0] <= 'Z')
1880 || (sClipboardText
[0] >= 'a' && sClipboardText
[0] <= 'z') )
1881 return sClipboardText
;
1884 return CString(_T(""));
1887 CString
CAppUtils::ChooseRepository(CString
*path
)
1889 CBrowseFolder browseFolder
;
1890 CRegString regLastResopitory
= CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\LastRepo"),_T(""));
1892 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
1893 CString strCloneDirectory
;
1895 strCloneDirectory
=*path
;
1898 strCloneDirectory
= regLastResopitory
;
1902 title
.LoadString(IDS_CHOOSE_REPOSITORY
);
1904 browseFolder
.SetInfo(title
);
1906 if (browseFolder
.Show(NULL
, strCloneDirectory
) == CBrowseFolder::OK
)
1908 regLastResopitory
= strCloneDirectory
;
1909 return strCloneDirectory
;
1917 bool CAppUtils::SendPatchMail(CTGitPathList
&list
,bool autoclose
)
1921 dlg
.m_PathList
= list
;
1923 if(dlg
.DoModal()==IDOK
)
1925 if(dlg
.m_PathList
.GetCount() == 0)
1928 CGitProgressDlg progDlg
;
1930 theApp
.m_pMainWnd
= &progDlg
;
1931 progDlg
.SetCommand(CGitProgressDlg::GitProgress_SendMail
);
1933 progDlg
.SetAutoClose(autoclose
);
1935 progDlg
.SetPathList(dlg
.m_PathList
);
1936 //ProjectProperties props;
1937 //props.ReadPropsPathList(dlg.m_pathList);
1938 //progDlg.SetProjectProperties(props);
1939 progDlg
.SetItemCount(dlg
.m_PathList
.GetCount());
1942 if(dlg
.m_bAttachment
)
1943 flags
|= SENDMAIL_ATTACHMENT
;
1945 flags
|= SENDMAIL_COMBINED
;
1947 flags
|= SENDMAIL_MAPI
;
1949 progDlg
.SetSendMailOption(dlg
.m_To
,dlg
.m_CC
,dlg
.m_Subject
,flags
);
1958 bool CAppUtils::SendPatchMail(CString
&cmd
,CString
&formatpatchoutput
,bool autoclose
)
1961 CString log
=formatpatchoutput
;
1962 int start
=log
.Find(cmd
);
1964 CString one
=log
.Tokenize(_T("\n"),start
);
1970 CString one
=log
.Tokenize(_T("\n"),start
);
1972 if(one
.IsEmpty() || one
.Find(_T("Success")) == 0)
1974 one
.Replace(_T('/'),_T('\\'));
1976 path
.SetFromWin(one
);
1979 if (list
.GetCount() > 0)
1981 return SendPatchMail(list
, autoclose
);
1985 CMessageBox::Show(NULL
, IDS_ERR_NOPATCHES
, IDS_APPNAME
, MB_ICONINFORMATION
);
1991 int CAppUtils::GetLogOutputEncode(CGit
*pGit
)
1996 output
= pGit
->GetConfigValue(_T("i18n.logOutputEncoding"));
1997 if(output
.IsEmpty())
1999 output
= pGit
->GetConfigValue(_T("i18n.commitencoding"));
2000 if(output
.IsEmpty())
2004 output
=output
.Tokenize(_T("\n"),start
);
2005 return CUnicodeUtils::GetCPCode(output
);
2010 output
=output
.Tokenize(_T("\n"),start
);
2011 return CUnicodeUtils::GetCPCode(output
);
2014 int CAppUtils::GetCommitTemplate(CString
&temp
)
2018 output
= g_Git
.GetConfigValue(_T("commit.template"), CP_UTF8
);
2019 if( output
.IsEmpty() )
2022 if( output
.GetLength()<1)
2025 if( output
[0] == _T('/'))
2027 if(output
.GetLength()>=3)
2028 if(output
[2] == _T('/'))
2030 output
.GetBuffer()[0] = output
[1];
2031 output
.GetBuffer()[1] = _T(':');
2036 output
=output
.Tokenize(_T("\n"),start
);
2038 output
.Replace(_T('/'),_T('\\'));
2042 CStdioFile
file(output
,CFile::modeRead
|CFile::typeText
);
2044 while(file
.ReadString(str
))
2055 int CAppUtils::SaveCommitUnicodeFile(CString
&filename
, CString
&message
)
2057 CFile
file(filename
,CFile::modeReadWrite
|CFile::modeCreate
);
2061 output
= g_Git
.GetConfigValue(_T("i18n.commitencoding"));
2062 if(output
.IsEmpty())
2066 output
=output
.Tokenize(_T("\n"),start
);
2067 cp
=CUnicodeUtils::GetCPCode(output
);
2069 int len
=message
.GetLength();
2071 std::unique_ptr
<char[]> buf(new char[len
* 4 + 4]);
2072 SecureZeroMemory(buf
.get(), len
* 4 + 4);
2074 int lengthIncTerminator
= WideCharToMultiByte(cp
, 0, message
, -1, buf
.get(), len
* 4, NULL
, NULL
);
2076 file
.Write(buf
.get(), lengthIncTerminator
- 1);
2081 bool CAppUtils::Fetch(CString remoteName
, bool allowRebase
, bool autoClose
)
2084 dlg
.m_PreSelectRemote
= remoteName
;
2085 dlg
.m_bAllowRebase
= allowRebase
;
2088 if(dlg
.DoModal()==IDOK
)
2092 if (dlg
.m_bAllRemotes
)
2095 g_Git
.GetRemoteList(list
);
2097 STRING_VECTOR::const_iterator it
= list
.begin();
2098 while (it
!= list
.end())
2100 CString
remote(*it
);
2101 CAppUtils::LaunchPAgent(NULL
, &remote
);
2106 CAppUtils::LaunchPAgent(NULL
, &dlg
.m_RemoteURL
);
2110 url
=dlg
.m_RemoteURL
;
2114 int ver
= CAppUtils::GetMsysgitVersion();
2116 if(ver
>= 0x01070203) //above 1.7.0.2
2117 arg
= _T("--progress ");
2120 arg
+= _T("--prune ");
2123 if (dlg
.m_bFetchTags
== 1)
2125 arg
+= _T("--tags ");
2127 else if (dlg
.m_bFetchTags
== 0)
2129 arg
+= _T("--no-tags ");
2132 if (dlg
.m_bAllRemotes
)
2133 cmd
.Format(_T("git.exe fetch --all -v %s"), arg
);
2135 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"), arg
, url
, dlg
.m_RemoteBranchName
);
2137 CProgressDlg progress
;
2139 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2141 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2142 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_RESET
)));
2144 if(!dlg
.m_bRebase
&& !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
))
2146 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2149 progress
.m_GitCmd
=cmd
;
2150 INT_PTR userResponse
= progress
.DoModal();
2152 if (userResponse
== IDC_PROGRESS_BUTTON1
)
2154 CString cmd
= _T("/command:log");
2155 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2156 RunTortoiseGitProc(cmd
);
2159 else if (userResponse
== IDC_PROGRESS_BUTTON1
+ 1)
2161 CString currentBranch
= g_Git
.GetSymbolicRef();
2163 configName
.Format(_T("branch.%s.remote"), currentBranch
);
2164 CString pullRemote
= g_Git
.GetConfigValue(configName
);
2166 //Select pull-branch from current branch
2167 configName
.Format(_T("branch.%s.merge"), currentBranch
);
2168 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
2170 CString defaultUpstream
;
2171 if (!pullRemote
.IsEmpty() && !pullBranch
.IsEmpty())
2172 defaultUpstream
.Format(_T("remotes/%s/%s"), pullRemote
, pullBranch
);
2173 GitReset(&defaultUpstream
, 2);
2176 else if ((userResponse
== IDC_PROGRESS_BUTTON1
+ 2) || (progress
.m_GitStatus
== 0 && dlg
.m_bRebase
))
2181 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2182 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUDESSENDMAIL
)));
2183 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2184 INT_PTR response
= dlg
.DoModal();
2185 if(response
== IDOK
)
2189 else if (response
== IDC_REBASE_POST_BUTTON
)
2191 CString cmd
= _T("/command:log");
2192 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2193 RunTortoiseGitProc(cmd
);
2196 else if (response
== IDC_REBASE_POST_BUTTON
+ 1)
2198 CString cmd
, out
, err
;
2199 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
2201 g_Git
.FixBranchName(dlg
.m_Upstream
),
2202 g_Git
.FixBranchName(dlg
.m_Branch
));
2203 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
2205 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
2209 CAppUtils::SendPatchMail(cmd
,out
);
2212 else if (response
== IDC_REBASE_POST_BUTTON
+ 2)
2214 else if(response
== IDCANCEL
)
2219 else if (userResponse
!= IDCANCEL
)
2225 bool CAppUtils::Push(CString selectLocalBranch
, bool autoClose
)
2228 dlg
.m_BranchSourceName
= selectLocalBranch
;
2230 DWORD exitcode
= 0xFFFFFFFF;
2232 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
2233 if (CHooks::Instance().PrePush(list
,exitcode
, error
))
2238 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2239 //ReportError(temp);
2240 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2245 if(dlg
.DoModal()==IDOK
)
2250 arg
+= _T("--thin ");
2251 if(dlg
.m_bTags
&& !dlg
.m_bPushAllBranches
)
2252 arg
+= _T("--tags ");
2254 arg
+= _T("--force ");
2255 if (dlg
.m_bSetUpstream
)
2256 arg
+= _T("--set-upstream ");
2257 if (dlg
.m_RecurseSubmodules
== 1)
2258 arg
+= _T("--recurse-submodules=check ");
2259 if (dlg
.m_RecurseSubmodules
== 2)
2260 arg
+= _T("--recurse-submodules=on-demand ");
2262 int ver
= CAppUtils::GetMsysgitVersion();
2264 if(ver
>= 0x01070203) //above 1.7.0.2
2265 arg
+= _T("--progress ");
2267 CProgressDlg progress
;
2268 progress
.m_bAutoCloseOnSuccess
=autoClose
;
2270 STRING_VECTOR remotesList
;
2271 if (dlg
.m_bPushAllRemotes
)
2272 g_Git
.GetRemoteList(remotesList
);
2274 remotesList
.push_back(dlg
.m_URL
);
2276 for (unsigned int i
= 0; i
< remotesList
.size(); i
++)
2278 if (dlg
.m_bAutoLoad
)
2279 CAppUtils::LaunchPAgent(NULL
, &remotesList
[i
]);
2282 if (dlg
.m_bPushAllBranches
)
2284 cmd
.Format(_T("git.exe push --all %s \"%s\""),
2290 cmd
.Format(_T("git.exe push %s \"%s\" %s"),
2293 dlg
.m_BranchSourceName
);
2294 if (!dlg
.m_BranchRemoteName
.IsEmpty())
2296 cmd
+= _T(":") + dlg
.m_BranchRemoteName
;
2299 progress
.m_GitCmdList
.push_back(cmd
);
2302 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REQUESTPULL
)));
2303 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
2304 INT_PTR ret
= progress
.DoModal();
2306 if(!progress
.m_GitStatus
)
2308 if (CHooks::Instance().PostPush(list
,exitcode
, error
))
2313 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2314 //ReportError(temp);
2315 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2319 if(ret
== IDC_PROGRESS_BUTTON1
)
2321 RequestPull(dlg
.m_BranchRemoteName
);
2323 else if(ret
== IDC_PROGRESS_BUTTON1
+ 1)
2334 bool CAppUtils::RequestPull(CString endrevision
, CString repositoryUrl
)
2336 CRequestPullDlg dlg
;
2337 dlg
.m_RepositoryURL
= repositoryUrl
;
2338 dlg
.m_EndRevision
= endrevision
;
2339 if (dlg
.DoModal()==IDOK
)
2342 cmd
.Format(_T("git.exe request-pull %s \"%s\" %s"), dlg
.m_StartRevision
, dlg
.m_RepositoryURL
, dlg
.m_EndRevision
);
2344 CSysProgressDlg sysProgressDlg
;
2345 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2346 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_CREATINGPULLREUQEST
)));
2347 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2348 sysProgressDlg
.SetShowProgressBar(false);
2349 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2351 CString tempFileName
= GetTempFile();
2352 if (g_Git
.RunLogFile(cmd
, tempFileName
))
2354 CMessageBox::Show(NULL
, IDS_ERR_PULLREUQESTFAILED
, IDS_APPNAME
, MB_OK
);
2358 if (sysProgressDlg
.HasUserCancelled())
2360 CMessageBox::Show(NULL
, IDS_SVN_USERCANCELLED
, IDS_APPNAME
, MB_OK
);
2361 ::DeleteFile(tempFileName
);
2365 sysProgressDlg
.Stop();
2367 CAppUtils::LaunchAlternativeEditor(tempFileName
);
2372 bool CAppUtils::CreateMultipleDirectory(const CString
& szPath
)
2374 CString
strDir(szPath
);
2375 if (strDir
.GetAt(strDir
.GetLength()-1)!=_T('\\'))
2377 strDir
.AppendChar(_T('\\'));
2379 std::vector
<CString
> vPath
;
2381 bool bSuccess
= false;
2383 for (int i
=0;i
<strDir
.GetLength();++i
)
2385 if (strDir
.GetAt(i
) != _T('\\'))
2387 strTemp
.AppendChar(strDir
.GetAt(i
));
2391 vPath
.push_back(strTemp
);
2392 strTemp
.AppendChar(_T('\\'));
2396 std::vector
<CString
>::const_iterator vIter
;
2397 for (vIter
= vPath
.begin(); vIter
!= vPath
.end(); vIter
++)
2399 bSuccess
= CreateDirectory(*vIter
, NULL
) ? true : false;
2405 void CAppUtils::RemoveTrailSlash(CString
&path
)
2410 while(path
[path
.GetLength()-1] == _T('\\') || path
[path
.GetLength()-1] == _T('/' ) )
2412 path
=path
.Left(path
.GetLength()-1);
2418 bool CAppUtils::CheckUserData()
2420 while(g_Git
.GetUserName().IsEmpty() || g_Git
.GetUserEmail().IsEmpty())
2422 if(CMessageBox::Show(NULL
, IDS_PROC_NOUSERDATA
, IDS_APPNAME
, MB_YESNO
| MB_ICONERROR
) == IDYES
)
2424 CTGitPath
path(g_Git
.m_CurrentDir
);
2425 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
,&path
);
2426 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
2427 dlg
.SetTreeWidth(220);
2428 dlg
.m_DefaultPage
= _T("gitconfig");
2431 dlg
.HandleRestart();
2441 BOOL
CAppUtils::Commit(CString bugid
,BOOL bWholeProject
,CString
&sLogMsg
,
2442 CTGitPathList
&pathList
,
2443 CTGitPathList
&selectedList
,
2444 bool bSelectFilesForCommit
,
2447 bool bFailed
= true;
2449 if (!CheckUserData())
2456 dlg
.m_sBugID
= bugid
;
2458 dlg
.m_bWholeProject
= bWholeProject
;
2460 dlg
.m_sLogMessage
= sLogMsg
;
2461 dlg
.m_pathList
= pathList
;
2462 dlg
.m_checkedPathList
= selectedList
;
2463 dlg
.m_bSelectFilesForCommit
= bSelectFilesForCommit
;
2464 dlg
.m_bAutoClose
= autoClose
;
2465 if (dlg
.DoModal() == IDOK
)
2467 if (dlg
.m_pathList
.GetCount()==0)
2469 // if the user hasn't changed the list of selected items
2470 // we don't use that list. Because if we would use the list
2471 // of pre-checked items, the dialog would show different
2472 // checked items on the next startup: it would only try
2473 // to check the parent folder (which might not even show)
2474 // instead, we simply use an empty list and let the
2475 // default checking do its job.
2476 if (!dlg
.m_pathList
.IsEqual(pathList
))
2477 selectedList
= dlg
.m_pathList
;
2478 pathList
= dlg
.m_updatedPathList
;
2479 sLogMsg
= dlg
.m_sLogMessage
;
2480 bSelectFilesForCommit
= true;
2482 if( dlg
.m_bPushAfterCommit
)
2484 switch(dlg
.m_PostCmd
)
2486 case GIT_POST_CMD_DCOMMIT
:
2487 CAppUtils::SVNDCommit();
2493 else if (dlg
.m_bCreateTagAfterCommit
)
2495 CAppUtils::CreateBranchTag(TRUE
);
2498 // CGitProgressDlg progDlg;
2499 // progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);
2500 // if (parser.HasVal(_T("closeonend")))
2501 // progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
2502 // progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);
2503 // progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);
2504 // progDlg.SetPathList(dlg.m_pathList);
2505 // progDlg.SetCommitMessage(dlg.m_sLogMessage);
2506 // progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);
2507 // progDlg.SetSelectedList(dlg.m_selectedPathList);
2508 // progDlg.SetItemCount(dlg.m_itemsCount);
2509 // progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);
2510 // progDlg.DoModal();
2511 // CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
2512 // err = (DWORD)progDlg.DidErrorsOccur();
2513 // bFailed = progDlg.DidErrorsOccur();
2514 // bRet = progDlg.DidErrorsOccur();
2515 // CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);
2516 // if (DWORD(bFailRepeat)==0)
2517 // bFailed = false; // do not repeat if the user chose not to in the settings.
2524 BOOL
CAppUtils::SVNDCommit()
2526 CSVNDCommitDlg dcommitdlg
;
2527 CString gitSetting
= g_Git
.GetConfigValue(_T("svn.rmdir"));
2528 if (gitSetting
== _T("")) {
2529 if (dcommitdlg
.DoModal() != IDOK
)
2535 if (dcommitdlg
.m_remember
)
2537 if (dcommitdlg
.m_rmdir
)
2539 gitSetting
= _T("true");
2543 gitSetting
= _T("false");
2545 if(g_Git
.SetConfigValue(_T("svn.rmdir"),gitSetting
))
2548 msg
.Format(IDS_PROC_SAVECONFIGFAILED
, _T("svn.rmdir"), gitSetting
);
2549 CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
2555 BOOL IsStash
= false;
2556 if(!g_Git
.CheckCleanWorkTree())
2558 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
2560 CSysProgressDlg sysProgressDlg
;
2561 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2562 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2563 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2564 sysProgressDlg
.SetShowProgressBar(false);
2565 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2566 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2569 cmd
=_T("git.exe stash");
2570 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2572 sysProgressDlg
.Stop();
2573 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2576 sysProgressDlg
.Stop();
2586 CProgressDlg progress
;
2587 if (dcommitdlg
.m_rmdir
)
2589 progress
.m_GitCmd
=_T("git.exe svn dcommit --rmdir");
2593 progress
.m_GitCmd
=_T("git.exe svn dcommit");
2595 if(progress
.DoModal()==IDOK
&& progress
.m_GitStatus
== 0)
2599 if(CMessageBox::Show(NULL
,IDS_DCOMMIT_STASH_POP
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
2601 CSysProgressDlg sysProgressDlg
;
2602 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2603 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2604 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2605 sysProgressDlg
.SetShowProgressBar(false);
2606 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2607 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2610 cmd
=_T("git.exe stash pop");
2611 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2613 sysProgressDlg
.Stop();
2614 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2617 sysProgressDlg
.Stop();
2629 static void MergeCallback(CProgressDlg
*dlg
, void *caller
, int result
)
2631 UNREFERENCED_PARAMETER(caller
);
2635 dlg
->m_PostCmdList
.RemoveAll();
2638 if (!g_Git
.ListConflictFile(list
) && list
.GetCount() > 0)
2640 // there are conflict files
2641 dlg
->m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE
)));
2646 BOOL
CAppUtils::Merge(CString
*commit
)
2648 if (!CheckUserData())
2653 dlg
.m_initialRefName
= *commit
;
2655 if(dlg
.DoModal()==IDOK
)
2667 squash
=_T("--squash");
2670 nocommit
=_T("--no-commit");
2672 if(!dlg
.m_strLogMesage
.IsEmpty())
2674 CString logmsg
= dlg
.m_strLogMesage
;
2675 logmsg
.Replace(_T("\""), _T("\\\""));
2676 msg
+= _T("-m \"") + logmsg
+ _T("\"");
2678 cmd
.Format(_T("git.exe merge %s %s %s %s %s"),
2683 g_Git
.FixBranchName(dlg
.m_VersionName
));
2685 CProgressDlg Prodlg
;
2686 Prodlg
.m_GitCmd
= cmd
;
2688 if (dlg
.m_bNoCommit
)
2689 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUCOMMIT
)));
2690 else if (dlg
.m_bIsBranch
)
2691 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REMOVEBRANCH
)));
2693 Prodlg
.m_PostCmdCallback
= MergeCallback
;
2695 INT_PTR ret
= Prodlg
.DoModal();
2696 if (Prodlg
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
2698 CTGitPathList pathlist
;
2699 CTGitPathList selectedlist
;
2700 pathlist
.AddPath(g_Git
.m_CurrentDir
);
2701 bool bSelectFilesForCommit
= !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE
));
2703 CAppUtils::Commit(CString(), false, str
, pathlist
, selectedlist
, bSelectFilesForCommit
);
2705 else if (ret
== IDC_PROGRESS_BUTTON1
)
2707 if (dlg
.m_bNoCommit
)
2710 CTGitPathList pathList
;
2711 CTGitPathList selectedList
;
2712 return Commit(_T(""), TRUE
, sLogMsg
, pathList
, selectedList
, true);
2714 else if (dlg
.m_bIsBranch
)
2717 msg
.Format(IDS_PROC_DELETEBRANCHTAG
, dlg
.m_VersionName
);
2718 if (CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), 2, IDI_QUESTION
, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 1)
2721 cmd
.Format(_T("git.exe branch -D -- %s"), dlg
.m_VersionName
);
2722 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2723 MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
);
2728 return !Prodlg
.m_GitStatus
;
2733 void CAppUtils::EditNote(GitRev
*rev
)
2735 if (!CheckUserData())
2739 dlg
.m_sHintText
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
2740 dlg
.m_sInputText
= rev
->m_Notes
;
2741 dlg
.m_sTitle
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
2742 //dlg.m_pProjectProperties = &m_ProjectProperties;
2743 dlg
.m_bUseLogWidth
= true;
2744 if(dlg
.DoModal() == IDOK
)
2747 cmd
=_T("notes add -f -F \"");
2749 CString tempfile
=::GetTempFile();
2750 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_sInputText
);
2753 cmd
+= rev
->m_CommitHash
.ToString();
2757 if (git_run_cmd("notes", CUnicodeUtils::GetMulti(cmd
, CP_UTF8
).GetBuffer()))
2759 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2764 rev
->m_Notes
= dlg
.m_sInputText
;
2768 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2770 CFile::Remove(tempfile
);
2775 int CAppUtils::GetMsysgitVersion(CString
*versionstr
)
2778 CString versiondebug
;
2781 CRegDWORD regTime
= CRegDWORD(_T("Software\\TortoiseGit\\git_file_time"));
2782 CRegDWORD regVersion
= CRegDWORD(_T("Software\\TortoiseGit\\git_cached_version"));
2784 CString gitpath
= CGit::ms_LastMsysGitDir
+_T("\\git.exe");
2787 if(!g_Git
.GetFileModifyTime(gitpath
, &time
) && !versionstr
)
2789 if((DWORD
)time
== regTime
)
2796 version
= *versionstr
;
2800 cmd
= _T("git.exe --version");
2801 if (g_Git
.Run(cmd
, &version
, &err
, CP_UTF8
))
2803 CMessageBox::Show(NULL
, _T("git have not installed (") + err
+ _T(")"), _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
2811 versiondebug
= version
;
2815 CString str
=version
.Tokenize(_T("."), start
);
2816 int space
= str
.ReverseFind(_T(' '));
2817 str
= str
.Mid(space
+1,start
);
2821 version
= version
.Mid(start
);
2824 str
= version
.Tokenize(_T("."), start
);
2826 ver
|= (_ttol(str
) & 0xFF) << 16;
2828 str
= version
.Tokenize(_T("."), start
);
2829 ver
|= (_ttol(str
) & 0xFF) << 8;
2831 str
= version
.Tokenize(_T("."), start
);
2832 ver
|= (_ttol(str
) & 0xFF);
2838 CMessageBox::Show(NULL
, _T("Could not parse git.exe version number: \"") + versiondebug
+ _T("\""), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
2843 regTime
= time
&0xFFFFFFFF;
2849 void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd
)
2851 typedef HRESULT (WINAPI
*SHGPSFW
) (HWND hwnd
,REFIID riid
,void** ppv
);
2853 CAutoLibrary hShell
= AtlLoadSystemLibraryUsingFullPath(_T("Shell32.dll"));
2855 if (hShell
.IsValid()) {
2856 SHGPSFW pfnSHGPSFW
= (SHGPSFW
)::GetProcAddress(hShell
, "SHGetPropertyStoreForWindow");
2858 IPropertyStore
*pps
;
2859 HRESULT hr
= pfnSHGPSFW(hWnd
, IID_PPV_ARGS(&pps
));
2860 if (SUCCEEDED(hr
)) {
2863 var
.boolVal
= VARIANT_TRUE
;
2864 hr
= pps
->SetValue(PKEY_AppUserModel_PreventPinning
, var
);
2871 void CAppUtils::SetWindowTitle(HWND hWnd
, const CString
& urlorpath
, const CString
& dialogname
)
2873 ASSERT(dialogname
.GetLength() < 70);
2874 ASSERT(urlorpath
.GetLength() < MAX_PATH
);
2875 WCHAR pathbuf
[MAX_PATH
] = {0};
2877 PathCompactPathEx(pathbuf
, urlorpath
, 70 - dialogname
.GetLength(), 0);
2879 wcscat_s(pathbuf
, L
" - ");
2880 wcscat_s(pathbuf
, dialogname
);
2881 wcscat_s(pathbuf
, L
" - ");
2882 wcscat_s(pathbuf
, CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2883 SetWindowText(hWnd
, pathbuf
);
2886 bool CAppUtils::BisectStart(CString lastGood
, CString firstBad
, bool autoClose
)
2888 if (!g_Git
.CheckCleanWorkTree())
2890 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
2892 CSysProgressDlg sysProgressDlg
;
2893 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2894 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2895 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2896 sysProgressDlg
.SetShowProgressBar(false);
2897 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2898 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2901 cmd
= _T("git.exe stash");
2902 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2904 sysProgressDlg
.Stop();
2905 CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), MB_OK
);
2908 sysProgressDlg
.Stop();
2914 CBisectStartDlg bisectStartDlg
;
2916 if (!lastGood
.IsEmpty())
2917 bisectStartDlg
.m_sLastGood
= lastGood
;
2918 if (!firstBad
.IsEmpty())
2919 bisectStartDlg
.m_sFirstBad
= firstBad
;
2921 if (bisectStartDlg
.DoModal() == IDOK
)
2923 CProgressDlg progress
;
2924 theApp
.m_pMainWnd
= &progress
;
2925 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2926 progress
.m_GitCmdList
.push_back(_T("git.exe bisect start"));
2927 progress
.m_GitCmdList
.push_back(_T("git.exe bisect good ") + bisectStartDlg
.m_LastGoodRevision
);
2928 progress
.m_GitCmdList
.push_back(_T("git.exe bisect bad ") + bisectStartDlg
.m_FirstBadRevision
);
2930 CTGitPath
path(g_Git
.m_CurrentDir
);
2932 if (path
.HasSubmodules())
2933 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
2935 INT_PTR ret
= progress
.DoModal();
2936 if (path
.HasSubmodules() && ret
== IDC_PROGRESS_BUTTON1
)
2939 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
2941 CAppUtils::RunTortoiseGitProc(sCmd
);
2944 else if (ret
== IDOK
)