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