1 // TortoiseGit - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2008 - TortoiseGit
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "resource.h"
\r
21 #include "TortoiseProc.h"
\r
22 #include "PathUtils.h"
\r
23 #include "AppUtils.h"
\r
24 //#include "GitProperties.h"
\r
25 #include "StringUtils.h"
\r
26 #include "MessageBox.h"
\r
27 #include "Registry.h"
\r
28 #include "TGitPath.h"
\r
30 //#include "RepositoryBrowser.h"
\r
31 //#include "BrowseFolder.h"
\r
32 #include "UnicodeUtils.h"
\r
33 #include "ExportDlg.h"
\r
34 #include "ProgressDlg.h"
\r
35 #include "GitAdminDir.h"
\r
36 #include "ProgressDlg.h"
\r
37 #include "BrowseFolder.h"
\r
38 #include "DirFileEnum.h"
\r
39 #include "MessageBox.h"
\r
40 #include "GitStatus.h"
\r
41 #include "CreateBranchTagDlg.h"
\r
42 #include "GitSwitchDlg.h"
\r
43 #include "ResetDlg.h"
\r
44 #include "DeleteConflictDlg.h"
\r
45 #include "ChangedDlg.h"
\r
46 #include "SendMailDlg.h"
\r
47 #include "SVNProgressDlg.h"
\r
49 CAppUtils::CAppUtils(void)
\r
53 CAppUtils::~CAppUtils(void)
\r
57 int CAppUtils::StashApply(CString ref)
\r
60 cmd=_T("git.exe stash apply ");
\r
63 if(g_Git.Run(cmd,&out,CP_ACP))
\r
65 CMessageBox::Show(NULL,CString(_T("<ct=0x0000FF>Stash Apply Fail!!!</ct>\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
69 if(CMessageBox::Show(NULL,CString(_T("<ct=0xff0000>Stash Apply Success</ct>\nDo you want to show change?"))
\r
70 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
\r
73 dlg.m_pathList.AddPath(CTGitPath());
\r
80 bool CAppUtils::GetMimeType(const CTGitPath& file, CString& mimetype)
\r
83 GitProperties props(file, GitRev::REV_WC, false);
\r
84 for (int i = 0; i < props.GetCount(); ++i)
\r
86 if (props.GetItemName(i).compare(_T("svn:mime-type"))==0)
\r
88 mimetype = props.GetItemValue(i).c_str();
\r
96 BOOL CAppUtils::StartExtMerge(
\r
97 const CTGitPath& basefile, const CTGitPath& theirfile, const CTGitPath& yourfile, const CTGitPath& mergedfile,
\r
98 const CString& basename, const CString& theirname, const CString& yourname, const CString& mergedname, bool bReadOnly)
\r
101 CRegString regCom = CRegString(_T("Software\\TortoiseGit\\Merge"));
\r
102 CString ext = mergedfile.GetFileExtension();
\r
103 CString com = regCom;
\r
104 bool bInternal = false;
\r
109 // is there an extension specific merge tool?
\r
110 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext.MakeLower());
\r
111 if (CString(mergetool) != "")
\r
116 if (GetMimeType(yourfile, mimetype) || GetMimeType(theirfile, mimetype) || GetMimeType(basefile, mimetype))
\r
118 // is there a mime type specific merge tool?
\r
119 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype);
\r
120 if (CString(mergetool) != "")
\r
126 if (com.IsEmpty()||(com.Left(1).Compare(_T("#"))==0))
\r
128 // use TortoiseMerge
\r
130 CRegString tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE);
\r
131 com = tortoiseMergePath;
\r
134 com = CPathUtils::GetAppDirectory();
\r
135 com += _T("TortoiseMerge.exe");
\r
137 com = _T("\"") + com + _T("\"");
\r
138 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
\r
139 com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
\r
141 // check if the params are set. If not, just add the files to the command line
\r
142 if ((com.Find(_T("%merged"))<0)&&(com.Find(_T("%base"))<0)&&(com.Find(_T("%theirs"))<0)&&(com.Find(_T("%mine"))<0))
\r
144 com += _T(" \"")+basefile.GetWinPathString()+_T("\"");
\r
145 com += _T(" \"")+theirfile.GetWinPathString()+_T("\"");
\r
146 com += _T(" \"")+yourfile.GetWinPathString()+_T("\"");
\r
147 com += _T(" \"")+mergedfile.GetWinPathString()+_T("\"");
\r
149 if (basefile.IsEmpty())
\r
151 com.Replace(_T("/base:%base"), _T(""));
\r
152 com.Replace(_T("%base"), _T(""));
\r
155 com.Replace(_T("%base"), _T("\"") + basefile.GetWinPathString() + _T("\""));
\r
156 if (theirfile.IsEmpty())
\r
158 com.Replace(_T("/theirs:%theirs"), _T(""));
\r
159 com.Replace(_T("%theirs"), _T(""));
\r
162 com.Replace(_T("%theirs"), _T("\"") + theirfile.GetWinPathString() + _T("\""));
\r
163 if (yourfile.IsEmpty())
\r
165 com.Replace(_T("/mine:%mine"), _T(""));
\r
166 com.Replace(_T("%mine"), _T(""));
\r
169 com.Replace(_T("%mine"), _T("\"") + yourfile.GetWinPathString() + _T("\""));
\r
170 if (mergedfile.IsEmpty())
\r
172 com.Replace(_T("/merged:%merged"), _T(""));
\r
173 com.Replace(_T("%merged"), _T(""));
\r
176 com.Replace(_T("%merged"), _T("\"") + mergedfile.GetWinPathString() + _T("\""));
\r
177 if (basename.IsEmpty())
\r
179 if (basefile.IsEmpty())
\r
181 com.Replace(_T("/basename:%bname"), _T(""));
\r
182 com.Replace(_T("%bname"), _T(""));
\r
186 com.Replace(_T("%bname"), _T("\"") + basefile.GetUIFileOrDirectoryName() + _T("\""));
\r
190 com.Replace(_T("%bname"), _T("\"") + basename + _T("\""));
\r
191 if (theirname.IsEmpty())
\r
193 if (theirfile.IsEmpty())
\r
195 com.Replace(_T("/theirsname:%tname"), _T(""));
\r
196 com.Replace(_T("%tname"), _T(""));
\r
200 com.Replace(_T("%tname"), _T("\"") + theirfile.GetUIFileOrDirectoryName() + _T("\""));
\r
204 com.Replace(_T("%tname"), _T("\"") + theirname + _T("\""));
\r
205 if (yourname.IsEmpty())
\r
207 if (yourfile.IsEmpty())
\r
209 com.Replace(_T("/minename:%yname"), _T(""));
\r
210 com.Replace(_T("%yname"), _T(""));
\r
214 com.Replace(_T("%yname"), _T("\"") + yourfile.GetUIFileOrDirectoryName() + _T("\""));
\r
218 com.Replace(_T("%yname"), _T("\"") + yourname + _T("\""));
\r
219 if (mergedname.IsEmpty())
\r
221 if (mergedfile.IsEmpty())
\r
223 com.Replace(_T("/mergedname:%mname"), _T(""));
\r
224 com.Replace(_T("%mname"), _T(""));
\r
228 com.Replace(_T("%mname"), _T("\"") + mergedfile.GetUIFileOrDirectoryName() + _T("\""));
\r
232 com.Replace(_T("%mname"), _T("\"") + mergedname + _T("\""));
\r
234 if ((bReadOnly)&&(bInternal))
\r
235 com += _T(" /readonly");
\r
237 if(!LaunchApplication(com, IDS_ERR_EXTMERGESTART, false))
\r
245 BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, const CString& sOriginalDescription, const CString& sPatchedDescription, BOOL bReversed, BOOL bWait)
\r
248 // use TortoiseMerge
\r
249 viewer = CPathUtils::GetAppDirectory();
\r
250 viewer += _T("TortoiseMerge.exe");
\r
252 viewer = _T("\"") + viewer + _T("\"");
\r
253 viewer = viewer + _T(" /diff:\"") + patchfile.GetWinPathString() + _T("\"");
\r
254 viewer = viewer + _T(" /patchpath:\"") + dir.GetWinPathString() + _T("\"");
\r
256 viewer += _T(" /reversedpatch");
\r
257 if (!sOriginalDescription.IsEmpty())
\r
258 viewer = viewer + _T(" /patchoriginal:\"") + sOriginalDescription + _T("\"");
\r
259 if (!sPatchedDescription.IsEmpty())
\r
260 viewer = viewer + _T(" /patchpatched:\"") + sPatchedDescription + _T("\"");
\r
261 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
\r
268 CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2)
\r
270 // Is there a mime type specific diff tool?
\r
272 if (GetMimeType(file1, mimetype) || GetMimeType(file2, mimetype))
\r
274 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype);
\r
275 if (!difftool.IsEmpty())
\r
279 // Is there an extension specific diff tool?
\r
280 CString ext = file2.GetFileExtension().MakeLower();
\r
281 if (!ext.IsEmpty())
\r
283 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext);
\r
284 if (!difftool.IsEmpty())
\r
286 // Maybe we should use TortoiseIDiff?
\r
287 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
\r
288 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
\r
289 (ext == _T(".png")) || (ext == _T(".ico")) ||
\r
290 (ext == _T(".dib")) || (ext == _T(".emf")))
\r
293 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseIDiff.exe") + _T("\"") +
\r
294 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname");
\r
298 // Finally, pick a generic external diff tool
\r
299 CString difftool = CRegString(_T("Software\\TortoiseGit\\Diff"));
\r
303 bool CAppUtils::StartExtDiff(
\r
304 const CString& file1, const CString& file2,
\r
305 const CString& sName1, const CString& sName2,
\r
306 const DiffFlags& flags)
\r
310 CRegDWORD blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE);
\r
311 if (!flags.bBlame || !(DWORD)blamediff)
\r
313 viewer = PickDiffTool(file1, file2);
\r
314 // If registry entry for a diff program is commented out, use TortoiseMerge.
\r
315 bool bCommentedOut = viewer.Left(1) == _T("#");
\r
316 if (flags.bAlternativeTool)
\r
318 // Invert external vs. internal diff tool selection.
\r
320 viewer.Delete(0); // uncomment
\r
324 else if (bCommentedOut)
\r
328 bool bInternal = viewer.IsEmpty();
\r
332 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseMerge.exe") + _T("\"") +
\r
333 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
\r
335 viewer += _T(" /blame");
\r
337 // check if the params are set. If not, just add the files to the command line
\r
338 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
\r
340 viewer += _T(" \"")+file1+_T("\"");
\r
341 viewer += _T(" \"")+file2+_T("\"");
\r
343 if (viewer.Find(_T("%base")) >= 0)
\r
345 viewer.Replace(_T("%base"), _T("\"")+file1+_T("\""));
\r
347 if (viewer.Find(_T("%mine")) >= 0)
\r
349 viewer.Replace(_T("%mine"), _T("\"")+file2+_T("\""));
\r
352 if (sName1.IsEmpty())
\r
353 viewer.Replace(_T("%bname"), _T("\"") + file1 + _T("\""));
\r
355 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
\r
357 if (sName2.IsEmpty())
\r
358 viewer.Replace(_T("%yname"), _T("\"") + file2 + _T("\""));
\r
360 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
\r
362 if (flags.bReadOnly && bInternal)
\r
363 viewer += _T(" /readonly");
\r
365 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait);
\r
368 BOOL CAppUtils::StartExtDiffProps(const CTGitPath& file1, const CTGitPath& file2, const CString& sName1, const CString& sName2, BOOL bWait, BOOL bReadOnly)
\r
370 CRegString diffpropsexe(_T("Software\\TortoiseGit\\DiffProps"));
\r
371 CString viewer = diffpropsexe;
\r
372 bool bInternal = false;
\r
373 if (viewer.IsEmpty()||(viewer.Left(1).Compare(_T("#"))==0))
\r
375 //no registry entry (or commented out) for a diff program
\r
376 //use TortoiseMerge
\r
378 viewer = CPathUtils::GetAppDirectory();
\r
379 viewer += _T("TortoiseMerge.exe");
\r
380 viewer = _T("\"") + viewer + _T("\"");
\r
381 viewer = viewer + _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
\r
383 // check if the params are set. If not, just add the files to the command line
\r
384 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
\r
386 viewer += _T(" \"")+file1.GetWinPathString()+_T("\"");
\r
387 viewer += _T(" \"")+file2.GetWinPathString()+_T("\"");
\r
389 if (viewer.Find(_T("%base")) >= 0)
\r
391 viewer.Replace(_T("%base"), _T("\"")+file1.GetWinPathString()+_T("\""));
\r
393 if (viewer.Find(_T("%mine")) >= 0)
\r
395 viewer.Replace(_T("%mine"), _T("\"")+file2.GetWinPathString()+_T("\""));
\r
398 if (sName1.IsEmpty())
\r
399 viewer.Replace(_T("%bname"), _T("\"") + file1.GetUIFileOrDirectoryName() + _T("\""));
\r
401 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
\r
403 if (sName2.IsEmpty())
\r
404 viewer.Replace(_T("%yname"), _T("\"") + file2.GetUIFileOrDirectoryName() + _T("\""));
\r
406 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
\r
408 if ((bReadOnly)&&(bInternal))
\r
409 viewer += _T(" /readonly");
\r
411 if(!LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, !!bWait))
\r
418 BOOL CAppUtils::StartUnifiedDiffViewer(const CString& patchfile, const CString& title, BOOL bWait)
\r
421 CRegString v = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
\r
423 if (viewer.IsEmpty() || (viewer.Left(1).Compare(_T("#"))==0))
\r
425 // use TortoiseUDiff
\r
426 viewer = CPathUtils::GetAppDirectory();
\r
427 viewer += _T("TortoiseUDiff.exe");
\r
428 // enquote the path to TortoiseUDiff
\r
429 viewer = _T("\"") + viewer + _T("\"");
\r
431 viewer = viewer + _T(" /patchfile:%1 /title:\"%title\"");
\r
434 if (viewer.Find(_T("%1"))>=0)
\r
436 if (viewer.Find(_T("\"%1\"")) >= 0)
\r
437 viewer.Replace(_T("%1"), patchfile);
\r
439 viewer.Replace(_T("%1"), _T("\"") + patchfile + _T("\""));
\r
442 viewer += _T(" \"") + patchfile + _T("\"");
\r
443 if (viewer.Find(_T("%title")) >= 0)
\r
445 viewer.Replace(_T("%title"), title);
\r
448 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
\r
455 BOOL CAppUtils::StartTextViewer(CString file)
\r
458 CRegString txt = CRegString(_T(".txt\\"), _T(""), FALSE, HKEY_CLASSES_ROOT);
\r
460 viewer = viewer + _T("\\Shell\\Open\\Command\\");
\r
461 CRegString txtexe = CRegString(viewer, _T(""), FALSE, HKEY_CLASSES_ROOT);
\r
464 DWORD len = ExpandEnvironmentStrings(viewer, NULL, 0);
\r
465 TCHAR * buf = new TCHAR[len+1];
\r
466 ExpandEnvironmentStrings(viewer, buf, len);
\r
469 len = ExpandEnvironmentStrings(file, NULL, 0);
\r
470 buf = new TCHAR[len+1];
\r
471 ExpandEnvironmentStrings(file, buf, len);
\r
474 file = _T("\"")+file+_T("\"");
\r
475 if (viewer.IsEmpty())
\r
477 OPENFILENAME ofn = {0}; // common dialog box structure
\r
478 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name. Explorer can't handle paths longer than MAX_PATH.
\r
479 // Initialize OPENFILENAME
\r
480 ofn.lStructSize = sizeof(OPENFILENAME);
\r
481 ofn.hwndOwner = NULL;
\r
482 ofn.lpstrFile = szFile;
\r
483 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
\r
485 sFilter.LoadString(IDS_PROGRAMSFILEFILTER);
\r
486 TCHAR * pszFilters = new TCHAR[sFilter.GetLength()+4];
\r
487 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
\r
488 // Replace '|' delimiters with '\0's
\r
489 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
\r
490 while (ptr != pszFilters)
\r
496 ofn.lpstrFilter = pszFilters;
\r
497 ofn.nFilterIndex = 1;
\r
498 ofn.lpstrFileTitle = NULL;
\r
499 ofn.nMaxFileTitle = 0;
\r
500 ofn.lpstrInitialDir = NULL;
\r
502 temp.LoadString(IDS_UTILS_SELECTTEXTVIEWER);
\r
503 CStringUtils::RemoveAccelerators(temp);
\r
504 ofn.lpstrTitle = temp;
\r
505 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
\r
507 // Display the Open dialog box.
\r
509 if (GetOpenFileName(&ofn)==TRUE)
\r
511 delete [] pszFilters;
\r
512 viewer = CString(ofn.lpstrFile);
\r
516 delete [] pszFilters;
\r
520 if (viewer.Find(_T("\"%1\"")) >= 0)
\r
522 viewer.Replace(_T("\"%1\""), file);
\r
524 else if (viewer.Find(_T("%1")) >= 0)
\r
526 viewer.Replace(_T("%1"), file);
\r
534 if(!LaunchApplication(viewer, IDS_ERR_TEXTVIEWSTART, false))
\r
541 BOOL CAppUtils::CheckForEmptyDiff(const CTGitPath& sDiffPath)
\r
544 HANDLE hFile = ::CreateFile(sDiffPath.GetWinPath(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);
\r
545 if (hFile == INVALID_HANDLE_VALUE)
\r
547 length = ::GetFileSize(hFile, NULL);
\r
548 ::CloseHandle(hFile);
\r
555 void CAppUtils::CreateFontForLogs(CFont& fontToCreate)
\r
558 HDC hScreenDC = ::GetDC(NULL);
\r
559 logFont.lfHeight = -MulDiv((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC, LOGPIXELSY), 72);
\r
560 ::ReleaseDC(NULL, hScreenDC);
\r
561 logFont.lfWidth = 0;
\r
562 logFont.lfEscapement = 0;
\r
563 logFont.lfOrientation = 0;
\r
564 logFont.lfWeight = FW_NORMAL;
\r
565 logFont.lfItalic = 0;
\r
566 logFont.lfUnderline = 0;
\r
567 logFont.lfStrikeOut = 0;
\r
568 logFont.lfCharSet = DEFAULT_CHARSET;
\r
569 logFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
\r
570 logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
\r
571 logFont.lfQuality = DRAFT_QUALITY;
\r
572 logFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH;
\r
573 _tcscpy_s(logFont.lfFaceName, 32, (LPCTSTR)(CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
\r
574 VERIFY(fontToCreate.CreateFontIndirect(&logFont));
\r
577 bool CAppUtils::LaunchApplication(const CString& sCommandLine, UINT idErrMessageFormat, bool bWaitForStartup)
\r
579 STARTUPINFO startup;
\r
580 PROCESS_INFORMATION process;
\r
581 memset(&startup, 0, sizeof(startup));
\r
582 startup.cb = sizeof(startup);
\r
583 memset(&process, 0, sizeof(process));
\r
585 CString cleanCommandLine(sCommandLine);
\r
587 if (CreateProcess(NULL, const_cast<TCHAR*>((LPCTSTR)cleanCommandLine), NULL, NULL, FALSE, 0, 0, sOrigCWD, &startup, &process)==0)
\r
589 if(idErrMessageFormat != 0)
\r
592 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
593 FORMAT_MESSAGE_FROM_SYSTEM |
\r
594 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
597 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
598 (LPTSTR) &lpMsgBuf,
\r
603 temp.Format(idErrMessageFormat, lpMsgBuf);
\r
604 CMessageBox::Show(NULL, temp, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
\r
605 LocalFree( lpMsgBuf );
\r
610 if (bWaitForStartup)
\r
612 WaitForInputIdle(process.hProcess, 10000);
\r
615 CloseHandle(process.hThread);
\r
616 CloseHandle(process.hProcess);
\r
619 bool CAppUtils::LaunchPAgent(CString *keyfile,CString * pRemote)
\r
621 CString key,remote;
\r
623 if( pRemote == NULL)
\r
625 remote=_T("origin");
\r
630 if(keyfile == NULL)
\r
632 cmd.Format(_T("git.exe config remote.%s.puttykeyfile"),remote);
\r
633 g_Git.Run(cmd,&key,CP_ACP);
\r
635 key = key.Tokenize(_T("\n"),start);
\r
643 CString proc=CPathUtils::GetAppDirectory();
\r
644 proc += _T("pageant.exe \"");
\r
648 return LaunchApplication(proc, IDS_ERR_PAGEANT, false);
\r
650 bool CAppUtils::LaunchRemoteSetting()
\r
652 CString proc=CPathUtils::GetAppDirectory();
\r
653 proc += _T("TortoiseProc.exe /command:settings");
\r
654 proc += _T(" /path:\"");
\r
655 proc += g_Git.m_CurrentDir;
\r
656 proc += _T("\" /page:remote");
\r
657 return LaunchApplication(proc, IDS_ERR_EXTDIFFSTART, false);
\r
660 * Launch the external blame viewer
\r
662 bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile,CString Rev,const CString& sParams)
\r
664 CString viewer = CPathUtils::GetAppDirectory();
\r
665 viewer += _T("TortoiseGitBlame.exe");
\r
666 viewer += _T(" \"") + sBlameFile + _T("\"");
\r
667 //viewer += _T(" \"") + sLogFile + _T("\"");
\r
668 //viewer += _T(" \"") + sOriginalFile + _T("\"");
\r
670 viewer += CString(_T(" /rev:"))+Rev;
\r
671 viewer += _T(" ")+sParams;
\r
673 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, false);
\r
676 bool CAppUtils::FormatTextInRichEditControl(CWnd * pWnd)
\r
681 bool bStyled = false;
\r
682 pWnd->GetWindowText(sText);
\r
683 // the rich edit control doesn't count the CR char!
\r
684 // to be exact: CRLF is treated as one char.
\r
685 sText.Replace(_T("\r"), _T(""));
\r
687 // style each line separately
\r
692 nNewlinePos = sText.Find('\n', offset);
\r
693 CString sLine = sText.Mid(offset);
\r
694 if (nNewlinePos>=0)
\r
695 sLine = sLine.Left(nNewlinePos-offset);
\r
698 while (FindStyleChars(sLine, '*', start, end))
\r
700 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
701 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
702 CHARFORMAT2 format;
\r
703 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
704 format.cbSize = sizeof(CHARFORMAT2);
\r
705 format.dwMask = CFM_BOLD;
\r
706 format.dwEffects = CFE_BOLD;
\r
707 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
713 while (FindStyleChars(sLine, '^', start, end))
\r
715 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
716 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
717 CHARFORMAT2 format;
\r
718 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
719 format.cbSize = sizeof(CHARFORMAT2);
\r
720 format.dwMask = CFM_ITALIC;
\r
721 format.dwEffects = CFE_ITALIC;
\r
722 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
728 while (FindStyleChars(sLine, '_', start, end))
\r
730 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
731 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
732 CHARFORMAT2 format;
\r
733 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
734 format.cbSize = sizeof(CHARFORMAT2);
\r
735 format.dwMask = CFM_UNDERLINE;
\r
736 format.dwEffects = CFE_UNDERLINE;
\r
737 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
741 offset = nNewlinePos+1;
\r
742 } while(nNewlinePos>=0);
\r
746 bool CAppUtils::FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end)
\r
749 bool bFoundMarker = false;
\r
750 // find a starting marker
\r
751 while (sText[i] != 0)
\r
753 if (sText[i] == stylechar)
\r
755 if (((i+1)<sText.GetLength())&&(IsCharAlphaNumeric(sText[i+1])) &&
\r
756 (((i>0)&&(!IsCharAlphaNumeric(sText[i-1])))||(i==0)))
\r
760 bFoundMarker = true;
\r
768 // find ending marker
\r
769 bFoundMarker = false;
\r
770 while (sText[i] != 0)
\r
772 if (sText[i] == stylechar)
\r
774 if ((IsCharAlphaNumeric(sText[i-1])) &&
\r
775 ((((i+1)<sText.GetLength())&&(!IsCharAlphaNumeric(sText[i+1])))||(i+1)==sText.GetLength()))
\r
779 bFoundMarker = true;
\r
785 return bFoundMarker;
\r
788 bool CAppUtils::BrowseRepository(CHistoryCombo& combo, CWnd * pParent, GitRev& rev)
\r
792 combo.GetWindowText(strUrl);
\r
793 strUrl.Replace('\\', '/');
\r
794 strUrl.Replace(_T("%"), _T("%25"));
\r
795 strUrl = CUnicodeUtils::GetUnicode(CPathUtils::PathEscape(CUnicodeUtils::GetUTF8(strUrl)));
\r
796 if (strUrl.Left(7) == _T("file://"))
\r
798 CString strFile(strUrl);
\r
799 Git::UrlToPath(strFile);
\r
802 if (svn.IsRepository(CTGitPath(strFile)))
\r
804 // browse repository - show repository browser
\r
805 Git::preparePath(strUrl);
\r
806 CRepositoryBrowser browser(strUrl, rev, pParent);
\r
807 if (browser.DoModal() == IDOK)
\r
809 combo.SetCurSel(-1);
\r
810 combo.SetWindowText(browser.GetPath());
\r
811 rev = browser.GetRevision();
\r
817 // browse local directories
\r
818 CBrowseFolder folderBrowser;
\r
819 folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
820 // remove the 'file:///' so the shell can recognize the local path
\r
821 Git::UrlToPath(strUrl);
\r
822 if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)
\r
824 Git::PathToUrl(strUrl);
\r
826 combo.SetCurSel(-1);
\r
827 combo.SetWindowText(strUrl);
\r
832 else if ((strUrl.Left(7) == _T("http://")
\r
833 ||(strUrl.Left(8) == _T("https://"))
\r
834 ||(strUrl.Left(6) == _T("svn://"))
\r
835 ||(strUrl.Left(4) == _T("svn+"))) && strUrl.GetLength() > 6)
\r
837 // browse repository - show repository browser
\r
838 CRepositoryBrowser browser(strUrl, rev, pParent);
\r
839 if (browser.DoModal() == IDOK)
\r
841 combo.SetCurSel(-1);
\r
842 combo.SetWindowText(browser.GetPath());
\r
843 rev = browser.GetRevision();
\r
849 // browse local directories
\r
850 CBrowseFolder folderBrowser;
\r
851 folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
852 if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)
\r
854 Git::PathToUrl(strUrl);
\r
856 combo.SetCurSel(-1);
\r
857 combo.SetWindowText(strUrl);
\r
865 bool CAppUtils::FileOpenSave(CString& path, int * filterindex, UINT title, UINT filter, bool bOpen, HWND hwndOwner)
\r
867 OPENFILENAME ofn = {0}; // common dialog box structure
\r
868 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name. Explorer can't handle paths longer than MAX_PATH.
\r
869 ofn.lStructSize = sizeof(OPENFILENAME);
\r
870 ofn.hwndOwner = hwndOwner;
\r
871 _tcscpy_s(szFile, MAX_PATH, (LPCTSTR)path);
\r
872 ofn.lpstrFile = szFile;
\r
873 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
\r
875 TCHAR * pszFilters = NULL;
\r
878 sFilter.LoadString(filter);
\r
879 pszFilters = new TCHAR[sFilter.GetLength()+4];
\r
880 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
\r
881 // Replace '|' delimiters with '\0's
\r
882 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
\r
883 while (ptr != pszFilters)
\r
889 ofn.lpstrFilter = pszFilters;
\r
891 ofn.nFilterIndex = 1;
\r
892 ofn.lpstrFileTitle = NULL;
\r
893 ofn.nMaxFileTitle = 0;
\r
894 ofn.lpstrInitialDir = NULL;
\r
898 temp.LoadString(title);
\r
899 CStringUtils::RemoveAccelerators(temp);
\r
901 ofn.lpstrTitle = temp;
\r
903 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER;
\r
905 ofn.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER;
\r
908 // Display the Open dialog box.
\r
912 bRet = !!GetOpenFileName(&ofn);
\r
916 bRet = !!GetSaveFileName(&ofn);
\r
921 delete [] pszFilters;
\r
922 path = CString(ofn.lpstrFile);
\r
924 *filterindex = ofn.nFilterIndex;
\r
928 delete [] pszFilters;
\r
932 bool CAppUtils::SetListCtrlBackgroundImage(HWND hListCtrl, UINT nID, int width /* = 128 */, int height /* = 128 */)
\r
934 ListView_SetTextBkColor(hListCtrl, CLR_NONE);
\r
935 COLORREF bkColor = ListView_GetBkColor(hListCtrl);
\r
936 // create a bitmap from the icon
\r
937 HICON hIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(nID), IMAGE_ICON, width, height, LR_DEFAULTCOLOR);
\r
942 rect.right = width;
\r
943 rect.bottom = height;
\r
944 HBITMAP bmp = NULL;
\r
946 HWND desktop = ::GetDesktopWindow();
\r
949 HDC screen_dev = ::GetDC(desktop);
\r
952 // Create a compatible DC
\r
953 HDC dst_hdc = ::CreateCompatibleDC(screen_dev);
\r
956 // Create a new bitmap of icon size
\r
957 bmp = ::CreateCompatibleBitmap(screen_dev, rect.right, rect.bottom);
\r
960 // Select it into the compatible DC
\r
961 HBITMAP old_dst_bmp = (HBITMAP)::SelectObject(dst_hdc, bmp);
\r
962 // Fill the background of the compatible DC with the given color
\r
963 ::SetBkColor(dst_hdc, bkColor);
\r
964 ::ExtTextOut(dst_hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
\r
966 // Draw the icon into the compatible DC
\r
967 ::DrawIconEx(dst_hdc, 0, 0, hIcon, rect.right, rect.bottom, 0, NULL, DI_NORMAL);
\r
968 ::SelectObject(dst_hdc, old_dst_bmp);
\r
970 ::DeleteDC(dst_hdc);
\r
973 ::ReleaseDC(desktop, screen_dev);
\r
976 // Restore settings
\r
977 DestroyIcon(hIcon);
\r
983 lv.ulFlags = LVBKIF_TYPE_WATERMARK;
\r
985 lv.xOffsetPercent = 100;
\r
986 lv.yOffsetPercent = 100;
\r
987 ListView_SetBkImage(hListCtrl, &lv);
\r
991 CString CAppUtils::GetProjectNameFromURL(CString url)
\r
994 while (name.IsEmpty() || (name.CompareNoCase(_T("branches"))==0) ||
\r
995 (name.CompareNoCase(_T("tags"))==0) ||
\r
996 (name.CompareNoCase(_T("trunk"))==0))
\r
998 name = url.Mid(url.ReverseFind('/')+1);
\r
999 url = url.Left(url.ReverseFind('/'));
\r
1001 if ((name.Compare(_T("svn")) == 0)||(name.Compare(_T("svnroot")) == 0))
\r
1003 // a name of svn or svnroot indicates that it's not really the project name. In that
\r
1004 // case, we try the first part of the URL
\r
1005 // of course, this won't work in all cases (but it works for Google project hosting)
\r
1006 url.Replace(_T("http://"), _T(""));
\r
1007 url.Replace(_T("https://"), _T(""));
\r
1008 url.Replace(_T("svn://"), _T(""));
\r
1009 url.Replace(_T("svn+ssh://"), _T(""));
\r
1010 url.TrimLeft(_T("/"));
\r
1011 name = url.Left(url.Find('.'));
\r
1016 bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const git_revnum_t& rev1,
\r
1017 const CTGitPath& url2, const git_revnum_t& rev2,
\r
1018 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
\r
1019 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool /* blame = false */)
\r
1022 CString tempfile=GetTempFile();
\r
1024 if(rev1 == GitRev::GetWorkingCopy())
\r
1026 cmd.Format(_T("git.exe diff --stat -p %s "),rev2);
\r
1029 cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),rev1,rev2);
\r
1032 if( !url1.IsEmpty() )
\r
1035 cmd+=url1.GetGitPathString();
\r
1038 g_Git.RunLogFile(cmd,tempfile);
\r
1039 CAppUtils::StartUnifiedDiffViewer(tempfile,rev1.Left(6)+_T(":")+rev2.Left(6));
\r
1044 sCmd.Format(_T("%s /command:showcompare /unified"),
\r
1045 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));
\r
1046 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
\r
1047 if (rev1.IsValid())
\r
1048 sCmd += _T(" /revision1:") + rev1.ToString();
\r
1049 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
\r
1050 if (rev2.IsValid())
\r
1051 sCmd += _T(" /revision2:") + rev2.ToString();
\r
1052 if (peg.IsValid())
\r
1053 sCmd += _T(" /pegrevision:") + peg.ToString();
\r
1054 if (headpeg.IsValid())
\r
1055 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
\r
1057 if (bAlternateDiff)
\r
1058 sCmd += _T(" /alternatediff");
\r
1060 if (bIgnoreAncestry)
\r
1061 sCmd += _T(" /ignoreancestry");
\r
1065 sCmd += _T(" /hwnd:");
\r
1067 _stprintf_s(buf, 30, _T("%d"), hWnd);
\r
1071 return CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
1076 bool CAppUtils::StartShowCompare(HWND hWnd, const CTGitPath& url1, const GitRev& rev1,
\r
1077 const CTGitPath& url2, const GitRev& rev2,
\r
1078 const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
\r
1079 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool blame /* = false */)
\r
1083 sCmd.Format(_T("%s /command:showcompare"),
\r
1084 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));
\r
1085 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
\r
1086 if (rev1.IsValid())
\r
1087 sCmd += _T(" /revision1:") + rev1.ToString();
\r
1088 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
\r
1089 if (rev2.IsValid())
\r
1090 sCmd += _T(" /revision2:") + rev2.ToString();
\r
1091 if (peg.IsValid())
\r
1092 sCmd += _T(" /pegrevision:") + peg.ToString();
\r
1093 if (headpeg.IsValid())
\r
1094 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
\r
1095 if (bAlternateDiff)
\r
1096 sCmd += _T(" /alternatediff");
\r
1097 if (bIgnoreAncestry)
\r
1098 sCmd += _T(" /ignoreancestry");
\r
1100 sCmd += _T(" /blame");
\r
1104 sCmd += _T(" /hwnd:");
\r
1106 _stprintf_s(buf, 30, _T("%d"), hWnd);
\r
1110 return CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
1115 bool CAppUtils::Export(CString *BashHash)
\r
1117 bool bRet = false;
\r
1119 // ask from where the export has to be done
\r
1122 dlg.m_Revision=*BashHash;
\r
1124 if (dlg.DoModal() == IDOK)
\r
1127 cmd.Format(_T("git.exe archive --format=zip --verbose %s"),
\r
1128 dlg.m_VersionName);
\r
1130 //g_Git.RunLogFile(cmd,dlg.m_strExportDirectory);
\r
1133 pro.m_LogFile=dlg.m_strExportDirectory;
\r
1140 bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash)
\r
1142 CCreateBranchTagDlg dlg;
\r
1143 dlg.m_bIsTag=IsTag;
\r
1145 dlg.m_Base = *CommitHash;
\r
1147 if(dlg.DoModal()==IDOK)
\r
1153 track=_T(" --track ");
\r
1160 cmd.Format(_T("git.exe tag %s %s %s %s"),
\r
1163 dlg.m_BranchTagName,
\r
1170 cmd.Format(_T("git.exe branch %s %s %s %s"),
\r
1173 dlg.m_BranchTagName,
\r
1178 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1180 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1182 if( !IsTag && dlg.m_bSwitch )
\r
1184 // it is a new branch and the user has requested to switch to it
\r
1185 cmd.Format(_T("git.exe checkout %s"), dlg.m_BranchTagName);
\r
1186 g_Git.Run(cmd,&out,CP_UTF8);
\r
1187 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1196 bool CAppUtils::Switch(CString *CommitHash)
\r
1198 CGitSwitchDlg dlg;
\r
1200 dlg.m_Base=*CommitHash;
\r
1202 if (dlg.DoModal() == IDOK)
\r
1211 branch.Format(_T("-b %s"),dlg.m_NewBranch);
\r
1215 track=_T("--track");
\r
1217 cmd.Format(_T("git.exe checkout %s %s %s %s"),
\r
1221 dlg.m_VersionName);
\r
1223 CProgressDlg progress;
\r
1224 progress.m_GitCmd=cmd;
\r
1225 if(progress.DoModal()==IDOK)
\r
1232 bool CAppUtils::IgnoreFile(CTGitPathList &path,bool IsMask)
\r
1234 CString ignorefile;
\r
1235 ignorefile=g_Git.m_CurrentDir+_T("\\");
\r
1239 ignorefile+=path.GetCommonRoot().GetDirectory().GetWinPathString()+_T("\\.gitignore");
\r
1243 ignorefile+=_T("\\.gitignore");
\r
1247 if(!file.Open(ignorefile,CFile::modeCreate|CFile::modeReadWrite|CFile::modeNoTruncate))
\r
1249 CMessageBox::Show(NULL,ignorefile+_T(" Open Failure"),_T("TortoiseGit"),MB_OK);
\r
1253 CString ignorelist;
\r
1257 //file.ReadString(ignorelist);
\r
1259 for(int i=0;i<path.GetCount();i++)
\r
1263 mask=_T("*")+path[i].GetFileExtension();
\r
1264 if(ignorelist.Find(mask)<0)
\r
1265 ignorelist+=_T("\n")+mask;
\r
1269 ignorelist+=_T("\n/")+path[i].GetGitPathString();
\r
1272 file.WriteString(ignorelist);
\r
1286 bool CAppUtils::GitReset(CString *CommitHash,int type)
\r
1289 dlg.m_ResetType=type;
\r
1290 if (dlg.DoModal() == IDOK)
\r
1294 switch(dlg.m_ResetType)
\r
1297 type=_T("--soft");
\r
1300 type=_T("--mixed");
\r
1303 type=_T("--hard");
\r
1306 type=_T("--mixed");
\r
1309 cmd.Format(_T("git.exe reset %s %s"),type, *CommitHash);
\r
1311 CProgressDlg progress;
\r
1312 progress.m_GitCmd=cmd;
\r
1313 if(progress.DoModal()==IDOK)
\r
1320 void CAppUtils::DescribeFile(bool mode, bool base,CString &descript)
\r
1324 descript=_T("Deleted");
\r
1329 descript=_T("Modified");
\r
1332 descript=_T("Created");
\r
1336 CString CAppUtils::GetMergeTempFile(CString type,CTGitPath &merge)
\r
1339 file=g_Git.m_CurrentDir+_T("\\")+merge.GetDirectory().GetWinPathString()+_T("\\")+merge.GetFilename()+_T(".")+type+merge.GetFileExtension();
\r
1344 bool CAppUtils::ConflictEdit(CTGitPath &path,bool bAlternativeTool)
\r
1346 bool bRet = false;
\r
1348 CTGitPath merge=path;
\r
1349 CTGitPath directory = merge.GetDirectory();
\r
1353 // we have the conflicted file (%merged)
\r
1354 // now look for the other required files
\r
1356 //stat.GetStatus(merge);
\r
1357 //if (stat.status == NULL)
\r
1360 BYTE_VECTOR vector;
\r
1363 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge.GetGitPathString());
\r
1365 if(g_Git.Run(cmd,&vector))
\r
1370 CTGitPathList list;
\r
1371 list.ParserFromLsFile(vector);
\r
1373 if(list.GetCount() == 0)
\r
1376 TCHAR szTempName[512];
\r
1377 GetTempFileName(_T(""),_T(""),0,szTempName);
\r
1378 CString temp(szTempName);
\r
1379 temp=temp.Mid(1,temp.GetLength()-5);
\r
1386 mine.SetFromGit(GetMergeTempFile(_T("LOCAL"),merge));
\r
1387 theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"),merge));
\r
1388 base.SetFromGit(GetMergeTempFile(_T("BASE"),merge));
\r
1392 format=_T("git.exe cat-file blob \":%d:%s\"");
\r
1394 //create a empty file, incase stage is not three
\r
1395 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1397 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1399 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1402 bool b_base=false, b_local=false, b_remote=false;
\r
1404 for(int i=0;i<list.GetCount();i++)
\r
1408 cmd.Format(format,list[i].m_Stage,list[i].GetGitPathString());
\r
1410 if( list[i].m_Stage == 1)
\r
1413 outfile=base.GetWinPathString();
\r
1415 if( list[i].m_Stage == 2 )
\r
1418 outfile=mine.GetWinPathString();
\r
1420 if( list[i].m_Stage == 3 )
\r
1423 outfile=theirs.GetWinPathString();
\r
1425 g_Git.RunLogFile(cmd,outfile);
\r
1428 if(b_local && b_remote )
\r
1430 merge.SetFromWin(g_Git.m_CurrentDir+_T("\\")+merge.GetWinPathString());
\r
1431 bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
\r
1435 CFile::Remove(mine.GetWinPathString());
\r
1436 CFile::Remove(theirs.GetWinPathString());
\r
1437 CFile::Remove(base.GetWinPathString());
\r
1439 CDeleteConflictDlg dlg;
\r
1440 DescribeFile(b_local, b_base,dlg.m_LocalStatus);
\r
1441 DescribeFile(b_remote,b_base,dlg.m_RemoteStatus);
\r
1442 dlg.m_bShowModifiedButton=b_base;
\r
1443 dlg.m_File=merge.GetGitPathString();
\r
1444 if(dlg.DoModal() == IDOK)
\r
1447 if(dlg.m_bIsDelete)
\r
1449 cmd.Format(_T("git.exe rm \"%s\""),merge.GetGitPathString());
\r
1451 cmd.Format(_T("git.exe add \"%s\""),merge.GetGitPathString());
\r
1453 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1455 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1469 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1470 base, theirs, mine, merge);
\r
1473 if (stat.status->text_status == svn_wc_status_conflicted)
\r
1475 // we have a text conflict, use our merge tool to resolve the conflict
\r
1477 CTSVNPath theirs(directory);
\r
1478 CTSVNPath mine(directory);
\r
1479 CTSVNPath base(directory);
\r
1480 bool bConflictData = false;
\r
1482 if ((stat.status->entry)&&(stat.status->entry->conflict_new))
\r
1484 theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));
\r
1485 bConflictData = true;
\r
1487 if ((stat.status->entry)&&(stat.status->entry->conflict_old))
\r
1489 base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));
\r
1490 bConflictData = true;
\r
1492 if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))
\r
1494 mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));
\r
1495 bConflictData = true;
\r
1501 if (bConflictData)
\r
1502 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1503 base, theirs, mine, merge);
\r
1506 if (stat.status->prop_status == svn_wc_status_conflicted)
\r
1508 // we have a property conflict
\r
1509 CTSVNPath prej(directory);
\r
1510 if ((stat.status->entry)&&(stat.status->entry->prejfile))
\r
1512 prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));
\r
1513 // there's a problem: the prej file contains a _description_ of the conflict, and
\r
1514 // that description string might be translated. That means we have no way of parsing
\r
1515 // the file to find out the conflicting values.
\r
1516 // The only thing we can do: show a dialog with the conflict description, then
\r
1517 // let the user either accept the existing property or open the property edit dialog
\r
1518 // to manually change the properties and values. And a button to mark the conflict as
\r
1520 CEditPropConflictDlg dlg;
\r
1521 dlg.SetPrejFile(prej);
\r
1522 dlg.SetConflictedItem(merge);
\r
1523 bRet = (dlg.DoModal() != IDCANCEL);
\r
1527 if (stat.status->tree_conflict)
\r
1529 // we have a tree conflict
\r
1531 const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());
\r
1534 if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)
\r
1536 CTSVNPath theirs(directory);
\r
1537 CTSVNPath mine(directory);
\r
1538 CTSVNPath base(directory);
\r
1539 bool bConflictData = false;
\r
1541 if (pInfoData->treeconflict_theirfile)
\r
1543 theirs.AppendPathString(pInfoData->treeconflict_theirfile);
\r
1544 bConflictData = true;
\r
1546 if (pInfoData->treeconflict_basefile)
\r
1548 base.AppendPathString(pInfoData->treeconflict_basefile);
\r
1549 bConflictData = true;
\r
1551 if (pInfoData->treeconflict_myfile)
\r
1553 mine.AppendPathString(pInfoData->treeconflict_myfile);
\r
1554 bConflictData = true;
\r
1560 if (bConflictData)
\r
1561 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1562 base, theirs, mine, merge);
\r
1564 else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)
\r
1566 CString sConflictAction;
\r
1567 CString sConflictReason;
\r
1568 CString sResolveTheirs;
\r
1569 CString sResolveMine;
\r
1570 CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);
\r
1571 CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();
\r
1573 if (pInfoData->treeconflict_nodekind == svn_node_file)
\r
1575 switch (pInfoData->treeconflict_operation)
\r
1577 case svn_wc_operation_update:
\r
1578 switch (pInfoData->treeconflict_action)
\r
1580 case svn_wc_conflict_action_edit:
\r
1581 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);
\r
1582 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1584 case svn_wc_conflict_action_add:
\r
1585 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);
\r
1586 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1588 case svn_wc_conflict_action_delete:
\r
1589 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);
\r
1590 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1594 case svn_wc_operation_switch:
\r
1595 switch (pInfoData->treeconflict_action)
\r
1597 case svn_wc_conflict_action_edit:
\r
1598 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);
\r
1599 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1601 case svn_wc_conflict_action_add:
\r
1602 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);
\r
1603 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1605 case svn_wc_conflict_action_delete:
\r
1606 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);
\r
1607 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1611 case svn_wc_operation_merge:
\r
1612 switch (pInfoData->treeconflict_action)
\r
1614 case svn_wc_conflict_action_edit:
\r
1615 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);
\r
1616 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1618 case svn_wc_conflict_action_add:
\r
1619 sResolveTheirs.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);
\r
1620 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1622 case svn_wc_conflict_action_delete:
\r
1623 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);
\r
1624 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1630 else if (pInfoData->treeconflict_nodekind == svn_node_dir)
\r
1632 switch (pInfoData->treeconflict_operation)
\r
1634 case svn_wc_operation_update:
\r
1635 switch (pInfoData->treeconflict_action)
\r
1637 case svn_wc_conflict_action_edit:
\r
1638 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);
\r
1639 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1641 case svn_wc_conflict_action_add:
\r
1642 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);
\r
1643 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1645 case svn_wc_conflict_action_delete:
\r
1646 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);
\r
1647 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1651 case svn_wc_operation_switch:
\r
1652 switch (pInfoData->treeconflict_action)
\r
1654 case svn_wc_conflict_action_edit:
\r
1655 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);
\r
1656 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1658 case svn_wc_conflict_action_add:
\r
1659 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);
\r
1660 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1662 case svn_wc_conflict_action_delete:
\r
1663 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);
\r
1664 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1668 case svn_wc_operation_merge:
\r
1669 switch (pInfoData->treeconflict_action)
\r
1671 case svn_wc_conflict_action_edit:
\r
1672 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);
\r
1673 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1675 case svn_wc_conflict_action_add:
\r
1676 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);
\r
1677 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1679 case svn_wc_conflict_action_delete:
\r
1680 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);
\r
1681 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1688 UINT uReasonID = 0;
\r
1689 switch (pInfoData->treeconflict_reason)
\r
1691 case svn_wc_conflict_reason_edited:
\r
1692 uReasonID = IDS_TREECONFLICT_REASON_EDITED;
\r
1693 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1695 case svn_wc_conflict_reason_obstructed:
\r
1696 uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;
\r
1697 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1699 case svn_wc_conflict_reason_deleted:
\r
1700 uReasonID = IDS_TREECONFLICT_REASON_DELETED;
\r
1701 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1703 case svn_wc_conflict_reason_added:
\r
1704 uReasonID = IDS_TREECONFLICT_REASON_ADDED;
\r
1705 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1707 case svn_wc_conflict_reason_missing:
\r
1708 uReasonID = IDS_TREECONFLICT_REASON_MISSING;
\r
1709 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1711 case svn_wc_conflict_reason_unversioned:
\r
1712 uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;
\r
1713 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1716 sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);
\r
1718 CTreeConflictEditorDlg dlg;
\r
1719 dlg.SetConflictInfoText(sConflictReason);
\r
1720 dlg.SetResolveTexts(sResolveTheirs, sResolveMine);
\r
1721 dlg.SetPath(treeConflictPath);
\r
1722 INT_PTR dlgRet = dlg.DoModal();
\r
1723 bRet = (dlgRet != IDCANCEL);
\r
1732 * FUNCTION : FormatDateAndTime
\r
1733 * DESCRIPTION : Generates a displayable string from a CTime object in
\r
1734 * system short or long format or as a relative value
\r
1735 * cTime - the time
\r
1736 * option - DATE_SHORTDATE or DATE_LONGDATE
\r
1737 * bIncluedeTime - whether to show time as well as date
\r
1738 * bRelative - if true then relative time is shown if reasonable
\r
1739 * If HKCU\Software\TortoiseGit\UseSystemLocaleForDates is 0 then use fixed format
\r
1740 * rather than locale
\r
1741 * RETURN : CString containing date/time
\r
1743 CString CAppUtils::FormatDateAndTime( const CTime& cTime, DWORD option, bool bIncludeTime /*=true*/,
\r
1744 bool bRelative /*=false*/)
\r
1749 datetime = ToRelativeTimeString( cTime );
\r
1753 // should we use the locale settings for formatting the date/time?
\r
1754 if (CRegDWORD(_T("Software\\TortoiseGit\\UseSystemLocaleForDates"), TRUE))
\r
1757 SYSTEMTIME sysTime;
\r
1758 cTime.GetAsSystemTime( sysTime );
\r
1762 GetDateFormat(LOCALE_USER_DEFAULT, option, &sysTime, NULL, buf,
\r
1763 sizeof(buf)/sizeof(TCHAR)-1);
\r
1765 if ( bIncludeTime )
\r
1767 datetime += _T(" ");
\r
1768 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &sysTime, NULL, buf, sizeof(buf)/sizeof(TCHAR)-1);
\r
1774 // no, so fixed format
\r
1775 if ( bIncludeTime )
\r
1777 datetime = cTime.Format(_T("%Y-%m-%d %H:%M:%S"));
\r
1781 datetime = cTime.Format(_T("%Y-%m-%d"));
\r
1789 * Converts a given time to a relative display string (relative to current time)
\r
1790 * Given time must be in local timezone
\r
1792 CString CAppUtils::ToRelativeTimeString(CTime time)
\r
1795 // convert to COleDateTime
\r
1796 SYSTEMTIME sysTime;
\r
1797 time.GetAsSystemTime( sysTime );
\r
1798 COleDateTime oleTime( sysTime );
\r
1799 answer = ToRelativeTimeString(oleTime, COleDateTime::GetCurrentTime());
\r
1804 * Generates a display string showing the relative time between the two given times as COleDateTimes
\r
1806 CString CAppUtils::ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo)
\r
1809 COleDateTimeSpan ts = RelativeTo - time;
\r
1811 if(fabs(ts.GetTotalDays()) >= 3*365)
\r
1813 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/365, IDS_YEAR_AGO, IDS_YEARS_AGO );
\r
1816 if(fabs(ts.GetTotalDays()) >= 60)
\r
1818 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/30, IDS_MONTH_AGO, IDS_MONTHS_AGO );
\r
1822 if(fabs(ts.GetTotalDays()) >= 14)
\r
1824 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/7, IDS_WEEK_AGO, IDS_WEEKS_AGO );
\r
1828 if(fabs(ts.GetTotalDays()) >= 2)
\r
1830 answer = ExpandRelativeTime( (int)ts.GetTotalDays(), IDS_DAY_AGO, IDS_DAYS_AGO );
\r
1834 if(fabs(ts.GetTotalHours()) >= 2)
\r
1836 answer = ExpandRelativeTime( (int)ts.GetTotalHours(), IDS_HOUR_AGO, IDS_HOURS_AGO );
\r
1840 if(fabs(ts.GetTotalMinutes()) >= 2)
\r
1842 answer = ExpandRelativeTime( (int)ts.GetTotalMinutes(), IDS_MINUTE_AGO, IDS_MINUTES_AGO );
\r
1846 answer = ExpandRelativeTime( (int)ts.GetTotalSeconds(), IDS_SECOND_AGO, IDS_SECONDS_AGO );
\r
1851 * Passed a value and two resource string ids
\r
1852 * if count is 1 then FormatString is called with format_1 and the value
\r
1853 * otherwise format_2 is used
\r
1854 * the formatted string is returned
\r
1856 CString CAppUtils::ExpandRelativeTime( int count, UINT format_1, UINT format_n )
\r
1861 answer.FormatMessage( format_1, count );
\r
1865 answer.FormatMessage( format_n, count );
\r
1870 bool CAppUtils::IsSSHPutty()
\r
1872 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
1873 sshclient=sshclient.MakeLower();
\r
1874 if(sshclient.Find(_T("plink.exe"),0)>=0)
\r
1881 CString CAppUtils::GetClipboardLink()
\r
1883 if (!OpenClipboard(NULL))
\r
1886 CString sClipboardText;
\r
1887 HGLOBAL hglb = GetClipboardData(CF_TEXT);
\r
1890 LPCSTR lpstr = (LPCSTR)GlobalLock(hglb);
\r
1891 sClipboardText = CString(lpstr);
\r
1892 GlobalUnlock(hglb);
\r
1894 hglb = GetClipboardData(CF_UNICODETEXT);
\r
1897 LPCTSTR lpstr = (LPCTSTR)GlobalLock(hglb);
\r
1898 sClipboardText = lpstr;
\r
1899 GlobalUnlock(hglb);
\r
1903 if(!sClipboardText.IsEmpty())
\r
1905 if(sClipboardText[0] == _T('\"') && sClipboardText[sClipboardText.GetLength()-1] == _T('\"'))
\r
1906 sClipboardText=sClipboardText.Mid(1,sClipboardText.GetLength()-2);
\r
1908 if(sClipboardText.Find( _T("http://")) == 0)
\r
1909 return sClipboardText;
\r
1911 if(sClipboardText.Find( _T("https://")) == 0)
\r
1912 return sClipboardText;
\r
1914 if(sClipboardText.Find( _T("git://")) == 0)
\r
1915 return sClipboardText;
\r
1917 if(sClipboardText.Find( _T("ssh://")) == 0)
\r
1918 return sClipboardText;
\r
1920 if(sClipboardText.GetLength()>=2)
\r
1921 if( sClipboardText[1] == _T(':') )
\r
1922 if( (sClipboardText[0] >= 'A' && sClipboardText[0] <= 'Z')
\r
1923 || (sClipboardText[0] >= 'a' && sClipboardText[0] <= 'z') )
\r
1924 return sClipboardText;
\r
1927 return CString(_T(""));
\r
1930 CString CAppUtils::ChooseRepository(CString *path)
\r
1932 CBrowseFolder browseFolder;
\r
1933 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
1934 CString strCloneDirectory;
\r
1936 strCloneDirectory=*path;
\r
1939 title.LoadString(IDS_CHOOSE_REPOSITORY);
\r
1941 browseFolder.SetInfo(title);
\r
1943 if (browseFolder.Show(NULL, strCloneDirectory) == CBrowseFolder::OK)
\r
1945 return strCloneDirectory;
\r
1954 bool CAppUtils::SendPatchMail(CTGitPathList &list,bool autoclose)
\r
1958 dlg.m_PathList = list;
\r
1960 if(dlg.DoModal()==IDOK)
\r
1962 if(dlg.m_PathList.GetCount() == 0)
\r
1965 CGitProgressDlg progDlg;
\r
1967 theApp.m_pMainWnd = &progDlg;
\r
1968 progDlg.SetCommand(CGitProgressDlg::GitProgress_SendMail);
\r
1970 progDlg.SetAutoClose(autoclose);
\r
1972 progDlg.SetPathList(dlg.m_PathList);
\r
1973 //ProjectProperties props;
\r
1974 //props.ReadPropsPathList(dlg.m_pathList);
\r
1975 //progDlg.SetProjectProperties(props);
\r
1976 progDlg.SetItemCount(dlg.m_PathList.GetCount());
\r
1979 if(dlg.m_bAttachment)
\r
1980 flags |= SENDMAIL_ATTACHMENT;
\r
1981 if(dlg.m_bCombine)
\r
1982 flags |= SENDMAIL_COMBINED;
\r
1984 progDlg.SetSendMailOption(dlg.m_To,dlg.m_CC,dlg.m_Subject,flags);
\r
1986 progDlg.DoModal();
\r