1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2003-2011, 2013 - 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.
21 #include "TortoiseProc.h"
22 #include "PathUtils.h"
24 #include "StringUtils.h"
25 #include "MessageBox.h"
29 #include "UnicodeUtils.h"
30 #include "ExportDlg.h"
31 #include "ProgressDlg.h"
32 #include "GitAdminDir.h"
33 #include "ProgressDlg.h"
34 #include "BrowseFolder.h"
35 #include "DirFileEnum.h"
36 #include "MessageBox.h"
37 #include "GitStatus.h"
38 #include "CreateBranchTagDlg.h"
39 #include "GitSwitchDlg.h"
41 #include "DeleteConflictDlg.h"
42 #include "ChangedDlg.h"
43 #include "SendMailDlg.h"
44 #include "GitProgressDlg.h"
46 #include "CommitDlg.h"
48 #include "MergeAbortDlg.h"
50 #include "..\Settings\Settings.h"
52 #include "SVNDCommitDlg.h"
53 #include "requestpulldlg.h"
54 #include "PullFetchDlg.h"
55 #include "FileDiffDlg.h"
56 #include "RebaseDlg.h"
58 #include "StashSave.h"
59 #include "IgnoreDlg.h"
60 #include "FormatMessageWrapper.h"
61 #include "SmartHandle.h"
62 #include "BisectStartDlg.h"
63 #include "SysProgressDlg.h"
64 #include "UserPassword.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;
253 // is there an extension specific merge tool?
254 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext
.MakeLower());
255 if (!CString(mergetool
).IsEmpty())
260 if (GetMimeType(yourfile
, mimetype
) || GetMimeType(theirfile
, mimetype
) || GetMimeType(basefile
, mimetype
))
262 // is there a mime type specific merge tool?
263 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype
);
264 if (CString(mergetool
) != "")
269 // is there a filename specific merge tool?
270 CRegString
mergetool(_T("Software\\TortoiseGit\\MergeTools\\.") + mergedfile
.GetFilename().MakeLower());
271 if (!CString(mergetool
).IsEmpty())
276 if (com
.IsEmpty()||(com
.Left(1).Compare(_T("#"))==0))
278 // Maybe we should use TortoiseIDiff?
279 if ((ext
== _T(".jpg")) || (ext
== _T(".jpeg")) ||
280 (ext
== _T(".bmp")) || (ext
== _T(".gif")) ||
281 (ext
== _T(".png")) || (ext
== _T(".ico")) ||
282 (ext
== _T(".tif")) || (ext
== _T(".tiff")) ||
283 (ext
== _T(".dib")) || (ext
== _T(".emf")))
285 com
= CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe");
286 com
= _T("\"") + com
+ _T("\"");
287 com
= com
+ _T(" /base:%base /theirs:%theirs /mine:%mine /result:%merged");
288 com
= com
+ _T(" /basetitle:%bname /theirstitle:%tname /minetitle:%yname");
292 // use TortoiseGitMerge
294 CRegString
tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE
);
295 com
= tortoiseMergePath
;
298 com
= CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe");
300 com
= _T("\"") + com
+ _T("\"");
301 com
= com
+ _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
302 com
= com
+ _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
304 if (!g_sGroupingUUID
.IsEmpty())
306 com
+= L
" /groupuuid:\"";
307 com
+= g_sGroupingUUID
;
311 // check if the params are set. If not, just add the files to the command line
312 if ((com
.Find(_T("%merged"))<0)&&(com
.Find(_T("%base"))<0)&&(com
.Find(_T("%theirs"))<0)&&(com
.Find(_T("%mine"))<0))
314 com
+= _T(" \"")+basefile
.GetWinPathString()+_T("\"");
315 com
+= _T(" \"")+theirfile
.GetWinPathString()+_T("\"");
316 com
+= _T(" \"")+yourfile
.GetWinPathString()+_T("\"");
317 com
+= _T(" \"")+mergedfile
.GetWinPathString()+_T("\"");
319 if (basefile
.IsEmpty())
321 com
.Replace(_T("/base:%base"), _T(""));
322 com
.Replace(_T("%base"), _T(""));
325 com
.Replace(_T("%base"), _T("\"") + basefile
.GetWinPathString() + _T("\""));
326 if (theirfile
.IsEmpty())
328 com
.Replace(_T("/theirs:%theirs"), _T(""));
329 com
.Replace(_T("%theirs"), _T(""));
332 com
.Replace(_T("%theirs"), _T("\"") + theirfile
.GetWinPathString() + _T("\""));
333 if (yourfile
.IsEmpty())
335 com
.Replace(_T("/mine:%mine"), _T(""));
336 com
.Replace(_T("%mine"), _T(""));
339 com
.Replace(_T("%mine"), _T("\"") + yourfile
.GetWinPathString() + _T("\""));
340 if (mergedfile
.IsEmpty())
342 com
.Replace(_T("/merged:%merged"), _T(""));
343 com
.Replace(_T("%merged"), _T(""));
346 com
.Replace(_T("%merged"), _T("\"") + mergedfile
.GetWinPathString() + _T("\""));
347 if (basename
.IsEmpty())
349 if (basefile
.IsEmpty())
351 com
.Replace(_T("/basename:%bname"), _T(""));
352 com
.Replace(_T("%bname"), _T(""));
356 com
.Replace(_T("%bname"), _T("\"") + basefile
.GetUIFileOrDirectoryName() + _T("\""));
360 com
.Replace(_T("%bname"), _T("\"") + basename
+ _T("\""));
361 if (theirname
.IsEmpty())
363 if (theirfile
.IsEmpty())
365 com
.Replace(_T("/theirsname:%tname"), _T(""));
366 com
.Replace(_T("%tname"), _T(""));
370 com
.Replace(_T("%tname"), _T("\"") + theirfile
.GetUIFileOrDirectoryName() + _T("\""));
374 com
.Replace(_T("%tname"), _T("\"") + theirname
+ _T("\""));
375 if (yourname
.IsEmpty())
377 if (yourfile
.IsEmpty())
379 com
.Replace(_T("/minename:%yname"), _T(""));
380 com
.Replace(_T("%yname"), _T(""));
384 com
.Replace(_T("%yname"), _T("\"") + yourfile
.GetUIFileOrDirectoryName() + _T("\""));
388 com
.Replace(_T("%yname"), _T("\"") + yourname
+ _T("\""));
389 if (mergedname
.IsEmpty())
391 if (mergedfile
.IsEmpty())
393 com
.Replace(_T("/mergedname:%mname"), _T(""));
394 com
.Replace(_T("%mname"), _T(""));
398 com
.Replace(_T("%mname"), _T("\"") + mergedfile
.GetUIFileOrDirectoryName() + _T("\""));
402 com
.Replace(_T("%mname"), _T("\"") + mergedname
+ _T("\""));
404 if ((bReadOnly
)&&(bInternal
))
405 com
+= _T(" /readonly");
407 if(!LaunchApplication(com
, IDS_ERR_EXTMERGESTART
, false))
415 BOOL
CAppUtils::StartExtPatch(const CTGitPath
& patchfile
, const CTGitPath
& dir
, const CString
& sOriginalDescription
, const CString
& sPatchedDescription
, BOOL bReversed
, BOOL bWait
)
418 // use TortoiseGitMerge
419 viewer
= CPathUtils::GetAppDirectory();
420 viewer
+= _T("TortoiseGitMerge.exe");
422 viewer
= _T("\"") + viewer
+ _T("\"");
423 viewer
= viewer
+ _T(" /diff:\"") + patchfile
.GetWinPathString() + _T("\"");
424 viewer
= viewer
+ _T(" /patchpath:\"") + dir
.GetWinPathString() + _T("\"");
426 viewer
+= _T(" /reversedpatch");
427 if (!sOriginalDescription
.IsEmpty())
428 viewer
= viewer
+ _T(" /patchoriginal:\"") + sOriginalDescription
+ _T("\"");
429 if (!sPatchedDescription
.IsEmpty())
430 viewer
= viewer
+ _T(" /patchpatched:\"") + sPatchedDescription
+ _T("\"");
431 if (!g_sGroupingUUID
.IsEmpty())
433 viewer
+= L
" /groupuuid:\"";
434 viewer
+= g_sGroupingUUID
;
437 if(!LaunchApplication(viewer
, IDS_ERR_DIFFVIEWSTART
, !!bWait
))
444 CString
CAppUtils::PickDiffTool(const CTGitPath
& file1
, const CTGitPath
& file2
)
446 CString difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file2
.GetFilename().MakeLower());
447 if (!difftool
.IsEmpty())
449 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file1
.GetFilename().MakeLower());
450 if (!difftool
.IsEmpty())
453 // Is there a mime type specific diff tool?
455 if (GetMimeType(file1
, mimetype
) || GetMimeType(file2
, mimetype
))
457 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype
);
458 if (!difftool
.IsEmpty())
462 // Is there an extension specific diff tool?
463 CString ext
= file2
.GetFileExtension().MakeLower();
466 difftool
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext
);
467 if (!difftool
.IsEmpty())
469 // Maybe we should use TortoiseIDiff?
470 if ((ext
== _T(".jpg")) || (ext
== _T(".jpeg")) ||
471 (ext
== _T(".bmp")) || (ext
== _T(".gif")) ||
472 (ext
== _T(".png")) || (ext
== _T(".ico")) ||
473 (ext
== _T(".dib")) || (ext
== _T(".emf")))
476 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitIDiff.exe") + _T("\"") +
477 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname") +
478 L
" /groupuuid:\"" + g_sGroupingUUID
+ L
"\"";
482 // Finally, pick a generic external diff tool
483 difftool
= CRegString(_T("Software\\TortoiseGit\\Diff"));
487 bool CAppUtils::StartExtDiff(
488 const CString
& file1
, const CString
& file2
,
489 const CString
& sName1
, const CString
& sName2
,
490 const CString
& originalFile1
, const CString
& originalFile2
,
491 const git_revnum_t
& hash1
, const git_revnum_t
& hash2
,
492 const DiffFlags
& flags
)
496 CRegDWORD
blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE
);
497 if (!flags
.bBlame
|| !(DWORD
)blamediff
)
499 viewer
= PickDiffTool(file1
, file2
);
500 // If registry entry for a diff program is commented out, use TortoiseGitMerge.
501 bool bCommentedOut
= viewer
.Left(1) == _T("#");
502 if (flags
.bAlternativeTool
)
504 // Invert external vs. internal diff tool selection.
506 viewer
.Delete(0); // uncomment
510 else if (bCommentedOut
)
514 bool bInternal
= viewer
.IsEmpty();
518 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe") + _T("\"") +
519 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
520 if (!g_sGroupingUUID
.IsEmpty())
522 viewer
+= L
" /groupuuid:\"";
523 viewer
+= g_sGroupingUUID
;
527 viewer
+= _T(" /blame");
529 // check if the params are set. If not, just add the files to the command line
530 if ((viewer
.Find(_T("%base"))<0)&&(viewer
.Find(_T("%mine"))<0))
532 viewer
+= _T(" \"")+file1
+_T("\"");
533 viewer
+= _T(" \"")+file2
+_T("\"");
535 if (viewer
.Find(_T("%base")) >= 0)
537 viewer
.Replace(_T("%base"), _T("\"")+file1
+_T("\""));
539 if (viewer
.Find(_T("%mine")) >= 0)
541 viewer
.Replace(_T("%mine"), _T("\"")+file2
+_T("\""));
544 if (sName1
.IsEmpty())
545 viewer
.Replace(_T("%bname"), _T("\"") + file1
+ _T("\""));
547 viewer
.Replace(_T("%bname"), _T("\"") + sName1
+ _T("\""));
549 if (sName2
.IsEmpty())
550 viewer
.Replace(_T("%yname"), _T("\"") + file2
+ _T("\""));
552 viewer
.Replace(_T("%yname"), _T("\"") + sName2
+ _T("\""));
554 viewer
.Replace(_T("%bpath"), _T("\"") + originalFile1
+ _T("\""));
555 viewer
.Replace(_T("%ypath"), _T("\"") + originalFile2
+ _T("\""));
557 viewer
.Replace(_T("%brev"), _T("\"") + hash1
+ _T("\""));
558 viewer
.Replace(_T("%yrev"), _T("\"") + hash2
+ _T("\""));
560 if (flags
.bReadOnly
&& bInternal
)
561 viewer
+= _T(" /readonly");
563 return LaunchApplication(viewer
, IDS_ERR_EXTDIFFSTART
, flags
.bWait
);
566 BOOL
CAppUtils::StartUnifiedDiffViewer(const CString
& patchfile
, const CString
& title
, BOOL bWait
)
569 CRegString v
= CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
571 if (viewer
.IsEmpty() || (viewer
.Left(1).Compare(_T("#"))==0))
573 // use TortoiseGitUDiff
574 viewer
= CPathUtils::GetAppDirectory();
575 viewer
+= _T("TortoiseGitUDiff.exe");
576 // enquote the path to TortoiseGitUDiff
577 viewer
= _T("\"") + viewer
+ _T("\"");
579 viewer
= viewer
+ _T(" /patchfile:%1 /title:\"%title\"");
580 if (!g_sGroupingUUID
.IsEmpty())
582 viewer
+= L
" /groupuuid:\"";
583 viewer
+= g_sGroupingUUID
;
587 if (viewer
.Find(_T("%1"))>=0)
589 if (viewer
.Find(_T("\"%1\"")) >= 0)
590 viewer
.Replace(_T("%1"), patchfile
);
592 viewer
.Replace(_T("%1"), _T("\"") + patchfile
+ _T("\""));
595 viewer
+= _T(" \"") + patchfile
+ _T("\"");
596 if (viewer
.Find(_T("%title")) >= 0)
598 viewer
.Replace(_T("%title"), title
);
601 if(!LaunchApplication(viewer
, IDS_ERR_DIFFVIEWSTART
, !!bWait
))
608 BOOL
CAppUtils::StartTextViewer(CString file
)
611 CRegString txt
= CRegString(_T(".txt\\"), _T(""), FALSE
, HKEY_CLASSES_ROOT
);
613 viewer
= viewer
+ _T("\\Shell\\Open\\Command\\");
614 CRegString txtexe
= CRegString(viewer
, _T(""), FALSE
, HKEY_CLASSES_ROOT
);
617 DWORD len
= ExpandEnvironmentStrings(viewer
, NULL
, 0);
618 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[len
+ 1]);
619 ExpandEnvironmentStrings(viewer
, buf
.get(), len
);
621 len
= ExpandEnvironmentStrings(file
, NULL
, 0);
622 std::unique_ptr
<TCHAR
[]> buf2(new TCHAR
[len
+ 1]);
623 ExpandEnvironmentStrings(file
, buf2
.get(), len
);
625 file
= _T("\"")+file
+_T("\"");
626 if (viewer
.IsEmpty())
628 viewer
= _T("RUNDLL32 Shell32,OpenAs_RunDLL");
630 if (viewer
.Find(_T("\"%1\"")) >= 0)
632 viewer
.Replace(_T("\"%1\""), file
);
634 else if (viewer
.Find(_T("%1")) >= 0)
636 viewer
.Replace(_T("%1"), file
);
644 if(!LaunchApplication(viewer
, IDS_ERR_TEXTVIEWSTART
, false))
651 BOOL
CAppUtils::CheckForEmptyDiff(const CTGitPath
& sDiffPath
)
654 CAutoFile hFile
= ::CreateFile(sDiffPath
.GetWinPath(), GENERIC_READ
, FILE_SHARE_READ
| FILE_SHARE_WRITE
, NULL
, OPEN_EXISTING
, NULL
, NULL
);
657 length
= ::GetFileSize(hFile
, NULL
);
664 void CAppUtils::CreateFontForLogs(CFont
& fontToCreate
)
667 HDC hScreenDC
= ::GetDC(NULL
);
668 logFont
.lfHeight
= -MulDiv((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC
, LOGPIXELSY
), 72);
669 ::ReleaseDC(NULL
, hScreenDC
);
671 logFont
.lfEscapement
= 0;
672 logFont
.lfOrientation
= 0;
673 logFont
.lfWeight
= FW_NORMAL
;
674 logFont
.lfItalic
= 0;
675 logFont
.lfUnderline
= 0;
676 logFont
.lfStrikeOut
= 0;
677 logFont
.lfCharSet
= DEFAULT_CHARSET
;
678 logFont
.lfOutPrecision
= OUT_DEFAULT_PRECIS
;
679 logFont
.lfClipPrecision
= CLIP_DEFAULT_PRECIS
;
680 logFont
.lfQuality
= DRAFT_QUALITY
;
681 logFont
.lfPitchAndFamily
= FF_DONTCARE
| FIXED_PITCH
;
682 _tcscpy_s(logFont
.lfFaceName
, 32, (LPCTSTR
)(CString
)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
683 VERIFY(fontToCreate
.CreateFontIndirect(&logFont
));
686 bool CAppUtils::LaunchPAgent(CString
*keyfile
,CString
* pRemote
)
700 cmd
.Format(_T("remote.%s.puttykeyfile"),remote
);
701 key
= g_Git
.GetConfigValue(cmd
);
703 key
= key
.Tokenize(_T("\n"),start
);
711 CString proc
=CPathUtils::GetAppDirectory();
712 proc
+= _T("pageant.exe \"");
716 CString tempfile
= GetTempFile();
717 ::DeleteFile(tempfile
);
719 proc
+= _T(" -c \"");
720 proc
+= CPathUtils::GetAppDirectory();
721 proc
+= _T("tgittouch.exe\"");
726 CString appDir
= CPathUtils::GetAppDirectory();
727 bool b
= LaunchApplication(proc
, IDS_ERR_PAGEANT
, true, &appDir
);
732 while(!::PathFileExists(tempfile
))
737 break; //timeout 5 minutes
742 CMessageBox::Show(NULL
, IDS_ERR_PAEGENTTIMEOUT
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
744 ::DeleteFile(tempfile
);
747 bool CAppUtils::LaunchAlternativeEditor(const CString
& filename
, bool uac
)
749 CString editTool
= CRegString(_T("Software\\TortoiseGit\\AlternativeEditor"));
750 if (editTool
.IsEmpty() || (editTool
.Left(1).Compare(_T("#"))==0)) {
751 editTool
= CPathUtils::GetAppDirectory() + _T("notepad2.exe");
755 sCmd
.Format(_T("\"%s\" \"%s\""), editTool
, filename
);
757 LaunchApplication(sCmd
, NULL
, false, NULL
, uac
);
760 bool CAppUtils::LaunchRemoteSetting()
762 CTGitPath
path(g_Git
.m_CurrentDir
);
763 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
, &path
);
764 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
765 dlg
.SetTreeWidth(220);
766 dlg
.m_DefaultPage
= _T("gitremote");
773 * Launch the external blame viewer
775 bool CAppUtils::LaunchTortoiseBlame(const CString
& sBlameFile
,CString Rev
,const CString
& sParams
)
777 CString viewer
= _T("\"") + CPathUtils::GetAppDirectory();
778 viewer
+= _T("TortoiseGitBlame.exe");
779 viewer
+= _T("\" \"") + sBlameFile
+ _T("\"");
780 //viewer += _T(" \"") + sLogFile + _T("\"");
781 //viewer += _T(" \"") + sOriginalFile + _T("\"");
782 if(!Rev
.IsEmpty() && Rev
!= GIT_REV_ZERO
)
783 viewer
+= CString(_T(" /rev:"))+Rev
;
784 if (!g_sGroupingUUID
.IsEmpty())
786 viewer
+= L
" /groupuuid:\"";
787 viewer
+= g_sGroupingUUID
;
790 viewer
+= _T(" ")+sParams
;
792 return LaunchApplication(viewer
, IDS_ERR_TGITBLAME
, false);
795 bool CAppUtils::FormatTextInRichEditControl(CWnd
* pWnd
)
800 bool bStyled
= false;
801 pWnd
->GetWindowText(sText
);
802 // the rich edit control doesn't count the CR char!
803 // to be exact: CRLF is treated as one char.
806 // style each line separately
811 nNewlinePos
= sText
.Find('\n', offset
);
812 CString sLine
= sText
.Mid(offset
);
814 sLine
= sLine
.Left(nNewlinePos
-offset
);
817 while (FindStyleChars(sLine
, '*', start
, end
))
819 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
820 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
822 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
823 format
.cbSize
= sizeof(CHARFORMAT2
);
824 format
.dwMask
= CFM_BOLD
;
825 format
.dwEffects
= CFE_BOLD
;
826 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
832 while (FindStyleChars(sLine
, '^', start
, end
))
834 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
835 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
837 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
838 format
.cbSize
= sizeof(CHARFORMAT2
);
839 format
.dwMask
= CFM_ITALIC
;
840 format
.dwEffects
= CFE_ITALIC
;
841 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
847 while (FindStyleChars(sLine
, '_', start
, end
))
849 CHARRANGE range
= {(LONG
)start
+offset
, (LONG
)end
+offset
};
850 pWnd
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
852 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
853 format
.cbSize
= sizeof(CHARFORMAT2
);
854 format
.dwMask
= CFM_UNDERLINE
;
855 format
.dwEffects
= CFE_UNDERLINE
;
856 pWnd
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
860 offset
= nNewlinePos
+1;
861 } while(nNewlinePos
>=0);
865 bool CAppUtils::FindStyleChars(const CString
& sText
, TCHAR stylechar
, int& start
, int& end
)
868 bool bFoundMarker
= false;
869 // find a starting marker
870 while (sText
[i
] != 0)
872 if (sText
[i
] == stylechar
)
874 if (((i
+1)<sText
.GetLength())&&(IsCharAlphaNumeric(sText
[i
+1])) &&
875 (((i
>0)&&(!IsCharAlphaNumeric(sText
[i
-1])))||(i
==0)))
887 // find ending marker
888 bFoundMarker
= false;
889 while (sText
[i
] != 0)
891 if (sText
[i
] == stylechar
)
893 if ((IsCharAlphaNumeric(sText
[i
-1])) &&
894 ((((i
+1)<sText
.GetLength())&&(!IsCharAlphaNumeric(sText
[i
+1])))||(i
+1)==sText
.GetLength()))
907 CString
CAppUtils::GetProjectNameFromURL(CString url
)
910 while (name
.IsEmpty() || (name
.CompareNoCase(_T("branches"))==0) ||
911 (name
.CompareNoCase(_T("tags"))==0) ||
912 (name
.CompareNoCase(_T("trunk"))==0))
914 name
= url
.Mid(url
.ReverseFind('/')+1);
915 url
= url
.Left(url
.ReverseFind('/'));
917 if ((name
.Compare(_T("svn")) == 0)||(name
.Compare(_T("svnroot")) == 0))
919 // a name of svn or svnroot indicates that it's not really the project name. In that
920 // case, we try the first part of the URL
921 // of course, this won't work in all cases (but it works for Google project hosting)
922 url
.Replace(_T("http://"), _T(""));
923 url
.Replace(_T("https://"), _T(""));
924 url
.Replace(_T("svn://"), _T(""));
925 url
.Replace(_T("svn+ssh://"), _T(""));
926 url
.TrimLeft(_T("/"));
927 name
= url
.Left(url
.Find('.'));
932 bool CAppUtils::StartShowUnifiedDiff(HWND
/*hWnd*/, const CTGitPath
& url1
, const git_revnum_t
& rev1
,
933 const CTGitPath
& /*url2*/, const git_revnum_t
& rev2
,
934 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
935 bool /*bAlternateDiff*/ /* = false */, bool /*bIgnoreAncestry*/ /* = false */,
936 bool /* blame = false */,
941 if (GetMsysgitVersion() > 0x01080100)
942 diffContext
= _ttoi(g_Git
.GetConfigValue(_T("diff.context")));
943 CString tempfile
=GetTempFile();
944 if (g_Git
.GetUnifiedDiff(url1
, rev1
, rev2
, tempfile
, bMerge
, bCombine
, diffContext
))
946 TRACE("Fail get unified diff\n");
949 CAppUtils::StartUnifiedDiffViewer(tempfile
, rev1
+ _T(":") + rev2
);
953 sCmd
.Format(_T("%s /command:showcompare /unified"),
954 (LPCTSTR
)(CPathUtils::GetAppDirectory()+_T("TortoiseGitProc.exe")));
955 sCmd
+= _T(" /url1:\"") + url1
.GetGitPathString() + _T("\"");
957 sCmd
+= _T(" /revision1:") + rev1
.ToString();
958 sCmd
+= _T(" /url2:\"") + url2
.GetGitPathString() + _T("\"");
960 sCmd
+= _T(" /revision2:") + rev2
.ToString();
962 sCmd
+= _T(" /pegrevision:") + peg
.ToString();
963 if (headpeg
.IsValid())
964 sCmd
+= _T(" /headpegrevision:") + headpeg
.ToString();
967 sCmd
+= _T(" /alternatediff");
970 sCmd
+= _T(" /ignoreancestry");
974 sCmd
+= _T(" /hwnd:");
976 _stprintf_s(buf
, 30, _T("%d"), hWnd
);
980 return CAppUtils::LaunchApplication(sCmd
, NULL
, false);
985 bool CAppUtils::SetupDiffScripts(bool force
, const CString
& type
)
987 CString scriptsdir
= CPathUtils::GetAppParentDirectory();
988 scriptsdir
+= _T("Diff-Scripts");
989 CSimpleFileFind
files(scriptsdir
);
990 while (files
.FindNextFileNoDirectories())
992 CString file
= files
.GetFilePath();
993 CString filename
= files
.GetFileName();
994 CString ext
= file
.Mid(file
.ReverseFind('-') + 1);
995 ext
= _T(".") + ext
.Left(ext
.ReverseFind('.'));
996 std::set
<CString
> extensions
;
997 extensions
.insert(ext
);
999 if (file
.Right(3).CompareNoCase(_T("vbs"))==0)
1001 kind
= _T(" //E:vbscript");
1003 if (file
.Right(2).CompareNoCase(_T("js"))==0)
1005 kind
= _T(" //E:javascript");
1007 // open the file, read the first line and find possible extensions
1008 // this script can handle
1011 CStdioFile
f(file
, CFile::modeRead
| CFile::shareDenyNone
);
1013 if (f
.ReadString(extline
))
1015 if ((extline
.GetLength() > 15 ) &&
1016 ((extline
.Left(15).Compare(_T("// extensions: ")) == 0) ||
1017 (extline
.Left(14).Compare(_T("' extensions: ")) == 0)))
1019 if (extline
[0] == '/')
1020 extline
= extline
.Mid(15);
1022 extline
= extline
.Mid(14);
1025 sToken
= extline
.Tokenize(_T(";"), curPos
);
1026 while (!sToken
.IsEmpty())
1028 if (!sToken
.IsEmpty())
1030 if (sToken
[0] != '.')
1031 sToken
= _T(".") + sToken
;
1032 extensions
.insert(sToken
);
1034 sToken
= extline
.Tokenize(_T(";"), curPos
);
1040 catch (CFileException
* e
)
1045 for (std::set
<CString
>::const_iterator it
= extensions
.begin(); it
!= extensions
.end(); ++it
)
1047 if (type
.IsEmpty() || (type
.Compare(_T("Diff")) == 0))
1049 if (filename
.Left(5).CompareNoCase(_T("diff-")) == 0)
1051 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + *it
);
1052 CString diffregstring
= diffreg
;
1053 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1054 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %base %mine") + kind
;
1057 if (type
.IsEmpty() || (type
.Compare(_T("Merge"))==0))
1059 if (filename
.Left(6).CompareNoCase(_T("merge-"))==0)
1061 CRegString diffreg
= CRegString(_T("Software\\TortoiseGit\\MergeTools\\") + *it
);
1062 CString diffregstring
= diffreg
;
1063 if (force
|| (diffregstring
.IsEmpty()) || (diffregstring
.Find(filename
) >= 0))
1064 diffreg
= _T("wscript.exe \"") + file
+ _T("\" %merged %theirs %mine %base") + kind
;
1073 bool CAppUtils::Export(CString
*BashHash
)
1075 // ask from where the export has to be done
1078 dlg
.m_Revision
=*BashHash
;
1080 if (dlg
.DoModal() == IDOK
)
1083 cmd
.Format(_T("git.exe archive --output=\"%s\" --format=zip --verbose %s"),
1084 dlg
.m_strFile
, g_Git
.FixBranchName(dlg
.m_VersionName
));
1088 return (pro
.DoModal() == IDOK
);
1093 bool CAppUtils::CreateBranchTag(bool IsTag
,CString
*CommitHash
, bool switch_new_brach
)
1095 CCreateBranchTagDlg dlg
;
1097 dlg
.m_bSwitch
=switch_new_brach
;
1100 dlg
.m_initialRefName
= *CommitHash
;
1102 if(dlg
.DoModal()==IDOK
)
1107 if(dlg
.m_bTrack
== TRUE
)
1108 track
=_T(" --track ");
1109 else if(dlg
.m_bTrack
== FALSE
)
1110 track
=_T(" --no-track");
1121 cmd
.Format(_T("git.exe tag %s %s %s %s"),
1124 dlg
.m_BranchTagName
,
1125 g_Git
.FixBranchName(dlg
.m_VersionName
)
1128 CString tempfile
=::GetTempFile();
1129 if(!dlg
.m_Message
.Trim().IsEmpty())
1131 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_Message
);
1132 cmd
+= _T(" -F ")+tempfile
;
1137 cmd
.Format(_T("git.exe branch %s %s %s %s"),
1140 dlg
.m_BranchTagName
,
1141 g_Git
.FixBranchName(dlg
.m_VersionName
)
1145 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1147 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1150 if( !IsTag
&& dlg
.m_bSwitch
)
1152 // it is a new branch and the user has requested to switch to it
1153 PerformSwitch(dlg
.m_BranchTagName
);
1161 bool CAppUtils::Switch(CString initialRefName
, bool autoclose
)
1164 if(!initialRefName
.IsEmpty())
1165 dlg
.m_initialRefName
= initialRefName
;
1167 if (dlg
.DoModal() == IDOK
)
1171 branch
= dlg
.m_NewBranch
;
1173 // if refs/heads/ is not stripped, checkout will detach HEAD
1174 // checkout prefers branches on name clashes (with tags)
1175 if (dlg
.m_VersionName
.Left(11) ==_T("refs/heads/") && dlg
.m_bBranchOverride
!= TRUE
)
1176 dlg
.m_VersionName
= dlg
.m_VersionName
.Mid(11);
1178 return PerformSwitch(dlg
.m_VersionName
, dlg
.m_bForce
== TRUE
, branch
, dlg
.m_bBranchOverride
== TRUE
, dlg
.m_bTrack
, autoclose
, dlg
.m_bMerge
== TRUE
);
1183 bool CAppUtils::PerformSwitch(CString ref
, bool bForce
/* false */, CString sNewBranch
/* CString() */, bool bBranchOverride
/* false */, BOOL bTrack
/* 2 */, bool autoClose
/* false */, bool bMerge
/* false */)
1191 if(!sNewBranch
.IsEmpty()){
1192 if (bBranchOverride
)
1194 branch
.Format(_T("-B %s"), sNewBranch
);
1198 branch
.Format(_T("-b %s"), sNewBranch
);
1201 track
= _T("--track");
1202 else if (bTrack
== FALSE
)
1203 track
= _T("--no-track");
1208 merge
= _T("--merge");
1210 cmd
.Format(_T("git.exe checkout %s %s %s %s %s"),
1215 g_Git
.FixBranchName(ref
));
1217 CProgressDlg progress
;
1218 progress
.m_bAutoCloseOnSuccess
= autoClose
;
1219 progress
.m_GitCmd
= cmd
;
1221 INT_PTR idPull
= -1;
1222 INT_PTR idSubmoduleUpdate
= -1;
1223 INT_PTR idMerge
= -1;
1225 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1226 if (gitPath
.HasSubmodules())
1227 idSubmoduleUpdate
= progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1228 idPull
= progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPULL
)));
1229 CString currentBranch
;
1230 bool hasBranch
= g_Git
.GetCurrentBranchFromFile(g_Git
.m_CurrentDir
, currentBranch
) == 0;
1232 idMerge
= progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUMERGE
)));
1234 INT_PTR ret
= progress
.DoModal();
1235 if (idSubmoduleUpdate
>= 0 && ret
== IDC_PROGRESS_BUTTON1
+ idSubmoduleUpdate
)
1238 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1240 RunTortoiseGitProc(sCmd
);
1243 else if (ret
== IDC_PROGRESS_BUTTON1
+ idPull
)
1248 else if (ret
== IDC_PROGRESS_BUTTON1
+ idMerge
)
1250 Merge(¤tBranch
);
1253 else if (ret
== IDOK
)
1259 bool CAppUtils::OpenIgnoreFile(CStdioFile
&file
, const CString
& filename
)
1261 if (!file
.Open(filename
, CFile::modeCreate
| CFile::modeReadWrite
| CFile::modeNoTruncate
))
1263 CMessageBox::Show(NULL
, filename
+ _T(" Open Failure"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1267 if (file
.GetLength() > 0)
1269 file
.Seek(file
.GetLength() - 1, 0);
1270 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[1]);
1271 file
.Read(buf
.get(), 1);
1273 if (buf
.get()[0] != _T('\n'))
1274 file
.WriteString(_T("\n"));
1282 bool CAppUtils::IgnoreFile(CTGitPathList
&path
,bool IsMask
)
1284 CIgnoreDlg ignoreDlg
;
1285 if (ignoreDlg
.DoModal() == IDOK
)
1288 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\");
1290 switch (ignoreDlg
.m_IgnoreFile
)
1293 ignorefile
+= _T(".gitignore");
1296 g_GitAdminDir
.GetAdminDirPath(g_Git
.m_CurrentDir
, ignorefile
);
1297 ignorefile
+= _T("info/exclude");
1304 if (ignoreDlg
.m_IgnoreFile
!= 1 && !OpenIgnoreFile(file
, ignorefile
))
1307 for (int i
= 0; i
< path
.GetCount(); ++i
)
1309 if (ignoreDlg
.m_IgnoreFile
== 1)
1311 ignorefile
= g_Git
.m_CurrentDir
+ _T("\\") + path
[i
].GetContainingDirectory().GetWinPathString() + _T("\\.gitignore");
1312 if (!OpenIgnoreFile(file
, ignorefile
))
1316 CString ignorePattern
;
1317 if (ignoreDlg
.m_IgnoreType
== 0)
1319 if (ignoreDlg
.m_IgnoreFile
!= 1 && !path
[i
].GetContainingDirectory().GetGitPathString().IsEmpty())
1320 ignorePattern
+= _T("/") + path
[i
].GetContainingDirectory().GetGitPathString();
1322 ignorePattern
+= _T("/");
1326 ignorePattern
+= _T("*") + path
[i
].GetFileExtension();
1330 ignorePattern
+= path
[i
].GetFileOrDirectoryName();
1333 // escape [ and ] so that files get ignored correctly
1334 ignorePattern
.Replace(_T("["), _T("\\["));
1335 ignorePattern
.Replace(_T("]"), _T("\\]"));
1337 ignorePattern
+= _T("\n");
1338 CStringA ignorePatternA
= CUnicodeUtils::GetUTF8(ignorePattern
);
1339 file
.Write(ignorePatternA
.GetBuffer(), ignorePatternA
.GetLength());
1340 ignorePatternA
.ReleaseBuffer();
1342 if (ignoreDlg
.m_IgnoreFile
== 1)
1346 if (ignoreDlg
.m_IgnoreFile
!= 1)
1361 bool CAppUtils::GitReset(CString
*CommitHash
,int type
)
1364 dlg
.m_ResetType
=type
;
1365 dlg
.m_ResetToVersion
=*CommitHash
;
1366 dlg
.m_initialRefName
= *CommitHash
;
1367 if (dlg
.DoModal() == IDOK
)
1371 switch(dlg
.m_ResetType
)
1383 dlg
.m_ResetType
= 1;
1387 cmd
.Format(_T("git.exe reset %s %s"),type
, dlg
.m_ResetToVersion
);
1391 CProgressDlg progress
;
1392 progress
.m_GitCmd
=cmd
;
1394 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
1395 if (gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2)
1396 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
1398 progress
.m_PostFailCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MSGBOX_RETRY
)));
1401 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_RESET
))
1403 CGitProgressDlg gitdlg
;
1404 gitdlg
.SetCommand(CGitProgressList::GitProgress_Reset
);
1405 gitdlg
.SetRevision(dlg
.m_ResetToVersion
);
1406 gitdlg
.SetResetType(dlg
.m_ResetType
);
1407 ret
= gitdlg
.DoModal();
1410 ret
= progress
.DoModal();
1412 if (progress
.m_GitStatus
== 0 && gitPath
.HasSubmodules() && dlg
.m_ResetType
== 2 && ret
== IDC_PROGRESS_BUTTON1
)
1415 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
1417 RunTortoiseGitProc(sCmd
);
1420 else if (progress
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
1422 else if (ret
== IDOK
)
1431 void CAppUtils::DescribeFile(bool mode
, bool base
,CString
&descript
)
1435 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_DELETE
));
1440 descript
= CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED
));
1443 descript
= CString(MAKEINTRESOURCE(IDS_PROC_CREATED
));
1447 void CAppUtils::RemoveTempMergeFile(CTGitPath
&path
)
1449 CString tempmergefile
;
1452 tempmergefile
= CAppUtils::GetMergeTempFile(_T("LOCAL"),path
);
1453 CFile::Remove(tempmergefile
);
1460 tempmergefile
= CAppUtils::GetMergeTempFile(_T("REMOTE"),path
);
1461 CFile::Remove(tempmergefile
);
1468 tempmergefile
= CAppUtils::GetMergeTempFile(_T("BASE"),path
);
1469 CFile::Remove(tempmergefile
);
1474 CString
CAppUtils::GetMergeTempFile(CString type
,CTGitPath
&merge
)
1477 file
=g_Git
.m_CurrentDir
+_T("\\") + merge
.GetWinPathString()+_T(".")+type
+merge
.GetFileExtension();
1482 bool ParseHashesFromLsFile(BYTE_VECTOR
&out
, CString
&hash1
, CString
&hash2
, CString
&hash3
)
1484 unsigned int pos
= 0;
1488 while (pos
>= 0 && pos
< out
.size())
1492 g_Git
.StringAppend(&one
, &out
[pos
], CP_UTF8
);
1494 one
.Tokenize(_T("\t"), tabstart
);
1497 part
= one
.Tokenize(_T(" "), tabstart
); //Tag
1498 part
= one
.Tokenize(_T(" "), tabstart
); //Mode
1499 part
= one
.Tokenize(_T(" "), tabstart
); //Hash
1500 CString hash
= part
;
1501 part
= one
.Tokenize(_T("\t"), tabstart
); //Stage
1502 int stage
= _ttol(part
);
1505 else if (stage
== 2)
1507 else if (stage
== 3)
1513 pos
= out
.findNextString(pos
);
1519 bool CAppUtils::ConflictEdit(CTGitPath
&path
,bool /*bAlternativeTool*/,bool revertTheirMy
)
1523 CTGitPath merge
=path
;
1524 CTGitPath directory
= merge
.GetDirectory();
1526 // we have the conflicted file (%merged)
1527 // now look for the other required files
1529 //stat.GetStatus(merge);
1530 //if (stat.status == NULL)
1536 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge
.GetGitPathString());
1538 if (g_Git
.Run(cmd
, &vector
))
1543 if (merge
.IsDirectory())
1545 CString baseHash
, localHash
, remoteHash
;
1546 if (!ParseHashesFromLsFile(vector
, baseHash
, localHash
, remoteHash
))
1550 msg
.Format(_T("BASE: %s\nLOCAL: %s\nREMOTE: %s"), baseHash
, localHash
, remoteHash
);
1551 CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), MB_OK
);
1556 if (list
.ParserFromLsFile(vector
))
1558 CMessageBox::Show(NULL
, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK
);
1562 if(list
.GetCount() == 0)
1571 mine
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1572 theirs
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1576 mine
.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge
));
1577 theirs
.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge
));
1579 base
.SetFromGit(GetMergeTempFile(_T("BASE"),merge
));
1583 //format=_T("git.exe cat-file blob \":%d:%s\"");
1584 format
= _T("git checkout-index --temp --stage=%d -- \"%s\"");
1586 //create a empty file, incase stage is not three
1587 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1589 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1591 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
1594 bool b_base
=false, b_local
=false, b_remote
=false;
1596 for (int i
= 0; i
< list
.GetCount(); ++i
)
1603 if( list
[i
].m_Stage
== 1)
1605 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1607 outfile
= base
.GetWinPathString();
1610 if( list
[i
].m_Stage
== 2 )
1612 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1614 outfile
= mine
.GetWinPathString();
1617 if( list
[i
].m_Stage
== 3 )
1619 cmd
.Format(format
, list
[i
].m_Stage
, list
[i
].GetGitPathString());
1621 outfile
= theirs
.GetWinPathString();
1623 CString output
, err
;
1624 if(!outfile
.IsEmpty())
1625 if (!g_Git
.Run(cmd
, &output
, &err
, CP_UTF8
))
1629 file
= output
.Tokenize(_T("\t"), start
);
1630 ::MoveFileEx(file
,outfile
,MOVEFILE_REPLACE_EXISTING
|MOVEFILE_COPY_ALLOWED
);
1634 CMessageBox::Show(NULL
, output
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
1638 if(b_local
&& b_remote
)
1640 merge
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+merge
.GetWinPathString());
1642 bRet
= !!CAppUtils::StartExtMerge(base
, mine
, theirs
, merge
, _T("BASE"), _T("REMOTE"), _T("LOCAL"));
1644 bRet
= !!CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"), _T("REMOTE"), _T("LOCAL"));
1649 CFile::Remove(mine
.GetWinPathString());
1650 CFile::Remove(theirs
.GetWinPathString());
1651 CFile::Remove(base
.GetWinPathString());
1653 CDeleteConflictDlg dlg
;
1654 DescribeFile(b_local
, b_base
,dlg
.m_LocalStatus
);
1655 DescribeFile(b_remote
,b_base
,dlg
.m_RemoteStatus
);
1656 dlg
.m_bShowModifiedButton
=b_base
;
1657 dlg
.m_File
=merge
.GetGitPathString();
1658 if(dlg
.DoModal() == IDOK
)
1663 cmd
.Format(_T("git.exe rm -- \"%s\""),merge
.GetGitPathString());
1666 cmd
.Format(_T("git.exe add -- \"%s\""),merge
.GetGitPathString());
1668 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1670 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
1680 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1681 base
, theirs
, mine
, merge
);
1684 if (stat
.status
->text_status
== svn_wc_status_conflicted
)
1686 // we have a text conflict, use our merge tool to resolve the conflict
1688 CTSVNPath
theirs(directory
);
1689 CTSVNPath
mine(directory
);
1690 CTSVNPath
base(directory
);
1691 bool bConflictData
= false;
1693 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_new
))
1695 theirs
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_new
));
1696 bConflictData
= true;
1698 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_old
))
1700 base
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_old
));
1701 bConflictData
= true;
1703 if ((stat
.status
->entry
)&&(stat
.status
->entry
->conflict_wrk
))
1705 mine
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->conflict_wrk
));
1706 bConflictData
= true;
1713 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1714 base
, theirs
, mine
, merge
);
1717 if (stat
.status
->prop_status
== svn_wc_status_conflicted
)
1719 // we have a property conflict
1720 CTSVNPath
prej(directory
);
1721 if ((stat
.status
->entry
)&&(stat
.status
->entry
->prejfile
))
1723 prej
.AppendPathString(CUnicodeUtils::GetUnicode(stat
.status
->entry
->prejfile
));
1724 // there's a problem: the prej file contains a _description_ of the conflict, and
1725 // that description string might be translated. That means we have no way of parsing
1726 // the file to find out the conflicting values.
1727 // The only thing we can do: show a dialog with the conflict description, then
1728 // let the user either accept the existing property or open the property edit dialog
1729 // to manually change the properties and values. And a button to mark the conflict as
1731 CEditPropConflictDlg dlg
;
1732 dlg
.SetPrejFile(prej
);
1733 dlg
.SetConflictedItem(merge
);
1734 bRet
= (dlg
.DoModal() != IDCANCEL
);
1738 if (stat
.status
->tree_conflict
)
1740 // we have a tree conflict
1742 const SVNInfoData
* pInfoData
= info
.GetFirstFileInfo(merge
, SVNRev(), SVNRev());
1745 if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_text
)
1747 CTSVNPath
theirs(directory
);
1748 CTSVNPath
mine(directory
);
1749 CTSVNPath
base(directory
);
1750 bool bConflictData
= false;
1752 if (pInfoData
->treeconflict_theirfile
)
1754 theirs
.AppendPathString(pInfoData
->treeconflict_theirfile
);
1755 bConflictData
= true;
1757 if (pInfoData
->treeconflict_basefile
)
1759 base
.AppendPathString(pInfoData
->treeconflict_basefile
);
1760 bConflictData
= true;
1762 if (pInfoData
->treeconflict_myfile
)
1764 mine
.AppendPathString(pInfoData
->treeconflict_myfile
);
1765 bConflictData
= true;
1772 bRet
= !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool
),
1773 base
, theirs
, mine
, merge
);
1775 else if (pInfoData
->treeconflict_kind
== svn_wc_conflict_kind_tree
)
1777 CString sConflictAction
;
1778 CString sConflictReason
;
1779 CString sResolveTheirs
;
1780 CString sResolveMine
;
1781 CTSVNPath treeConflictPath
= CTSVNPath(pInfoData
->treeconflict_path
);
1782 CString sItemName
= treeConflictPath
.GetUIFileOrDirectoryName();
1784 if (pInfoData
->treeconflict_nodekind
== svn_node_file
)
1786 switch (pInfoData
->treeconflict_operation
)
1788 case svn_wc_operation_update
:
1789 switch (pInfoData
->treeconflict_action
)
1791 case svn_wc_conflict_action_edit
:
1792 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEEDIT
, (LPCTSTR
)sItemName
);
1793 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1795 case svn_wc_conflict_action_add
:
1796 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEADD
, (LPCTSTR
)sItemName
);
1797 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1799 case svn_wc_conflict_action_delete
:
1800 sConflictAction
.Format(IDS_TREECONFLICT_FILEUPDATEDELETE
, (LPCTSTR
)sItemName
);
1801 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1805 case svn_wc_operation_switch
:
1806 switch (pInfoData
->treeconflict_action
)
1808 case svn_wc_conflict_action_edit
:
1809 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHEDIT
, (LPCTSTR
)sItemName
);
1810 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1812 case svn_wc_conflict_action_add
:
1813 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHADD
, (LPCTSTR
)sItemName
);
1814 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1816 case svn_wc_conflict_action_delete
:
1817 sConflictAction
.Format(IDS_TREECONFLICT_FILESWITCHDELETE
, (LPCTSTR
)sItemName
);
1818 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1822 case svn_wc_operation_merge
:
1823 switch (pInfoData
->treeconflict_action
)
1825 case svn_wc_conflict_action_edit
:
1826 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEEDIT
, (LPCTSTR
)sItemName
);
1827 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1829 case svn_wc_conflict_action_add
:
1830 sResolveTheirs
.Format(IDS_TREECONFLICT_FILEMERGEADD
, (LPCTSTR
)sItemName
);
1831 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE
);
1833 case svn_wc_conflict_action_delete
:
1834 sConflictAction
.Format(IDS_TREECONFLICT_FILEMERGEDELETE
, (LPCTSTR
)sItemName
);
1835 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1841 else if (pInfoData
->treeconflict_nodekind
== svn_node_dir
)
1843 switch (pInfoData
->treeconflict_operation
)
1845 case svn_wc_operation_update
:
1846 switch (pInfoData
->treeconflict_action
)
1848 case svn_wc_conflict_action_edit
:
1849 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEEDIT
, (LPCTSTR
)sItemName
);
1850 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1852 case svn_wc_conflict_action_add
:
1853 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEADD
, (LPCTSTR
)sItemName
);
1854 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1856 case svn_wc_conflict_action_delete
:
1857 sConflictAction
.Format(IDS_TREECONFLICT_DIRUPDATEDELETE
, (LPCTSTR
)sItemName
);
1858 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1862 case svn_wc_operation_switch
:
1863 switch (pInfoData
->treeconflict_action
)
1865 case svn_wc_conflict_action_edit
:
1866 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHEDIT
, (LPCTSTR
)sItemName
);
1867 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1869 case svn_wc_conflict_action_add
:
1870 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHADD
, (LPCTSTR
)sItemName
);
1871 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1873 case svn_wc_conflict_action_delete
:
1874 sConflictAction
.Format(IDS_TREECONFLICT_DIRSWITCHDELETE
, (LPCTSTR
)sItemName
);
1875 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1879 case svn_wc_operation_merge
:
1880 switch (pInfoData
->treeconflict_action
)
1882 case svn_wc_conflict_action_edit
:
1883 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEEDIT
, (LPCTSTR
)sItemName
);
1884 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1886 case svn_wc_conflict_action_add
:
1887 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEADD
, (LPCTSTR
)sItemName
);
1888 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR
);
1890 case svn_wc_conflict_action_delete
:
1891 sConflictAction
.Format(IDS_TREECONFLICT_DIRMERGEDELETE
, (LPCTSTR
)sItemName
);
1892 sResolveTheirs
.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR
);
1900 switch (pInfoData
->treeconflict_reason
)
1902 case svn_wc_conflict_reason_edited
:
1903 uReasonID
= IDS_TREECONFLICT_REASON_EDITED
;
1904 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1906 case svn_wc_conflict_reason_obstructed
:
1907 uReasonID
= IDS_TREECONFLICT_REASON_OBSTRUCTED
;
1908 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1910 case svn_wc_conflict_reason_deleted
:
1911 uReasonID
= IDS_TREECONFLICT_REASON_DELETED
;
1912 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1914 case svn_wc_conflict_reason_added
:
1915 uReasonID
= IDS_TREECONFLICT_REASON_ADDED
;
1916 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1918 case svn_wc_conflict_reason_missing
:
1919 uReasonID
= IDS_TREECONFLICT_REASON_MISSING
;
1920 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_REMOVEDIR
: IDS_TREECONFLICT_RESOLVE_REMOVEFILE
);
1922 case svn_wc_conflict_reason_unversioned
:
1923 uReasonID
= IDS_TREECONFLICT_REASON_UNVERSIONED
;
1924 sResolveMine
.LoadString(pInfoData
->treeconflict_nodekind
== svn_node_dir
? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR
: IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE
);
1927 sConflictReason
.Format(uReasonID
, (LPCTSTR
)sConflictAction
);
1929 CTreeConflictEditorDlg dlg
;
1930 dlg
.SetConflictInfoText(sConflictReason
);
1931 dlg
.SetResolveTexts(sResolveTheirs
, sResolveMine
);
1932 dlg
.SetPath(treeConflictPath
);
1933 INT_PTR dlgRet
= dlg
.DoModal();
1934 bRet
= (dlgRet
!= IDCANCEL
);
1942 bool CAppUtils::IsSSHPutty()
1944 CString sshclient
=g_Git
.m_Environment
.GetEnv(_T("GIT_SSH"));
1945 sshclient
=sshclient
.MakeLower();
1946 if(sshclient
.Find(_T("plink.exe"),0)>=0)
1953 CString
CAppUtils::GetClipboardLink(const CString
&skipGitPrefix
)
1955 if (!OpenClipboard(NULL
))
1958 CString sClipboardText
;
1959 HGLOBAL hglb
= GetClipboardData(CF_TEXT
);
1962 LPCSTR lpstr
= (LPCSTR
)GlobalLock(hglb
);
1963 sClipboardText
= CString(lpstr
);
1966 hglb
= GetClipboardData(CF_UNICODETEXT
);
1969 LPCTSTR lpstr
= (LPCTSTR
)GlobalLock(hglb
);
1970 sClipboardText
= lpstr
;
1975 if(!sClipboardText
.IsEmpty())
1977 if(sClipboardText
[0] == _T('\"') && sClipboardText
[sClipboardText
.GetLength()-1] == _T('\"'))
1978 sClipboardText
=sClipboardText
.Mid(1,sClipboardText
.GetLength()-2);
1980 if(sClipboardText
.Find( _T("http://")) == 0)
1981 return sClipboardText
;
1983 if(sClipboardText
.Find( _T("https://")) == 0)
1984 return sClipboardText
;
1986 if(sClipboardText
.Find( _T("git://")) == 0)
1987 return sClipboardText
;
1989 if(sClipboardText
.Find( _T("ssh://")) == 0)
1990 return sClipboardText
;
1992 if(sClipboardText
.GetLength()>=2)
1993 if( sClipboardText
[1] == _T(':') )
1994 if( (sClipboardText
[0] >= 'A' && sClipboardText
[0] <= 'Z')
1995 || (sClipboardText
[0] >= 'a' && sClipboardText
[0] <= 'z') )
1996 return sClipboardText
;
1998 // trim prefixes like "git clone "
1999 if (!skipGitPrefix
.IsEmpty() && sClipboardText
.Find(skipGitPrefix
) == 0)
2001 CString args
= sClipboardText
.Mid(skipGitPrefix
.GetLength()).Trim();
2003 if (args
.GetLength() && args
[0] == '"')
2005 quotePos
= args
.Find(_T('"'), 1);
2006 args
= quotePos
>= 0 ? args
.Mid(1, quotePos
- 1) : args
;
2008 int spacePos
= args
.Find(_T(' '), quotePos
>= 1 ? quotePos
: 0);
2009 return spacePos
>= 0 ? args
.Left(spacePos
) : args
;
2013 return CString(_T(""));
2016 CString
CAppUtils::ChooseRepository(CString
*path
)
2018 CBrowseFolder browseFolder
;
2019 CRegString regLastResopitory
= CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\LastRepo"),_T(""));
2021 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
2022 CString strCloneDirectory
;
2024 strCloneDirectory
=*path
;
2027 strCloneDirectory
= regLastResopitory
;
2031 title
.LoadString(IDS_CHOOSE_REPOSITORY
);
2033 browseFolder
.SetInfo(title
);
2035 if (browseFolder
.Show(NULL
, strCloneDirectory
) == CBrowseFolder::OK
)
2037 regLastResopitory
= strCloneDirectory
;
2038 return strCloneDirectory
;
2046 bool CAppUtils::SendPatchMail(CTGitPathList
&list
,bool autoclose
)
2050 dlg
.m_PathList
= list
;
2052 if(dlg
.DoModal()==IDOK
)
2054 if(dlg
.m_PathList
.GetCount() == 0)
2057 CGitProgressDlg progDlg
;
2059 theApp
.m_pMainWnd
= &progDlg
;
2060 progDlg
.SetCommand(CGitProgressList::GitProgress_SendMail
);
2062 progDlg
.SetAutoClose(autoclose
);
2064 progDlg
.SetPathList(dlg
.m_PathList
);
2065 //ProjectProperties props;
2066 //props.ReadPropsPathList(dlg.m_pathList);
2067 //progDlg.SetProjectProperties(props);
2068 progDlg
.SetItemCount(dlg
.m_PathList
.GetCount());
2070 CSendMailPatch
sendMailPatch(dlg
.m_To
, dlg
.m_CC
, dlg
.m_Subject
, !!dlg
.m_bAttachment
, !!dlg
.m_bCombine
);
2071 progDlg
.SetSendMailOption(&sendMailPatch
);
2080 bool CAppUtils::SendPatchMail(CString
&cmd
,CString
&formatpatchoutput
,bool autoclose
)
2083 CString log
=formatpatchoutput
;
2084 int start
=log
.Find(cmd
);
2086 CString one
=log
.Tokenize(_T("\n"),start
);
2092 CString one
=log
.Tokenize(_T("\n"),start
);
2094 if(one
.IsEmpty() || one
.Find(_T("Success")) == 0)
2096 one
.Replace(_T('/'),_T('\\'));
2098 path
.SetFromWin(one
);
2101 if (list
.GetCount() > 0)
2103 return SendPatchMail(list
, autoclose
);
2107 CMessageBox::Show(NULL
, IDS_ERR_NOPATCHES
, IDS_APPNAME
, MB_ICONINFORMATION
);
2113 int CAppUtils::GetLogOutputEncode(CGit
*pGit
)
2118 output
= pGit
->GetConfigValue(_T("i18n.logOutputEncoding"));
2119 if(output
.IsEmpty())
2121 output
= pGit
->GetConfigValue(_T("i18n.commitencoding"));
2122 if(output
.IsEmpty())
2126 output
=output
.Tokenize(_T("\n"),start
);
2127 return CUnicodeUtils::GetCPCode(output
);
2132 output
=output
.Tokenize(_T("\n"),start
);
2133 return CUnicodeUtils::GetCPCode(output
);
2136 int CAppUtils::GetCommitTemplate(CString
&temp
)
2140 output
= g_Git
.GetConfigValue(_T("commit.template"), CP_UTF8
);
2141 if( output
.IsEmpty() )
2144 if( output
.GetLength()<1)
2147 if( output
[0] == _T('/'))
2149 if(output
.GetLength()>=3)
2150 if(output
[2] == _T('/'))
2152 output
.GetBuffer()[0] = output
[1];
2153 output
.GetBuffer()[1] = _T(':');
2158 output
=output
.Tokenize(_T("\n"),start
);
2160 output
.Replace(_T('/'),_T('\\'));
2164 CStdioFile
file(output
,CFile::modeRead
|CFile::typeText
);
2166 while(file
.ReadString(str
))
2177 int CAppUtils::SaveCommitUnicodeFile(CString
&filename
, CString
&message
)
2179 CFile
file(filename
,CFile::modeReadWrite
|CFile::modeCreate
);
2183 output
= g_Git
.GetConfigValue(_T("i18n.commitencoding"));
2184 if(output
.IsEmpty())
2188 output
=output
.Tokenize(_T("\n"),start
);
2189 cp
=CUnicodeUtils::GetCPCode(output
);
2191 int len
=message
.GetLength();
2193 std::unique_ptr
<char[]> buf(new char[len
* 4 + 4]);
2194 SecureZeroMemory(buf
.get(), len
* 4 + 4);
2196 int lengthIncTerminator
= WideCharToMultiByte(cp
, 0, message
, -1, buf
.get(), len
* 4, NULL
, NULL
);
2198 file
.Write(buf
.get(), lengthIncTerminator
- 1);
2203 bool CAppUtils::Pull(bool showPush
, bool autoClose
)
2206 dlg
.m_IsPull
= TRUE
;
2207 if (dlg
.DoModal() == IDOK
)
2209 CString url
= dlg
.m_RemoteURL
;
2211 if (dlg
.m_bAutoLoad
)
2213 CAppUtils::LaunchPAgent(NULL
, &dlg
.m_RemoteURL
);
2218 if (g_Git
.GetHash(hashOld
, _T("HEAD")))
2220 MessageBox(NULL
, g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
2232 cmdRebase
= "--rebase ";
2234 if (!dlg
.m_bFetchTags
)
2235 notags
= _T("--no-tags");
2241 ffonly
= _T("--ff-only");
2244 squash
= _T("--squash");
2246 if (dlg
.m_bNoCommit
)
2247 nocommit
= _T("--no-commit");
2249 int ver
= CAppUtils::GetMsysgitVersion();
2251 if(ver
>= 0x01070203) //above 1.7.0.2
2252 cmdRebase
+= _T("--progress ");
2254 cmd
.Format(_T("git.exe pull -v %s %s %s %s %s %s \"%s\" %s"), cmdRebase
, noff
, ffonly
, squash
, nocommit
, notags
, url
, dlg
.m_RemoteBranchName
);
2255 CProgressDlg progress
;
2256 progress
.m_GitCmd
= cmd
;
2257 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_DIFFS
)));
2258 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_LOG
)));
2259 INT_PTR pushButton
= showPush
? progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
))) + IDC_PROGRESS_BUTTON1
: -1;
2261 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
2262 INT_PTR smUpdateButton
= gitPath
.HasSubmodules() ? progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
))) + IDC_PROGRESS_BUTTON1
: -1;
2264 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2266 INT_PTR ret
= progress
.DoModal();
2268 if (ret
== IDOK
&& progress
.m_GitStatus
== 1 && progress
.m_LogText
.Find(_T("CONFLICT")) >= 0 && CMessageBox::Show(NULL
, IDS_SEECHANGES
, IDS_APPNAME
, MB_YESNO
| MB_ICONINFORMATION
) == IDYES
)
2271 dlg
.m_pathList
.AddPath(CTGitPath());
2278 if (g_Git
.GetHash(hashNew
, _T("HEAD")))
2280 MessageBox(NULL
, g_Git
.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR
);
2284 if( ret
== IDC_PROGRESS_BUTTON1
)
2286 if(hashOld
== hashNew
)
2288 if(progress
.m_GitStatus
== 0)
2289 CMessageBox::Show(NULL
, IDS_UPTODATE
, IDS_APPNAME
, MB_OK
| MB_ICONINFORMATION
);
2294 dlg
.SetDiff(NULL
, hashNew
.ToString(), hashOld
.ToString());
2299 else if ( ret
== IDC_PROGRESS_BUTTON1
+1 )
2301 if(hashOld
== hashNew
)
2303 if(progress
.m_GitStatus
== 0)
2304 CMessageBox::Show(NULL
, IDS_UPTODATE
, IDS_APPNAME
, MB_OK
| MB_ICONINFORMATION
);
2309 dlg
.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), hashOld
.ToString() + _T("..") + hashNew
.ToString(), 0);
2312 else if (ret
== pushButton
)
2314 Push(_T(""), autoClose
);
2316 else if (ret
== smUpdateButton
)
2319 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
2321 CAppUtils::RunTortoiseGitProc(sCmd
);
2328 bool CAppUtils::Fetch(CString remoteName
, bool allowRebase
, bool autoClose
)
2331 dlg
.m_PreSelectRemote
= remoteName
;
2332 dlg
.m_bAllowRebase
= allowRebase
;
2335 if(dlg
.DoModal()==IDOK
)
2339 if (dlg
.m_bAllRemotes
)
2342 g_Git
.GetRemoteList(list
);
2344 STRING_VECTOR::const_iterator it
= list
.begin();
2345 while (it
!= list
.end())
2347 CString
remote(*it
);
2348 CAppUtils::LaunchPAgent(NULL
, &remote
);
2353 CAppUtils::LaunchPAgent(NULL
, &dlg
.m_RemoteURL
);
2357 url
=dlg
.m_RemoteURL
;
2361 int ver
= CAppUtils::GetMsysgitVersion();
2363 if(ver
>= 0x01070203) //above 1.7.0.2
2364 arg
= _T("--progress ");
2367 arg
+= _T("--prune ");
2370 if (dlg
.m_bFetchTags
== 1)
2372 arg
+= _T("--tags ");
2374 else if (dlg
.m_bFetchTags
== 0)
2376 arg
+= _T("--no-tags ");
2379 if (dlg
.m_bAllRemotes
)
2380 cmd
.Format(_T("git.exe fetch --all -v %s"), arg
);
2382 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"), arg
, url
, dlg
.m_RemoteBranchName
);
2384 CProgressDlg progress
;
2386 progress
.m_bAutoCloseOnSuccess
= autoClose
;
2388 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2389 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_RESET
)));
2391 if(!dlg
.m_bRebase
&& !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
))
2393 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2396 progress
.m_GitCmd
=cmd
;
2397 INT_PTR userResponse
;
2399 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_FETCH
))
2401 CGitProgressDlg gitdlg
;
2402 if (!dlg
.m_bAllRemotes
)
2404 gitdlg
.SetCommand(CGitProgressList::GitProgress_Fetch
);
2405 gitdlg
.SetAutoTag(dlg
.m_bFetchTags
? GIT_REMOTE_DOWNLOAD_TAGS_ALL
: GIT_REMOTE_DOWNLOAD_TAGS_NONE
);
2406 if (!dlg
.m_bAllRemotes
)
2407 gitdlg
.SetRefSpec(dlg
.m_RemoteBranchName
);
2408 userResponse
= gitdlg
.DoModal();
2412 userResponse
= progress
.DoModal();
2414 if (userResponse
== IDC_PROGRESS_BUTTON1
)
2416 CString cmd
= _T("/command:log");
2417 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2418 RunTortoiseGitProc(cmd
);
2421 else if (userResponse
== IDC_PROGRESS_BUTTON1
+ 1)
2423 CString currentBranch
= g_Git
.GetSymbolicRef();
2425 configName
.Format(_T("branch.%s.remote"), currentBranch
);
2426 CString pullRemote
= g_Git
.GetConfigValue(configName
);
2428 //Select pull-branch from current branch
2429 configName
.Format(_T("branch.%s.merge"), currentBranch
);
2430 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
2432 CString defaultUpstream
;
2433 if (!pullRemote
.IsEmpty() && !pullBranch
.IsEmpty())
2434 defaultUpstream
.Format(_T("remotes/%s/%s"), pullRemote
, pullBranch
);
2435 GitReset(&defaultUpstream
, 2);
2438 else if ((userResponse
== IDC_PROGRESS_BUTTON1
+ 2) || (progress
.m_GitStatus
== 0 && dlg
.m_bRebase
))
2443 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
2444 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUDESSENDMAIL
)));
2445 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENUREBASE
)));
2446 INT_PTR response
= dlg
.DoModal();
2447 if(response
== IDOK
)
2451 else if (response
== IDC_REBASE_POST_BUTTON
)
2453 CString cmd
= _T("/command:log");
2454 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
2455 RunTortoiseGitProc(cmd
);
2458 else if (response
== IDC_REBASE_POST_BUTTON
+ 1)
2460 CString cmd
, out
, err
;
2461 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
2463 g_Git
.FixBranchName(dlg
.m_Upstream
),
2464 g_Git
.FixBranchName(dlg
.m_Branch
));
2465 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
2467 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
2471 CAppUtils::SendPatchMail(cmd
,out
);
2474 else if (response
== IDC_REBASE_POST_BUTTON
+ 2)
2476 else if(response
== IDCANCEL
)
2481 else if (userResponse
!= IDCANCEL
)
2487 static void PushCallback(CProgressDlg
*dlg
, void *caller
, int result
)
2491 dlg
->m_PostCmdList
.RemoveAll();
2492 bool rejected
= dlg
->GetLogText().Find(_T("! [rejected]")) > 0;
2493 *(bool*)caller
= rejected
;
2495 dlg
->m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPULL
)));
2496 dlg
->m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
2500 bool CAppUtils::Push(CString selectLocalBranch
, bool autoClose
)
2503 dlg
.m_BranchSourceName
= selectLocalBranch
;
2505 DWORD exitcode
= 0xFFFFFFFF;
2507 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
2508 if (CHooks::Instance().PrePush(list
,exitcode
, error
))
2513 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2514 //ReportError(temp);
2515 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2520 if(dlg
.DoModal()==IDOK
)
2525 arg
+= _T("--thin ");
2526 if(dlg
.m_bTags
&& !dlg
.m_bPushAllBranches
)
2527 arg
+= _T("--tags ");
2529 arg
+= _T("--force ");
2530 if (dlg
.m_bSetUpstream
)
2531 arg
+= _T("--set-upstream ");
2532 if (dlg
.m_RecurseSubmodules
== 1)
2533 arg
+= _T("--recurse-submodules=check ");
2534 if (dlg
.m_RecurseSubmodules
== 2)
2535 arg
+= _T("--recurse-submodules=on-demand ");
2537 int ver
= CAppUtils::GetMsysgitVersion();
2539 if(ver
>= 0x01070203) //above 1.7.0.2
2540 arg
+= _T("--progress ");
2542 CProgressDlg progress
;
2543 progress
.m_bAutoCloseOnSuccess
=autoClose
;
2545 STRING_VECTOR remotesList
;
2546 if (dlg
.m_bPushAllRemotes
)
2547 g_Git
.GetRemoteList(remotesList
);
2549 remotesList
.push_back(dlg
.m_URL
);
2551 for (unsigned int i
= 0; i
< remotesList
.size(); ++i
)
2553 if (dlg
.m_bAutoLoad
)
2554 CAppUtils::LaunchPAgent(NULL
, &remotesList
[i
]);
2557 if (dlg
.m_bPushAllBranches
)
2559 cmd
.Format(_T("git.exe push --all %s \"%s\""),
2565 progress
.m_GitCmdList
.push_back(cmd
);
2566 cmd
.Format(_T("git.exe push --tags %s \"%s\""), arg
, remotesList
[i
]);
2571 cmd
.Format(_T("git.exe push %s \"%s\" %s"),
2574 dlg
.m_BranchSourceName
);
2575 if (!dlg
.m_BranchRemoteName
.IsEmpty())
2577 cmd
+= _T(":") + dlg
.m_BranchRemoteName
;
2580 progress
.m_GitCmdList
.push_back(cmd
);
2583 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REQUESTPULL
)));
2584 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUPUSH
)));
2585 bool rejected
= false;
2586 progress
.m_caller
= &rejected
;
2587 progress
.m_PostCmdCallback
= PushCallback
;
2588 INT_PTR ret
= progress
.DoModal();
2590 if(!progress
.m_GitStatus
)
2592 if (CHooks::Instance().PostPush(list
,exitcode
, error
))
2597 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
2598 //ReportError(temp);
2599 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2603 if(ret
== IDC_PROGRESS_BUTTON1
)
2605 RequestPull(dlg
.m_BranchRemoteName
);
2607 else if(ret
== IDC_PROGRESS_BUTTON1
+ 1)
2617 // failed, pull first
2618 if (ret
== IDC_PROGRESS_BUTTON1
)
2620 Pull(true, autoClose
);
2622 else if (ret
== IDC_PROGRESS_BUTTON1
+ 1)
2629 if (ret
== IDC_PROGRESS_BUTTON1
)
2639 bool CAppUtils::RequestPull(CString endrevision
, CString repositoryUrl
)
2641 CRequestPullDlg dlg
;
2642 dlg
.m_RepositoryURL
= repositoryUrl
;
2643 dlg
.m_EndRevision
= endrevision
;
2644 if (dlg
.DoModal()==IDOK
)
2647 cmd
.Format(_T("git.exe request-pull %s \"%s\" %s"), dlg
.m_StartRevision
, dlg
.m_RepositoryURL
, dlg
.m_EndRevision
);
2649 CSysProgressDlg sysProgressDlg
;
2650 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2651 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_CREATINGPULLREUQEST
)));
2652 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2653 sysProgressDlg
.SetShowProgressBar(false);
2654 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2656 CString tempFileName
= GetTempFile();
2657 DeleteFile(tempFileName
);
2658 CreateDirectory(tempFileName
, NULL
);
2659 tempFileName
+= _T("\\pullrequest.txt");
2660 if (g_Git
.RunLogFile(cmd
, tempFileName
))
2662 CMessageBox::Show(NULL
, IDS_ERR_PULLREUQESTFAILED
, IDS_APPNAME
, MB_OK
);
2666 if (sysProgressDlg
.HasUserCancelled())
2668 CMessageBox::Show(NULL
, IDS_SVN_USERCANCELLED
, IDS_APPNAME
, MB_OK
);
2669 ::DeleteFile(tempFileName
);
2673 sysProgressDlg
.Stop();
2675 if (dlg
.m_bSendMail
)
2678 dlg
.m_PathList
= CTGitPathList(CTGitPath(tempFileName
));
2679 dlg
.m_bCustomSubject
= true;
2681 if (dlg
.DoModal() == IDOK
)
2683 if(dlg
.m_PathList
.GetCount() == 0)
2686 CGitProgressDlg progDlg
;
2688 theApp
.m_pMainWnd
= &progDlg
;
2689 progDlg
.SetCommand(CGitProgressList::GitProgress_SendMail
);
2691 progDlg
.SetPathList(dlg
.m_PathList
);
2692 progDlg
.SetItemCount(dlg
.m_PathList
.GetCount());
2694 CSendMailCombineable
sendMailCombineable(dlg
.m_To
, dlg
.m_CC
, dlg
.m_Subject
, !!dlg
.m_bAttachment
, !!dlg
.m_bCombine
);
2695 progDlg
.SetSendMailOption(&sendMailCombineable
);
2704 CAppUtils::LaunchAlternativeEditor(tempFileName
);
2709 bool CAppUtils::CreateMultipleDirectory(const CString
& szPath
)
2711 CString
strDir(szPath
);
2712 if (strDir
.GetAt(strDir
.GetLength()-1)!=_T('\\'))
2714 strDir
.AppendChar(_T('\\'));
2716 std::vector
<CString
> vPath
;
2718 bool bSuccess
= false;
2720 for (int i
=0;i
<strDir
.GetLength();++i
)
2722 if (strDir
.GetAt(i
) != _T('\\'))
2724 strTemp
.AppendChar(strDir
.GetAt(i
));
2728 vPath
.push_back(strTemp
);
2729 strTemp
.AppendChar(_T('\\'));
2733 for (auto vIter
= vPath
.begin(); vIter
!= vPath
.end(); ++vIter
)
2735 bSuccess
= CreateDirectory(*vIter
, NULL
) ? true : false;
2741 void CAppUtils::RemoveTrailSlash(CString
&path
)
2746 // For URL, do not trim the slash just after the host name component.
2747 int index
= path
.Find(_T("://"));
2751 index
= path
.Find(_T('/'), index
);
2752 if (index
== path
.GetLength() - 1)
2756 while(path
[path
.GetLength()-1] == _T('\\') || path
[path
.GetLength()-1] == _T('/' ) )
2758 path
=path
.Left(path
.GetLength()-1);
2764 bool CAppUtils::CheckUserData()
2766 while(g_Git
.GetUserName().IsEmpty() || g_Git
.GetUserEmail().IsEmpty())
2768 if(CMessageBox::Show(NULL
, IDS_PROC_NOUSERDATA
, IDS_APPNAME
, MB_YESNO
| MB_ICONERROR
) == IDYES
)
2770 CTGitPath
path(g_Git
.m_CurrentDir
);
2771 CSettings
dlg(IDS_PROC_SETTINGS_TITLE
,&path
);
2772 dlg
.SetTreeViewMode(TRUE
, TRUE
, TRUE
);
2773 dlg
.SetTreeWidth(220);
2774 dlg
.m_DefaultPage
= _T("gitconfig");
2777 dlg
.HandleRestart();
2787 BOOL
CAppUtils::Commit(CString bugid
,BOOL bWholeProject
,CString
&sLogMsg
,
2788 CTGitPathList
&pathList
,
2789 CTGitPathList
&selectedList
,
2790 bool bSelectFilesForCommit
,
2793 bool bFailed
= true;
2795 if (!CheckUserData())
2802 dlg
.m_sBugID
= bugid
;
2804 dlg
.m_bWholeProject
= bWholeProject
;
2806 dlg
.m_sLogMessage
= sLogMsg
;
2807 dlg
.m_pathList
= pathList
;
2808 dlg
.m_checkedPathList
= selectedList
;
2809 dlg
.m_bSelectFilesForCommit
= bSelectFilesForCommit
;
2810 dlg
.m_bAutoClose
= autoClose
;
2811 if (dlg
.DoModal() == IDOK
)
2813 if (dlg
.m_pathList
.GetCount()==0)
2815 // if the user hasn't changed the list of selected items
2816 // we don't use that list. Because if we would use the list
2817 // of pre-checked items, the dialog would show different
2818 // checked items on the next startup: it would only try
2819 // to check the parent folder (which might not even show)
2820 // instead, we simply use an empty list and let the
2821 // default checking do its job.
2822 if (!dlg
.m_pathList
.IsEqual(pathList
))
2823 selectedList
= dlg
.m_pathList
;
2824 pathList
= dlg
.m_updatedPathList
;
2825 sLogMsg
= dlg
.m_sLogMessage
;
2826 bSelectFilesForCommit
= true;
2828 if( dlg
.m_bPushAfterCommit
)
2830 switch(dlg
.m_PostCmd
)
2832 case GIT_POST_CMD_DCOMMIT
:
2833 CAppUtils::SVNDCommit();
2839 else if (dlg
.m_bCreateTagAfterCommit
)
2841 CAppUtils::CreateBranchTag(TRUE
);
2844 // CGitProgressDlg progDlg;
2845 // progDlg.SetChangeList(dlg.m_sChangeList, !!dlg.m_bKeepChangeList);
2846 // if (parser.HasVal(_T("closeonend")))
2847 // progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
2848 // progDlg.SetCommand(CGitProgressDlg::GitProgress_Commit);
2849 // progDlg.SetOptions(dlg.m_bKeepLocks ? ProgOptKeeplocks : ProgOptNone);
2850 // progDlg.SetPathList(dlg.m_pathList);
2851 // progDlg.SetCommitMessage(dlg.m_sLogMessage);
2852 // progDlg.SetDepth(dlg.m_bRecursive ? Git_depth_infinity : svn_depth_empty);
2853 // progDlg.SetSelectedList(dlg.m_selectedPathList);
2854 // progDlg.SetItemCount(dlg.m_itemsCount);
2855 // progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);
2856 // progDlg.DoModal();
2857 // CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);
2858 // err = (DWORD)progDlg.DidErrorsOccur();
2859 // bFailed = progDlg.DidErrorsOccur();
2860 // bRet = progDlg.DidErrorsOccur();
2861 // CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);
2862 // if (DWORD(bFailRepeat)==0)
2863 // bFailed = false; // do not repeat if the user chose not to in the settings.
2870 BOOL
CAppUtils::SVNDCommit()
2872 CSVNDCommitDlg dcommitdlg
;
2873 CString gitSetting
= g_Git
.GetConfigValue(_T("svn.rmdir"));
2874 if (gitSetting
== _T("")) {
2875 if (dcommitdlg
.DoModal() != IDOK
)
2881 if (dcommitdlg
.m_remember
)
2883 if (dcommitdlg
.m_rmdir
)
2885 gitSetting
= _T("true");
2889 gitSetting
= _T("false");
2891 if(g_Git
.SetConfigValue(_T("svn.rmdir"),gitSetting
))
2894 msg
.Format(IDS_PROC_SAVECONFIGFAILED
, _T("svn.rmdir"), gitSetting
);
2895 CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
2901 BOOL IsStash
= false;
2902 if(!g_Git
.CheckCleanWorkTree())
2904 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
2906 CSysProgressDlg sysProgressDlg
;
2907 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2908 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2909 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2910 sysProgressDlg
.SetShowProgressBar(false);
2911 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2912 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2915 cmd
=_T("git.exe stash");
2916 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2918 sysProgressDlg
.Stop();
2919 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2922 sysProgressDlg
.Stop();
2932 CProgressDlg progress
;
2933 if (dcommitdlg
.m_rmdir
)
2935 progress
.m_GitCmd
=_T("git.exe svn dcommit --rmdir");
2939 progress
.m_GitCmd
=_T("git.exe svn dcommit");
2941 if(progress
.DoModal()==IDOK
&& progress
.m_GitStatus
== 0)
2945 if(CMessageBox::Show(NULL
,IDS_DCOMMIT_STASH_POP
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
2947 CSysProgressDlg sysProgressDlg
;
2948 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
2949 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
2950 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
2951 sysProgressDlg
.SetShowProgressBar(false);
2952 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
2953 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
2956 cmd
=_T("git.exe stash pop");
2957 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2959 ::DeleteFile(g_Git
.m_CurrentDir
+ _T("\\sys$command"));
2960 sysProgressDlg
.Stop();
2961 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
2964 ::DeleteFile(g_Git
.m_CurrentDir
+ _T("\\sys$command"));
2965 sysProgressDlg
.Stop();
2977 static void MergeCallback(CProgressDlg
*dlg
, void * /*caller*/, int result
)
2981 dlg
->m_PostCmdList
.RemoveAll();
2984 if (!g_Git
.ListConflictFile(list
) && list
.GetCount() > 0)
2986 // there are conflict files
2987 dlg
->m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE
)));
2992 BOOL
CAppUtils::Merge(CString
*commit
)
2994 if (!CheckUserData())
2999 dlg
.m_initialRefName
= *commit
;
3001 if(dlg
.DoModal()==IDOK
)
3007 args
+= _T(" --no-ff");
3010 args
+= _T(" --squash");
3013 args
+= _T(" --no-commit");
3018 fmt
.Format(_T(" --log=%d"), dlg
.m_nLog
);
3022 if (!dlg
.m_MergeStrategy
.IsEmpty())
3024 args
+= _T(" --strategy=") + dlg
.m_MergeStrategy
;
3025 if (!dlg
.m_StrategyOption
.IsEmpty())
3027 args
+= _T(" --strategy-option=") + dlg
.m_StrategyOption
;
3028 if (!dlg
.m_StrategyParam
.IsEmpty())
3029 args
+= _T("=") + dlg
.m_StrategyParam
;
3033 if(!dlg
.m_strLogMesage
.IsEmpty())
3035 CString logmsg
= dlg
.m_strLogMesage
;
3036 logmsg
.Replace(_T("\""), _T("\\\""));
3037 args
+= _T(" -m \"") + logmsg
+ _T("\"");
3039 cmd
.Format(_T("git.exe merge %s %s"), args
, g_Git
.FixBranchName(dlg
.m_VersionName
));
3041 CProgressDlg Prodlg
;
3042 Prodlg
.m_GitCmd
= cmd
;
3044 if (dlg
.m_bNoCommit
)
3045 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MENUCOMMIT
)));
3046 else if (dlg
.m_bIsBranch
)
3047 Prodlg
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_REMOVEBRANCH
)));
3049 Prodlg
.m_PostCmdCallback
= MergeCallback
;
3051 INT_PTR ret
= Prodlg
.DoModal();
3052 if (Prodlg
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
3054 CTGitPathList pathlist
;
3055 CTGitPathList selectedlist
;
3056 pathlist
.AddPath(g_Git
.m_CurrentDir
);
3057 bool bSelectFilesForCommit
= !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE
));
3059 CAppUtils::Commit(CString(), false, str
, pathlist
, selectedlist
, bSelectFilesForCommit
);
3061 else if (ret
== IDC_PROGRESS_BUTTON1
)
3063 if (dlg
.m_bNoCommit
)
3066 CTGitPathList pathList
;
3067 CTGitPathList selectedList
;
3068 return Commit(_T(""), TRUE
, sLogMsg
, pathList
, selectedList
, true);
3070 else if (dlg
.m_bIsBranch
)
3073 msg
.Format(IDS_PROC_DELETEBRANCHTAG
, dlg
.m_VersionName
);
3074 if (CMessageBox::Show(NULL
, msg
, _T("TortoiseGit"), 2, IDI_QUESTION
, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 1)
3077 cmd
.Format(_T("git.exe branch -D -- %s"), dlg
.m_VersionName
);
3078 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
3079 MessageBox(NULL
, out
, _T("TortoiseGit"), MB_OK
);
3084 return !Prodlg
.m_GitStatus
;
3089 BOOL
CAppUtils::MergeAbort()
3092 if (dlg
.DoModal() == IDOK
)
3096 switch (dlg
.m_ResetType
)
3099 type
= _T("--mixed");
3102 type
= _T("--hard");
3105 dlg
.m_ResetType
= 0;
3106 type
= _T("--mixed");
3109 cmd
.Format(_T("git.exe reset %s HEAD"), type
);
3113 CProgressDlg progress
;
3114 progress
.m_GitCmd
= cmd
;
3116 CTGitPath gitPath
= g_Git
.m_CurrentDir
;
3117 if (gitPath
.HasSubmodules() && dlg
.m_ResetType
== 1)
3118 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
3120 progress
.m_PostFailCmdList
.Add(CString(MAKEINTRESOURCE(IDS_MSGBOX_RETRY
)));
3123 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_RESET
))
3125 CGitProgressDlg gitdlg
;
3126 gitdlg
.SetCommand(CGitProgressList::GitProgress_Reset
);
3127 gitdlg
.SetRevision(_T("HEAD"));
3128 gitdlg
.SetResetType(dlg
.m_ResetType
+ 1);
3129 ret
= gitdlg
.DoModal();
3132 ret
= progress
.DoModal();
3134 if (progress
.m_GitStatus
== 0 && gitPath
.HasSubmodules() && dlg
.m_ResetType
== 1 && ret
== IDC_PROGRESS_BUTTON1
)
3137 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
3139 CCommonAppUtils::RunTortoiseGitProc(sCmd
);
3142 else if (progress
.m_GitStatus
!= 0 && ret
== IDC_PROGRESS_BUTTON1
)
3144 else if (ret
== IDOK
)
3153 void CAppUtils::EditNote(GitRev
*rev
)
3155 if (!CheckUserData())
3159 dlg
.m_sHintText
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
3160 dlg
.m_sInputText
= rev
->m_Notes
;
3161 dlg
.m_sTitle
= CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_EDITNOTES
));
3162 //dlg.m_pProjectProperties = &m_ProjectProperties;
3163 dlg
.m_bUseLogWidth
= true;
3164 if(dlg
.DoModal() == IDOK
)
3167 cmd
=_T("notes add -f -F \"");
3169 CString tempfile
=::GetTempFile();
3170 CAppUtils::SaveCommitUnicodeFile(tempfile
,dlg
.m_sInputText
);
3173 cmd
+= rev
->m_CommitHash
.ToString();
3177 if (git_run_cmd("notes", CUnicodeUtils::GetMulti(cmd
, CP_UTF8
).GetBuffer()))
3179 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
3184 rev
->m_Notes
= dlg
.m_sInputText
;
3188 CMessageBox::Show(NULL
, IDS_PROC_FAILEDSAVINGNOTES
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
3190 CFile::Remove(tempfile
);
3195 int CAppUtils::GetMsysgitVersion()
3197 if (g_Git
.ms_LastMsysGitVersion
)
3198 return g_Git
.ms_LastMsysGitVersion
;
3201 CString versiondebug
;
3204 CRegDWORD regTime
= CRegDWORD(_T("Software\\TortoiseGit\\git_file_time"));
3205 CRegDWORD regVersion
= CRegDWORD(_T("Software\\TortoiseGit\\git_cached_version"));
3207 CString gitpath
= CGit::ms_LastMsysGitDir
+_T("\\git.exe");
3210 if (!g_Git
.GetFileModifyTime(gitpath
, &time
))
3212 if((DWORD
)time
== regTime
)
3214 g_Git
.ms_LastMsysGitVersion
= regVersion
;
3220 cmd
= _T("git.exe --version");
3221 if (g_Git
.Run(cmd
, &version
, &err
, CP_UTF8
))
3223 CMessageBox::Show(NULL
, _T("git.exe not correctly set up (") + err
+ _T(")\nCheck TortoiseGit settings and consult help file for \"Git.exe Path\"."), _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
3230 versiondebug
= version
;
3234 CString str
=version
.Tokenize(_T("."), start
);
3235 int space
= str
.ReverseFind(_T(' '));
3236 str
= str
.Mid(space
+1,start
);
3240 version
= version
.Mid(start
);
3243 str
= version
.Tokenize(_T("."), start
);
3245 ver
|= (_ttol(str
) & 0xFF) << 16;
3247 str
= version
.Tokenize(_T("."), start
);
3248 ver
|= (_ttol(str
) & 0xFF) << 8;
3250 str
= version
.Tokenize(_T("."), start
);
3251 ver
|= (_ttol(str
) & 0xFF);
3257 CMessageBox::Show(NULL
, _T("Could not parse git.exe version number: \"") + versiondebug
+ _T("\""), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
3262 regTime
= time
&0xFFFFFFFF;
3264 g_Git
.ms_LastMsysGitVersion
= ver
;
3269 void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd
)
3271 typedef HRESULT (WINAPI
*SHGPSFW
) (HWND hwnd
,REFIID riid
,void** ppv
);
3273 CAutoLibrary hShell
= AtlLoadSystemLibraryUsingFullPath(_T("Shell32.dll"));
3275 if (hShell
.IsValid()) {
3276 SHGPSFW pfnSHGPSFW
= (SHGPSFW
)::GetProcAddress(hShell
, "SHGetPropertyStoreForWindow");
3278 IPropertyStore
*pps
;
3279 HRESULT hr
= pfnSHGPSFW(hWnd
, IID_PPV_ARGS(&pps
));
3280 if (SUCCEEDED(hr
)) {
3283 var
.boolVal
= VARIANT_TRUE
;
3284 hr
= pps
->SetValue(PKEY_AppUserModel_PreventPinning
, var
);
3291 void CAppUtils::SetWindowTitle(HWND hWnd
, const CString
& urlorpath
, const CString
& dialogname
)
3293 ASSERT(dialogname
.GetLength() < 70);
3294 ASSERT(urlorpath
.GetLength() < MAX_PATH
);
3295 WCHAR pathbuf
[MAX_PATH
] = {0};
3297 PathCompactPathEx(pathbuf
, urlorpath
, 70 - dialogname
.GetLength(), 0);
3299 wcscat_s(pathbuf
, L
" - ");
3300 wcscat_s(pathbuf
, dialogname
);
3301 wcscat_s(pathbuf
, L
" - ");
3302 wcscat_s(pathbuf
, CString(MAKEINTRESOURCE(IDS_APPNAME
)));
3303 SetWindowText(hWnd
, pathbuf
);
3306 bool CAppUtils::BisectStart(CString lastGood
, CString firstBad
, bool autoClose
)
3308 if (!g_Git
.CheckCleanWorkTree())
3310 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
3312 CSysProgressDlg sysProgressDlg
;
3313 sysProgressDlg
.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME
)));
3314 sysProgressDlg
.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING
)));
3315 sysProgressDlg
.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT
)));
3316 sysProgressDlg
.SetShowProgressBar(false);
3317 sysProgressDlg
.SetCancelMsg(IDS_PROGRS_INFOFAILED
);
3318 sysProgressDlg
.ShowModeless((HWND
)NULL
, true);
3321 cmd
= _T("git.exe stash");
3322 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
3324 sysProgressDlg
.Stop();
3325 CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), MB_OK
);
3328 sysProgressDlg
.Stop();
3334 CBisectStartDlg bisectStartDlg
;
3336 if (!lastGood
.IsEmpty())
3337 bisectStartDlg
.m_sLastGood
= lastGood
;
3338 if (!firstBad
.IsEmpty())
3339 bisectStartDlg
.m_sFirstBad
= firstBad
;
3341 if (bisectStartDlg
.DoModal() == IDOK
)
3343 CProgressDlg progress
;
3344 theApp
.m_pMainWnd
= &progress
;
3345 progress
.m_bAutoCloseOnSuccess
= autoClose
;
3346 progress
.m_GitCmdList
.push_back(_T("git.exe bisect start"));
3347 progress
.m_GitCmdList
.push_back(_T("git.exe bisect good ") + bisectStartDlg
.m_LastGoodRevision
);
3348 progress
.m_GitCmdList
.push_back(_T("git.exe bisect bad ") + bisectStartDlg
.m_FirstBadRevision
);
3350 CTGitPath
path(g_Git
.m_CurrentDir
);
3352 if (path
.HasSubmodules())
3353 progress
.m_PostCmdList
.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE
)));
3355 INT_PTR ret
= progress
.DoModal();
3356 if (path
.HasSubmodules() && ret
== IDC_PROGRESS_BUTTON1
)
3359 sCmd
.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git
.m_CurrentDir
);
3361 CAppUtils::RunTortoiseGitProc(sCmd
);
3364 else if (ret
== IDOK
)
3371 int CAppUtils::Git2GetUserPassword(git_cred
**out
, const char *url
, const char *username_from_url
, unsigned int /*allowed_types*/, void * /*payload*/)
3374 dlg
.m_URL
= CUnicodeUtils::GetUnicode(url
, CP_UTF8
);
3375 if (username_from_url
)
3376 dlg
.m_UserName
= CUnicodeUtils::GetUnicode(username_from_url
, CP_UTF8
);
3378 CStringA username
, password
;
3379 if (dlg
.DoModal() == IDOK
)
3381 username
= CUnicodeUtils::GetMulti(dlg
.m_UserName
, CP_UTF8
);
3382 password
= CUnicodeUtils::GetMulti(dlg
.m_Password
, CP_UTF8
);
3383 return git_cred_userpass_plaintext_new(out
, username
, password
);