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