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