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