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