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