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
48 #include "PushDlg.h"
\r
50 CAppUtils::CAppUtils(void)
\r
54 CAppUtils::~CAppUtils(void)
\r
58 int CAppUtils::StashApply(CString ref)
\r
61 cmd=_T("git.exe stash apply ");
\r
64 if(g_Git.Run(cmd,&out,CP_ACP))
\r
66 CMessageBox::Show(NULL,CString(_T("<ct=0x0000FF>Stash Apply Fail!!!</ct>\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
70 if(CMessageBox::Show(NULL,CString(_T("<ct=0xff0000>Stash Apply Success</ct>\nDo you want to show change?"))
\r
71 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
\r
74 dlg.m_pathList.AddPath(CTGitPath());
\r
82 int CAppUtils::StashPop()
\r
85 cmd=_T("git.exe stash pop ");
\r
87 if(g_Git.Run(cmd,&out,CP_ACP))
\r
89 CMessageBox::Show(NULL,CString(_T("<ct=0x0000FF>Stash POP Fail!!!</ct>\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
93 if(CMessageBox::Show(NULL,CString(_T("<ct=0xff0000>Stash POP Success</ct>\nDo you want to show change?"))
\r
94 ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)
\r
97 dlg.m_pathList.AddPath(CTGitPath());
\r
105 bool CAppUtils::GetMimeType(const CTGitPath& file, CString& mimetype)
\r
108 GitProperties props(file, GitRev::REV_WC, false);
\r
109 for (int i = 0; i < props.GetCount(); ++i)
\r
111 if (props.GetItemName(i).compare(_T("svn:mime-type"))==0)
\r
113 mimetype = props.GetItemValue(i).c_str();
\r
121 BOOL CAppUtils::StartExtMerge(
\r
122 const CTGitPath& basefile, const CTGitPath& theirfile, const CTGitPath& yourfile, const CTGitPath& mergedfile,
\r
123 const CString& basename, const CString& theirname, const CString& yourname, const CString& mergedname, bool bReadOnly)
\r
126 CRegString regCom = CRegString(_T("Software\\TortoiseGit\\Merge"));
\r
127 CString ext = mergedfile.GetFileExtension();
\r
128 CString com = regCom;
\r
129 bool bInternal = false;
\r
134 // is there an extension specific merge tool?
\r
135 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext.MakeLower());
\r
136 if (CString(mergetool) != "")
\r
141 if (GetMimeType(yourfile, mimetype) || GetMimeType(theirfile, mimetype) || GetMimeType(basefile, mimetype))
\r
143 // is there a mime type specific merge tool?
\r
144 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype);
\r
145 if (CString(mergetool) != "")
\r
151 if (com.IsEmpty()||(com.Left(1).Compare(_T("#"))==0))
\r
153 // use TortoiseMerge
\r
155 CRegString tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE);
\r
156 com = tortoiseMergePath;
\r
159 com = CPathUtils::GetAppDirectory();
\r
160 com += _T("TortoiseMerge.exe");
\r
162 com = _T("\"") + com + _T("\"");
\r
163 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");
\r
164 com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");
\r
166 // check if the params are set. If not, just add the files to the command line
\r
167 if ((com.Find(_T("%merged"))<0)&&(com.Find(_T("%base"))<0)&&(com.Find(_T("%theirs"))<0)&&(com.Find(_T("%mine"))<0))
\r
169 com += _T(" \"")+basefile.GetWinPathString()+_T("\"");
\r
170 com += _T(" \"")+theirfile.GetWinPathString()+_T("\"");
\r
171 com += _T(" \"")+yourfile.GetWinPathString()+_T("\"");
\r
172 com += _T(" \"")+mergedfile.GetWinPathString()+_T("\"");
\r
174 if (basefile.IsEmpty())
\r
176 com.Replace(_T("/base:%base"), _T(""));
\r
177 com.Replace(_T("%base"), _T(""));
\r
180 com.Replace(_T("%base"), _T("\"") + basefile.GetWinPathString() + _T("\""));
\r
181 if (theirfile.IsEmpty())
\r
183 com.Replace(_T("/theirs:%theirs"), _T(""));
\r
184 com.Replace(_T("%theirs"), _T(""));
\r
187 com.Replace(_T("%theirs"), _T("\"") + theirfile.GetWinPathString() + _T("\""));
\r
188 if (yourfile.IsEmpty())
\r
190 com.Replace(_T("/mine:%mine"), _T(""));
\r
191 com.Replace(_T("%mine"), _T(""));
\r
194 com.Replace(_T("%mine"), _T("\"") + yourfile.GetWinPathString() + _T("\""));
\r
195 if (mergedfile.IsEmpty())
\r
197 com.Replace(_T("/merged:%merged"), _T(""));
\r
198 com.Replace(_T("%merged"), _T(""));
\r
201 com.Replace(_T("%merged"), _T("\"") + mergedfile.GetWinPathString() + _T("\""));
\r
202 if (basename.IsEmpty())
\r
204 if (basefile.IsEmpty())
\r
206 com.Replace(_T("/basename:%bname"), _T(""));
\r
207 com.Replace(_T("%bname"), _T(""));
\r
211 com.Replace(_T("%bname"), _T("\"") + basefile.GetUIFileOrDirectoryName() + _T("\""));
\r
215 com.Replace(_T("%bname"), _T("\"") + basename + _T("\""));
\r
216 if (theirname.IsEmpty())
\r
218 if (theirfile.IsEmpty())
\r
220 com.Replace(_T("/theirsname:%tname"), _T(""));
\r
221 com.Replace(_T("%tname"), _T(""));
\r
225 com.Replace(_T("%tname"), _T("\"") + theirfile.GetUIFileOrDirectoryName() + _T("\""));
\r
229 com.Replace(_T("%tname"), _T("\"") + theirname + _T("\""));
\r
230 if (yourname.IsEmpty())
\r
232 if (yourfile.IsEmpty())
\r
234 com.Replace(_T("/minename:%yname"), _T(""));
\r
235 com.Replace(_T("%yname"), _T(""));
\r
239 com.Replace(_T("%yname"), _T("\"") + yourfile.GetUIFileOrDirectoryName() + _T("\""));
\r
243 com.Replace(_T("%yname"), _T("\"") + yourname + _T("\""));
\r
244 if (mergedname.IsEmpty())
\r
246 if (mergedfile.IsEmpty())
\r
248 com.Replace(_T("/mergedname:%mname"), _T(""));
\r
249 com.Replace(_T("%mname"), _T(""));
\r
253 com.Replace(_T("%mname"), _T("\"") + mergedfile.GetUIFileOrDirectoryName() + _T("\""));
\r
257 com.Replace(_T("%mname"), _T("\"") + mergedname + _T("\""));
\r
259 if ((bReadOnly)&&(bInternal))
\r
260 com += _T(" /readonly");
\r
262 if(!LaunchApplication(com, IDS_ERR_EXTMERGESTART, false))
\r
270 BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, const CString& sOriginalDescription, const CString& sPatchedDescription, BOOL bReversed, BOOL bWait)
\r
273 // use TortoiseMerge
\r
274 viewer = CPathUtils::GetAppDirectory();
\r
275 viewer += _T("TortoiseMerge.exe");
\r
277 viewer = _T("\"") + viewer + _T("\"");
\r
278 viewer = viewer + _T(" /diff:\"") + patchfile.GetWinPathString() + _T("\"");
\r
279 viewer = viewer + _T(" /patchpath:\"") + dir.GetWinPathString() + _T("\"");
\r
281 viewer += _T(" /reversedpatch");
\r
282 if (!sOriginalDescription.IsEmpty())
\r
283 viewer = viewer + _T(" /patchoriginal:\"") + sOriginalDescription + _T("\"");
\r
284 if (!sPatchedDescription.IsEmpty())
\r
285 viewer = viewer + _T(" /patchpatched:\"") + sPatchedDescription + _T("\"");
\r
286 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
\r
293 CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2)
\r
295 // Is there a mime type specific diff tool?
\r
297 if (GetMimeType(file1, mimetype) || GetMimeType(file2, mimetype))
\r
299 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype);
\r
300 if (!difftool.IsEmpty())
\r
304 // Is there an extension specific diff tool?
\r
305 CString ext = file2.GetFileExtension().MakeLower();
\r
306 if (!ext.IsEmpty())
\r
308 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext);
\r
309 if (!difftool.IsEmpty())
\r
311 // Maybe we should use TortoiseIDiff?
\r
312 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||
\r
313 (ext == _T(".bmp")) || (ext == _T(".gif")) ||
\r
314 (ext == _T(".png")) || (ext == _T(".ico")) ||
\r
315 (ext == _T(".dib")) || (ext == _T(".emf")))
\r
318 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseIDiff.exe") + _T("\"") +
\r
319 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname");
\r
323 // Finally, pick a generic external diff tool
\r
324 CString difftool = CRegString(_T("Software\\TortoiseGit\\Diff"));
\r
328 bool CAppUtils::StartExtDiff(
\r
329 const CString& file1, const CString& file2,
\r
330 const CString& sName1, const CString& sName2,
\r
331 const DiffFlags& flags)
\r
335 CRegDWORD blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE);
\r
336 if (!flags.bBlame || !(DWORD)blamediff)
\r
338 viewer = PickDiffTool(file1, file2);
\r
339 // If registry entry for a diff program is commented out, use TortoiseMerge.
\r
340 bool bCommentedOut = viewer.Left(1) == _T("#");
\r
341 if (flags.bAlternativeTool)
\r
343 // Invert external vs. internal diff tool selection.
\r
345 viewer.Delete(0); // uncomment
\r
349 else if (bCommentedOut)
\r
353 bool bInternal = viewer.IsEmpty();
\r
357 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseMerge.exe") + _T("\"") +
\r
358 _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
\r
360 viewer += _T(" /blame");
\r
362 // check if the params are set. If not, just add the files to the command line
\r
363 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
\r
365 viewer += _T(" \"")+file1+_T("\"");
\r
366 viewer += _T(" \"")+file2+_T("\"");
\r
368 if (viewer.Find(_T("%base")) >= 0)
\r
370 viewer.Replace(_T("%base"), _T("\"")+file1+_T("\""));
\r
372 if (viewer.Find(_T("%mine")) >= 0)
\r
374 viewer.Replace(_T("%mine"), _T("\"")+file2+_T("\""));
\r
377 if (sName1.IsEmpty())
\r
378 viewer.Replace(_T("%bname"), _T("\"") + file1 + _T("\""));
\r
380 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
\r
382 if (sName2.IsEmpty())
\r
383 viewer.Replace(_T("%yname"), _T("\"") + file2 + _T("\""));
\r
385 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
\r
387 if (flags.bReadOnly && bInternal)
\r
388 viewer += _T(" /readonly");
\r
390 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait);
\r
393 BOOL CAppUtils::StartExtDiffProps(const CTGitPath& file1, const CTGitPath& file2, const CString& sName1, const CString& sName2, BOOL bWait, BOOL bReadOnly)
\r
395 CRegString diffpropsexe(_T("Software\\TortoiseGit\\DiffProps"));
\r
396 CString viewer = diffpropsexe;
\r
397 bool bInternal = false;
\r
398 if (viewer.IsEmpty()||(viewer.Left(1).Compare(_T("#"))==0))
\r
400 //no registry entry (or commented out) for a diff program
\r
401 //use TortoiseMerge
\r
403 viewer = CPathUtils::GetAppDirectory();
\r
404 viewer += _T("TortoiseMerge.exe");
\r
405 viewer = _T("\"") + viewer + _T("\"");
\r
406 viewer = viewer + _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
\r
408 // check if the params are set. If not, just add the files to the command line
\r
409 if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))
\r
411 viewer += _T(" \"")+file1.GetWinPathString()+_T("\"");
\r
412 viewer += _T(" \"")+file2.GetWinPathString()+_T("\"");
\r
414 if (viewer.Find(_T("%base")) >= 0)
\r
416 viewer.Replace(_T("%base"), _T("\"")+file1.GetWinPathString()+_T("\""));
\r
418 if (viewer.Find(_T("%mine")) >= 0)
\r
420 viewer.Replace(_T("%mine"), _T("\"")+file2.GetWinPathString()+_T("\""));
\r
423 if (sName1.IsEmpty())
\r
424 viewer.Replace(_T("%bname"), _T("\"") + file1.GetUIFileOrDirectoryName() + _T("\""));
\r
426 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));
\r
428 if (sName2.IsEmpty())
\r
429 viewer.Replace(_T("%yname"), _T("\"") + file2.GetUIFileOrDirectoryName() + _T("\""));
\r
431 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));
\r
433 if ((bReadOnly)&&(bInternal))
\r
434 viewer += _T(" /readonly");
\r
436 if(!LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, !!bWait))
\r
443 BOOL CAppUtils::StartUnifiedDiffViewer(const CString& patchfile, const CString& title, BOOL bWait)
\r
446 CRegString v = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));
\r
448 if (viewer.IsEmpty() || (viewer.Left(1).Compare(_T("#"))==0))
\r
450 // use TortoiseUDiff
\r
451 viewer = CPathUtils::GetAppDirectory();
\r
452 viewer += _T("TortoiseUDiff.exe");
\r
453 // enquote the path to TortoiseUDiff
\r
454 viewer = _T("\"") + viewer + _T("\"");
\r
456 viewer = viewer + _T(" /patchfile:%1 /title:\"%title\"");
\r
459 if (viewer.Find(_T("%1"))>=0)
\r
461 if (viewer.Find(_T("\"%1\"")) >= 0)
\r
462 viewer.Replace(_T("%1"), patchfile);
\r
464 viewer.Replace(_T("%1"), _T("\"") + patchfile + _T("\""));
\r
467 viewer += _T(" \"") + patchfile + _T("\"");
\r
468 if (viewer.Find(_T("%title")) >= 0)
\r
470 viewer.Replace(_T("%title"), title);
\r
473 if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))
\r
480 BOOL CAppUtils::StartTextViewer(CString file)
\r
483 CRegString txt = CRegString(_T(".txt\\"), _T(""), FALSE, HKEY_CLASSES_ROOT);
\r
485 viewer = viewer + _T("\\Shell\\Open\\Command\\");
\r
486 CRegString txtexe = CRegString(viewer, _T(""), FALSE, HKEY_CLASSES_ROOT);
\r
489 DWORD len = ExpandEnvironmentStrings(viewer, NULL, 0);
\r
490 TCHAR * buf = new TCHAR[len+1];
\r
491 ExpandEnvironmentStrings(viewer, buf, len);
\r
494 len = ExpandEnvironmentStrings(file, NULL, 0);
\r
495 buf = new TCHAR[len+1];
\r
496 ExpandEnvironmentStrings(file, buf, len);
\r
499 file = _T("\"")+file+_T("\"");
\r
500 if (viewer.IsEmpty())
\r
502 OPENFILENAME ofn = {0}; // common dialog box structure
\r
503 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name. Explorer can't handle paths longer than MAX_PATH.
\r
504 // Initialize OPENFILENAME
\r
505 ofn.lStructSize = sizeof(OPENFILENAME);
\r
506 ofn.hwndOwner = NULL;
\r
507 ofn.lpstrFile = szFile;
\r
508 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
\r
510 sFilter.LoadString(IDS_PROGRAMSFILEFILTER);
\r
511 TCHAR * pszFilters = new TCHAR[sFilter.GetLength()+4];
\r
512 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
\r
513 // Replace '|' delimiters with '\0's
\r
514 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
\r
515 while (ptr != pszFilters)
\r
521 ofn.lpstrFilter = pszFilters;
\r
522 ofn.nFilterIndex = 1;
\r
523 ofn.lpstrFileTitle = NULL;
\r
524 ofn.nMaxFileTitle = 0;
\r
525 ofn.lpstrInitialDir = NULL;
\r
527 temp.LoadString(IDS_UTILS_SELECTTEXTVIEWER);
\r
528 CStringUtils::RemoveAccelerators(temp);
\r
529 ofn.lpstrTitle = temp;
\r
530 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
\r
532 // Display the Open dialog box.
\r
534 if (GetOpenFileName(&ofn)==TRUE)
\r
536 delete [] pszFilters;
\r
537 viewer = CString(ofn.lpstrFile);
\r
541 delete [] pszFilters;
\r
545 if (viewer.Find(_T("\"%1\"")) >= 0)
\r
547 viewer.Replace(_T("\"%1\""), file);
\r
549 else if (viewer.Find(_T("%1")) >= 0)
\r
551 viewer.Replace(_T("%1"), file);
\r
559 if(!LaunchApplication(viewer, IDS_ERR_TEXTVIEWSTART, false))
\r
566 BOOL CAppUtils::CheckForEmptyDiff(const CTGitPath& sDiffPath)
\r
569 HANDLE hFile = ::CreateFile(sDiffPath.GetWinPath(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);
\r
570 if (hFile == INVALID_HANDLE_VALUE)
\r
572 length = ::GetFileSize(hFile, NULL);
\r
573 ::CloseHandle(hFile);
\r
580 void CAppUtils::CreateFontForLogs(CFont& fontToCreate)
\r
583 HDC hScreenDC = ::GetDC(NULL);
\r
584 logFont.lfHeight = -MulDiv((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC, LOGPIXELSY), 72);
\r
585 ::ReleaseDC(NULL, hScreenDC);
\r
586 logFont.lfWidth = 0;
\r
587 logFont.lfEscapement = 0;
\r
588 logFont.lfOrientation = 0;
\r
589 logFont.lfWeight = FW_NORMAL;
\r
590 logFont.lfItalic = 0;
\r
591 logFont.lfUnderline = 0;
\r
592 logFont.lfStrikeOut = 0;
\r
593 logFont.lfCharSet = DEFAULT_CHARSET;
\r
594 logFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
\r
595 logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
\r
596 logFont.lfQuality = DRAFT_QUALITY;
\r
597 logFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH;
\r
598 _tcscpy_s(logFont.lfFaceName, 32, (LPCTSTR)(CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));
\r
599 VERIFY(fontToCreate.CreateFontIndirect(&logFont));
\r
602 bool CAppUtils::LaunchApplication(const CString& sCommandLine, UINT idErrMessageFormat, bool bWaitForStartup)
\r
604 STARTUPINFO startup;
\r
605 PROCESS_INFORMATION process;
\r
606 memset(&startup, 0, sizeof(startup));
\r
607 startup.cb = sizeof(startup);
\r
608 memset(&process, 0, sizeof(process));
\r
610 CString cleanCommandLine(sCommandLine);
\r
612 if (CreateProcess(NULL, const_cast<TCHAR*>((LPCTSTR)cleanCommandLine), NULL, NULL, FALSE, 0, 0, g_Git.m_CurrentDir, &startup, &process)==0)
\r
614 if(idErrMessageFormat != 0)
\r
617 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
618 FORMAT_MESSAGE_FROM_SYSTEM |
\r
619 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
622 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
623 (LPTSTR) &lpMsgBuf,
\r
628 temp.Format(idErrMessageFormat, lpMsgBuf);
\r
629 CMessageBox::Show(NULL, temp, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
\r
630 LocalFree( lpMsgBuf );
\r
635 if (bWaitForStartup)
\r
637 WaitForInputIdle(process.hProcess, 10000);
\r
640 CloseHandle(process.hThread);
\r
641 CloseHandle(process.hProcess);
\r
644 bool CAppUtils::LaunchPAgent(CString *keyfile,CString * pRemote)
\r
646 CString key,remote;
\r
648 if( pRemote == NULL)
\r
650 remote=_T("origin");
\r
655 if(keyfile == NULL)
\r
657 cmd.Format(_T("git.exe config remote.%s.puttykeyfile"),remote);
\r
658 g_Git.Run(cmd,&key,CP_ACP);
\r
660 key = key.Tokenize(_T("\n"),start);
\r
668 CString proc=CPathUtils::GetAppDirectory();
\r
669 proc += _T("pageant.exe \"");
\r
673 return LaunchApplication(proc, IDS_ERR_PAGEANT, false);
\r
675 bool CAppUtils::LaunchRemoteSetting()
\r
677 CString proc=CPathUtils::GetAppDirectory();
\r
678 proc += _T("TortoiseProc.exe /command:settings");
\r
679 proc += _T(" /path:\"");
\r
680 proc += g_Git.m_CurrentDir;
\r
681 proc += _T("\" /page:gitremote");
\r
682 return LaunchApplication(proc, IDS_ERR_EXTDIFFSTART, false);
\r
685 * Launch the external blame viewer
\r
687 bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile,CString Rev,const CString& sParams)
\r
689 CString viewer = CPathUtils::GetAppDirectory();
\r
690 viewer += _T("TortoiseGitBlame.exe");
\r
691 viewer += _T(" \"") + sBlameFile + _T("\"");
\r
692 //viewer += _T(" \"") + sLogFile + _T("\"");
\r
693 //viewer += _T(" \"") + sOriginalFile + _T("\"");
\r
695 viewer += CString(_T(" /rev:"))+Rev;
\r
696 viewer += _T(" ")+sParams;
\r
698 return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, false);
\r
701 bool CAppUtils::FormatTextInRichEditControl(CWnd * pWnd)
\r
706 bool bStyled = false;
\r
707 pWnd->GetWindowText(sText);
\r
708 // the rich edit control doesn't count the CR char!
\r
709 // to be exact: CRLF is treated as one char.
\r
710 sText.Replace(_T("\r"), _T(""));
\r
712 // style each line separately
\r
717 nNewlinePos = sText.Find('\n', offset);
\r
718 CString sLine = sText.Mid(offset);
\r
719 if (nNewlinePos>=0)
\r
720 sLine = sLine.Left(nNewlinePos-offset);
\r
723 while (FindStyleChars(sLine, '*', start, end))
\r
725 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
726 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
727 CHARFORMAT2 format;
\r
728 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
729 format.cbSize = sizeof(CHARFORMAT2);
\r
730 format.dwMask = CFM_BOLD;
\r
731 format.dwEffects = CFE_BOLD;
\r
732 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
738 while (FindStyleChars(sLine, '^', start, end))
\r
740 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
741 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
742 CHARFORMAT2 format;
\r
743 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
744 format.cbSize = sizeof(CHARFORMAT2);
\r
745 format.dwMask = CFM_ITALIC;
\r
746 format.dwEffects = CFE_ITALIC;
\r
747 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
753 while (FindStyleChars(sLine, '_', start, end))
\r
755 CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};
\r
756 pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
\r
757 CHARFORMAT2 format;
\r
758 SecureZeroMemory(&format, sizeof(CHARFORMAT2));
\r
759 format.cbSize = sizeof(CHARFORMAT2);
\r
760 format.dwMask = CFM_UNDERLINE;
\r
761 format.dwEffects = CFE_UNDERLINE;
\r
762 pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
\r
766 offset = nNewlinePos+1;
\r
767 } while(nNewlinePos>=0);
\r
771 bool CAppUtils::FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end)
\r
774 bool bFoundMarker = false;
\r
775 // find a starting marker
\r
776 while (sText[i] != 0)
\r
778 if (sText[i] == stylechar)
\r
780 if (((i+1)<sText.GetLength())&&(IsCharAlphaNumeric(sText[i+1])) &&
\r
781 (((i>0)&&(!IsCharAlphaNumeric(sText[i-1])))||(i==0)))
\r
785 bFoundMarker = true;
\r
793 // find ending marker
\r
794 bFoundMarker = false;
\r
795 while (sText[i] != 0)
\r
797 if (sText[i] == stylechar)
\r
799 if ((IsCharAlphaNumeric(sText[i-1])) &&
\r
800 ((((i+1)<sText.GetLength())&&(!IsCharAlphaNumeric(sText[i+1])))||(i+1)==sText.GetLength()))
\r
804 bFoundMarker = true;
\r
810 return bFoundMarker;
\r
813 bool CAppUtils::BrowseRepository(CHistoryCombo& combo, CWnd * pParent, GitRev& rev)
\r
817 combo.GetWindowText(strUrl);
\r
818 strUrl.Replace('\\', '/');
\r
819 strUrl.Replace(_T("%"), _T("%25"));
\r
820 strUrl = CUnicodeUtils::GetUnicode(CPathUtils::PathEscape(CUnicodeUtils::GetUTF8(strUrl)));
\r
821 if (strUrl.Left(7) == _T("file://"))
\r
823 CString strFile(strUrl);
\r
824 Git::UrlToPath(strFile);
\r
827 if (svn.IsRepository(CTGitPath(strFile)))
\r
829 // browse repository - show repository browser
\r
830 Git::preparePath(strUrl);
\r
831 CRepositoryBrowser browser(strUrl, rev, pParent);
\r
832 if (browser.DoModal() == IDOK)
\r
834 combo.SetCurSel(-1);
\r
835 combo.SetWindowText(browser.GetPath());
\r
836 rev = browser.GetRevision();
\r
842 // browse local directories
\r
843 CBrowseFolder folderBrowser;
\r
844 folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
845 // remove the 'file:///' so the shell can recognize the local path
\r
846 Git::UrlToPath(strUrl);
\r
847 if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)
\r
849 Git::PathToUrl(strUrl);
\r
851 combo.SetCurSel(-1);
\r
852 combo.SetWindowText(strUrl);
\r
857 else if ((strUrl.Left(7) == _T("http://")
\r
858 ||(strUrl.Left(8) == _T("https://"))
\r
859 ||(strUrl.Left(6) == _T("svn://"))
\r
860 ||(strUrl.Left(4) == _T("svn+"))) && strUrl.GetLength() > 6)
\r
862 // browse repository - show repository browser
\r
863 CRepositoryBrowser browser(strUrl, rev, pParent);
\r
864 if (browser.DoModal() == IDOK)
\r
866 combo.SetCurSel(-1);
\r
867 combo.SetWindowText(browser.GetPath());
\r
868 rev = browser.GetRevision();
\r
874 // browse local directories
\r
875 CBrowseFolder folderBrowser;
\r
876 folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
877 if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)
\r
879 Git::PathToUrl(strUrl);
\r
881 combo.SetCurSel(-1);
\r
882 combo.SetWindowText(strUrl);
\r
890 bool CAppUtils::FileOpenSave(CString& path, int * filterindex, UINT title, UINT filter, bool bOpen, HWND hwndOwner)
\r
892 OPENFILENAME ofn = {0}; // common dialog box structure
\r
893 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name. Explorer can't handle paths longer than MAX_PATH.
\r
894 ofn.lStructSize = sizeof(OPENFILENAME);
\r
895 ofn.hwndOwner = hwndOwner;
\r
896 _tcscpy_s(szFile, MAX_PATH, (LPCTSTR)path);
\r
897 ofn.lpstrFile = szFile;
\r
898 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
\r
900 TCHAR * pszFilters = NULL;
\r
903 sFilter.LoadString(filter);
\r
904 pszFilters = new TCHAR[sFilter.GetLength()+4];
\r
905 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
\r
906 // Replace '|' delimiters with '\0's
\r
907 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
\r
908 while (ptr != pszFilters)
\r
914 ofn.lpstrFilter = pszFilters;
\r
916 ofn.nFilterIndex = 1;
\r
917 ofn.lpstrFileTitle = NULL;
\r
918 ofn.nMaxFileTitle = 0;
\r
919 ofn.lpstrInitialDir = NULL;
\r
923 temp.LoadString(title);
\r
924 CStringUtils::RemoveAccelerators(temp);
\r
926 ofn.lpstrTitle = temp;
\r
928 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER;
\r
930 ofn.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER;
\r
933 // Display the Open dialog box.
\r
937 bRet = !!GetOpenFileName(&ofn);
\r
941 bRet = !!GetSaveFileName(&ofn);
\r
946 delete [] pszFilters;
\r
947 path = CString(ofn.lpstrFile);
\r
949 *filterindex = ofn.nFilterIndex;
\r
953 delete [] pszFilters;
\r
957 bool CAppUtils::SetListCtrlBackgroundImage(HWND hListCtrl, UINT nID, int width /* = 128 */, int height /* = 128 */)
\r
959 ListView_SetTextBkColor(hListCtrl, CLR_NONE);
\r
960 COLORREF bkColor = ListView_GetBkColor(hListCtrl);
\r
961 // create a bitmap from the icon
\r
962 HICON hIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(nID), IMAGE_ICON, width, height, LR_DEFAULTCOLOR);
\r
967 rect.right = width;
\r
968 rect.bottom = height;
\r
969 HBITMAP bmp = NULL;
\r
971 HWND desktop = ::GetDesktopWindow();
\r
974 HDC screen_dev = ::GetDC(desktop);
\r
977 // Create a compatible DC
\r
978 HDC dst_hdc = ::CreateCompatibleDC(screen_dev);
\r
981 // Create a new bitmap of icon size
\r
982 bmp = ::CreateCompatibleBitmap(screen_dev, rect.right, rect.bottom);
\r
985 // Select it into the compatible DC
\r
986 HBITMAP old_dst_bmp = (HBITMAP)::SelectObject(dst_hdc, bmp);
\r
987 // Fill the background of the compatible DC with the given color
\r
988 ::SetBkColor(dst_hdc, bkColor);
\r
989 ::ExtTextOut(dst_hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);
\r
991 // Draw the icon into the compatible DC
\r
992 ::DrawIconEx(dst_hdc, 0, 0, hIcon, rect.right, rect.bottom, 0, NULL, DI_NORMAL);
\r
993 ::SelectObject(dst_hdc, old_dst_bmp);
\r
995 ::DeleteDC(dst_hdc);
\r
998 ::ReleaseDC(desktop, screen_dev);
\r
1001 // Restore settings
\r
1002 DestroyIcon(hIcon);
\r
1008 lv.ulFlags = LVBKIF_TYPE_WATERMARK;
\r
1010 lv.xOffsetPercent = 100;
\r
1011 lv.yOffsetPercent = 100;
\r
1012 ListView_SetBkImage(hListCtrl, &lv);
\r
1016 CString CAppUtils::GetProjectNameFromURL(CString url)
\r
1019 while (name.IsEmpty() || (name.CompareNoCase(_T("branches"))==0) ||
\r
1020 (name.CompareNoCase(_T("tags"))==0) ||
\r
1021 (name.CompareNoCase(_T("trunk"))==0))
\r
1023 name = url.Mid(url.ReverseFind('/')+1);
\r
1024 url = url.Left(url.ReverseFind('/'));
\r
1026 if ((name.Compare(_T("svn")) == 0)||(name.Compare(_T("svnroot")) == 0))
\r
1028 // a name of svn or svnroot indicates that it's not really the project name. In that
\r
1029 // case, we try the first part of the URL
\r
1030 // of course, this won't work in all cases (but it works for Google project hosting)
\r
1031 url.Replace(_T("http://"), _T(""));
\r
1032 url.Replace(_T("https://"), _T(""));
\r
1033 url.Replace(_T("svn://"), _T(""));
\r
1034 url.Replace(_T("svn+ssh://"), _T(""));
\r
1035 url.TrimLeft(_T("/"));
\r
1036 name = url.Left(url.Find('.'));
\r
1041 bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const git_revnum_t& rev1,
\r
1042 const CTGitPath& url2, const git_revnum_t& rev2,
\r
1043 //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
\r
1044 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool /* blame = false */)
\r
1047 CString tempfile=GetTempFile();
\r
1049 if(rev1 == GitRev::GetWorkingCopy())
\r
1051 cmd.Format(_T("git.exe diff --stat -p %s "),rev2);
\r
1054 cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),rev1,rev2);
\r
1057 if( !url1.IsEmpty() )
\r
1060 cmd+=url1.GetGitPathString();
\r
1063 g_Git.RunLogFile(cmd,tempfile);
\r
1064 CAppUtils::StartUnifiedDiffViewer(tempfile,rev1.Left(6)+_T(":")+rev2.Left(6));
\r
1069 sCmd.Format(_T("%s /command:showcompare /unified"),
\r
1070 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));
\r
1071 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
\r
1072 if (rev1.IsValid())
\r
1073 sCmd += _T(" /revision1:") + rev1.ToString();
\r
1074 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
\r
1075 if (rev2.IsValid())
\r
1076 sCmd += _T(" /revision2:") + rev2.ToString();
\r
1077 if (peg.IsValid())
\r
1078 sCmd += _T(" /pegrevision:") + peg.ToString();
\r
1079 if (headpeg.IsValid())
\r
1080 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
\r
1082 if (bAlternateDiff)
\r
1083 sCmd += _T(" /alternatediff");
\r
1085 if (bIgnoreAncestry)
\r
1086 sCmd += _T(" /ignoreancestry");
\r
1090 sCmd += _T(" /hwnd:");
\r
1092 _stprintf_s(buf, 30, _T("%d"), hWnd);
\r
1096 return CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
1101 bool CAppUtils::StartShowCompare(HWND hWnd, const CTGitPath& url1, const GitRev& rev1,
\r
1102 const CTGitPath& url2, const GitRev& rev2,
\r
1103 const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,
\r
1104 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool blame /* = false */)
\r
1108 sCmd.Format(_T("%s /command:showcompare"),
\r
1109 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));
\r
1110 sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");
\r
1111 if (rev1.IsValid())
\r
1112 sCmd += _T(" /revision1:") + rev1.ToString();
\r
1113 sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");
\r
1114 if (rev2.IsValid())
\r
1115 sCmd += _T(" /revision2:") + rev2.ToString();
\r
1116 if (peg.IsValid())
\r
1117 sCmd += _T(" /pegrevision:") + peg.ToString();
\r
1118 if (headpeg.IsValid())
\r
1119 sCmd += _T(" /headpegrevision:") + headpeg.ToString();
\r
1120 if (bAlternateDiff)
\r
1121 sCmd += _T(" /alternatediff");
\r
1122 if (bIgnoreAncestry)
\r
1123 sCmd += _T(" /ignoreancestry");
\r
1125 sCmd += _T(" /blame");
\r
1129 sCmd += _T(" /hwnd:");
\r
1131 _stprintf_s(buf, 30, _T("%d"), hWnd);
\r
1135 return CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
1140 bool CAppUtils::Export(CString *BashHash)
\r
1142 bool bRet = false;
\r
1144 // ask from where the export has to be done
\r
1147 dlg.m_Revision=*BashHash;
\r
1149 if (dlg.DoModal() == IDOK)
\r
1152 cmd.Format(_T("git.exe archive --format=zip --verbose %s"),
\r
1153 dlg.m_VersionName);
\r
1155 //g_Git.RunLogFile(cmd,dlg.m_strExportDirectory);
\r
1158 pro.m_LogFile=dlg.m_strExportDirectory;
\r
1165 bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash)
\r
1167 CCreateBranchTagDlg dlg;
\r
1168 dlg.m_bIsTag=IsTag;
\r
1170 dlg.m_Base = *CommitHash;
\r
1172 if(dlg.DoModal()==IDOK)
\r
1178 track=_T(" --track ");
\r
1185 cmd.Format(_T("git.exe tag %s %s %s %s"),
\r
1188 dlg.m_BranchTagName,
\r
1195 cmd.Format(_T("git.exe branch %s %s %s %s"),
\r
1198 dlg.m_BranchTagName,
\r
1203 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1205 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1207 if( !IsTag && dlg.m_bSwitch )
\r
1209 // it is a new branch and the user has requested to switch to it
\r
1210 cmd.Format(_T("git.exe checkout %s"), dlg.m_BranchTagName);
\r
1211 g_Git.Run(cmd,&out,CP_UTF8);
\r
1212 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1221 bool CAppUtils::Switch(CString *CommitHash, CString initialRefName)
\r
1223 CGitSwitchDlg dlg;
\r
1225 dlg.m_Base=*CommitHash;
\r
1226 if(!initialRefName.IsEmpty())
\r
1227 dlg.m_initialRefName = initialRefName;
\r
1229 if (dlg.DoModal() == IDOK)
\r
1238 branch.Format(_T("-b %s"),dlg.m_NewBranch);
\r
1242 track=_T("--track");
\r
1244 cmd.Format(_T("git.exe checkout %s %s %s %s"),
\r
1248 dlg.m_VersionName);
\r
1250 CProgressDlg progress;
\r
1251 progress.m_GitCmd=cmd;
\r
1252 if(progress.DoModal()==IDOK)
\r
1259 bool CAppUtils::IgnoreFile(CTGitPathList &path,bool IsMask)
\r
1261 CString ignorefile;
\r
1262 ignorefile=g_Git.m_CurrentDir+_T("\\");
\r
1266 ignorefile+=path.GetCommonRoot().GetDirectory().GetWinPathString()+_T("\\.gitignore");
\r
1270 ignorefile+=_T("\\.gitignore");
\r
1274 if(!file.Open(ignorefile,CFile::modeCreate|CFile::modeReadWrite|CFile::modeNoTruncate))
\r
1276 CMessageBox::Show(NULL,ignorefile+_T(" Open Failure"),_T("TortoiseGit"),MB_OK);
\r
1280 CString ignorelist;
\r
1284 //file.ReadString(ignorelist);
\r
1286 for(int i=0;i<path.GetCount();i++)
\r
1290 mask=_T("*")+path[i].GetFileExtension();
\r
1291 if(ignorelist.Find(mask)<0)
\r
1292 ignorelist+=_T("\n")+mask;
\r
1296 ignorelist+=_T("\n/")+path[i].GetGitPathString();
\r
1299 file.WriteString(ignorelist);
\r
1313 bool CAppUtils::GitReset(CString *CommitHash,int type)
\r
1316 dlg.m_ResetType=type;
\r
1317 if (dlg.DoModal() == IDOK)
\r
1321 switch(dlg.m_ResetType)
\r
1324 type=_T("--soft");
\r
1327 type=_T("--mixed");
\r
1330 type=_T("--hard");
\r
1333 type=_T("--mixed");
\r
1336 cmd.Format(_T("git.exe reset %s %s"),type, *CommitHash);
\r
1338 CProgressDlg progress;
\r
1339 progress.m_GitCmd=cmd;
\r
1340 if(progress.DoModal()==IDOK)
\r
1347 void CAppUtils::DescribeFile(bool mode, bool base,CString &descript)
\r
1351 descript=_T("Deleted");
\r
1356 descript=_T("Modified");
\r
1359 descript=_T("Created");
\r
1363 CString CAppUtils::GetMergeTempFile(CString type,CTGitPath &merge)
\r
1366 file=g_Git.m_CurrentDir+_T("\\")+merge.GetDirectory().GetWinPathString()+_T("\\")+merge.GetFilename()+_T(".")+type+merge.GetFileExtension();
\r
1371 bool CAppUtils::ConflictEdit(CTGitPath &path,bool bAlternativeTool,bool revertTheirMy)
\r
1373 bool bRet = false;
\r
1375 CTGitPath merge=path;
\r
1376 CTGitPath directory = merge.GetDirectory();
\r
1380 // we have the conflicted file (%merged)
\r
1381 // now look for the other required files
\r
1383 //stat.GetStatus(merge);
\r
1384 //if (stat.status == NULL)
\r
1387 BYTE_VECTOR vector;
\r
1390 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge.GetGitPathString());
\r
1392 if(g_Git.Run(cmd,&vector))
\r
1397 CTGitPathList list;
\r
1398 list.ParserFromLsFile(vector);
\r
1400 if(list.GetCount() == 0)
\r
1403 TCHAR szTempName[512];
\r
1404 GetTempFileName(_T(""),_T(""),0,szTempName);
\r
1405 CString temp(szTempName);
\r
1406 temp=temp.Mid(1,temp.GetLength()-5);
\r
1413 mine.SetFromGit(GetMergeTempFile(_T("LOCAL"),merge));
\r
1414 theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"),merge));
\r
1415 base.SetFromGit(GetMergeTempFile(_T("BASE"),merge));
\r
1419 format=_T("git.exe cat-file blob \":%d:%s\"");
\r
1421 //create a empty file, incase stage is not three
\r
1422 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1424 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1426 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
\r
1429 bool b_base=false, b_local=false, b_remote=false;
\r
1431 for(int i=0;i<list.GetCount();i++)
\r
1435 cmd.Format(format,list[i].m_Stage,list[i].GetGitPathString());
\r
1437 if( list[i].m_Stage == 1)
\r
1440 outfile=base.GetWinPathString();
\r
1442 if( list[i].m_Stage == 2 )
\r
1445 outfile=mine.GetWinPathString();
\r
1447 if( list[i].m_Stage == 3 )
\r
1450 outfile=theirs.GetWinPathString();
\r
1452 g_Git.RunLogFile(cmd,outfile);
\r
1455 if(b_local && b_remote )
\r
1457 merge.SetFromWin(g_Git.m_CurrentDir+_T("\\")+merge.GetWinPathString());
\r
1458 if( revertTheirMy )
\r
1459 bRet = !!CAppUtils::StartExtMerge(base,mine, theirs, merge,_T("BASE"),_T("LOCAL"),_T("REMOTE"));
\r
1461 bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
\r
1465 CFile::Remove(mine.GetWinPathString());
\r
1466 CFile::Remove(theirs.GetWinPathString());
\r
1467 CFile::Remove(base.GetWinPathString());
\r
1469 CDeleteConflictDlg dlg;
\r
1470 DescribeFile(b_local, b_base,dlg.m_LocalStatus);
\r
1471 DescribeFile(b_remote,b_base,dlg.m_RemoteStatus);
\r
1472 dlg.m_bShowModifiedButton=b_base;
\r
1473 dlg.m_File=merge.GetGitPathString();
\r
1474 if(dlg.DoModal() == IDOK)
\r
1477 if(dlg.m_bIsDelete)
\r
1479 cmd.Format(_T("git.exe rm -- \"%s\""),merge.GetGitPathString());
\r
1481 cmd.Format(_T("git.exe add -- \"%s\""),merge.GetGitPathString());
\r
1483 if(g_Git.Run(cmd,&out,CP_ACP))
\r
1485 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
1499 CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1500 base, theirs, mine, merge);
\r
1503 if (stat.status->text_status == svn_wc_status_conflicted)
\r
1505 // we have a text conflict, use our merge tool to resolve the conflict
\r
1507 CTSVNPath theirs(directory);
\r
1508 CTSVNPath mine(directory);
\r
1509 CTSVNPath base(directory);
\r
1510 bool bConflictData = false;
\r
1512 if ((stat.status->entry)&&(stat.status->entry->conflict_new))
\r
1514 theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));
\r
1515 bConflictData = true;
\r
1517 if ((stat.status->entry)&&(stat.status->entry->conflict_old))
\r
1519 base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));
\r
1520 bConflictData = true;
\r
1522 if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))
\r
1524 mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));
\r
1525 bConflictData = true;
\r
1531 if (bConflictData)
\r
1532 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1533 base, theirs, mine, merge);
\r
1536 if (stat.status->prop_status == svn_wc_status_conflicted)
\r
1538 // we have a property conflict
\r
1539 CTSVNPath prej(directory);
\r
1540 if ((stat.status->entry)&&(stat.status->entry->prejfile))
\r
1542 prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));
\r
1543 // there's a problem: the prej file contains a _description_ of the conflict, and
\r
1544 // that description string might be translated. That means we have no way of parsing
\r
1545 // the file to find out the conflicting values.
\r
1546 // The only thing we can do: show a dialog with the conflict description, then
\r
1547 // let the user either accept the existing property or open the property edit dialog
\r
1548 // to manually change the properties and values. And a button to mark the conflict as
\r
1550 CEditPropConflictDlg dlg;
\r
1551 dlg.SetPrejFile(prej);
\r
1552 dlg.SetConflictedItem(merge);
\r
1553 bRet = (dlg.DoModal() != IDCANCEL);
\r
1557 if (stat.status->tree_conflict)
\r
1559 // we have a tree conflict
\r
1561 const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());
\r
1564 if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)
\r
1566 CTSVNPath theirs(directory);
\r
1567 CTSVNPath mine(directory);
\r
1568 CTSVNPath base(directory);
\r
1569 bool bConflictData = false;
\r
1571 if (pInfoData->treeconflict_theirfile)
\r
1573 theirs.AppendPathString(pInfoData->treeconflict_theirfile);
\r
1574 bConflictData = true;
\r
1576 if (pInfoData->treeconflict_basefile)
\r
1578 base.AppendPathString(pInfoData->treeconflict_basefile);
\r
1579 bConflictData = true;
\r
1581 if (pInfoData->treeconflict_myfile)
\r
1583 mine.AppendPathString(pInfoData->treeconflict_myfile);
\r
1584 bConflictData = true;
\r
1590 if (bConflictData)
\r
1591 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
\r
1592 base, theirs, mine, merge);
\r
1594 else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)
\r
1596 CString sConflictAction;
\r
1597 CString sConflictReason;
\r
1598 CString sResolveTheirs;
\r
1599 CString sResolveMine;
\r
1600 CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);
\r
1601 CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();
\r
1603 if (pInfoData->treeconflict_nodekind == svn_node_file)
\r
1605 switch (pInfoData->treeconflict_operation)
\r
1607 case svn_wc_operation_update:
\r
1608 switch (pInfoData->treeconflict_action)
\r
1610 case svn_wc_conflict_action_edit:
\r
1611 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);
\r
1612 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1614 case svn_wc_conflict_action_add:
\r
1615 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);
\r
1616 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1618 case svn_wc_conflict_action_delete:
\r
1619 sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);
\r
1620 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1624 case svn_wc_operation_switch:
\r
1625 switch (pInfoData->treeconflict_action)
\r
1627 case svn_wc_conflict_action_edit:
\r
1628 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);
\r
1629 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1631 case svn_wc_conflict_action_add:
\r
1632 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);
\r
1633 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1635 case svn_wc_conflict_action_delete:
\r
1636 sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);
\r
1637 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1641 case svn_wc_operation_merge:
\r
1642 switch (pInfoData->treeconflict_action)
\r
1644 case svn_wc_conflict_action_edit:
\r
1645 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);
\r
1646 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1648 case svn_wc_conflict_action_add:
\r
1649 sResolveTheirs.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);
\r
1650 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
\r
1652 case svn_wc_conflict_action_delete:
\r
1653 sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);
\r
1654 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1660 else if (pInfoData->treeconflict_nodekind == svn_node_dir)
\r
1662 switch (pInfoData->treeconflict_operation)
\r
1664 case svn_wc_operation_update:
\r
1665 switch (pInfoData->treeconflict_action)
\r
1667 case svn_wc_conflict_action_edit:
\r
1668 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);
\r
1669 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1671 case svn_wc_conflict_action_add:
\r
1672 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);
\r
1673 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1675 case svn_wc_conflict_action_delete:
\r
1676 sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);
\r
1677 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1681 case svn_wc_operation_switch:
\r
1682 switch (pInfoData->treeconflict_action)
\r
1684 case svn_wc_conflict_action_edit:
\r
1685 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);
\r
1686 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1688 case svn_wc_conflict_action_add:
\r
1689 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);
\r
1690 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1692 case svn_wc_conflict_action_delete:
\r
1693 sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);
\r
1694 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1698 case svn_wc_operation_merge:
\r
1699 switch (pInfoData->treeconflict_action)
\r
1701 case svn_wc_conflict_action_edit:
\r
1702 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);
\r
1703 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1705 case svn_wc_conflict_action_add:
\r
1706 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);
\r
1707 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
\r
1709 case svn_wc_conflict_action_delete:
\r
1710 sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);
\r
1711 sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
\r
1718 UINT uReasonID = 0;
\r
1719 switch (pInfoData->treeconflict_reason)
\r
1721 case svn_wc_conflict_reason_edited:
\r
1722 uReasonID = IDS_TREECONFLICT_REASON_EDITED;
\r
1723 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1725 case svn_wc_conflict_reason_obstructed:
\r
1726 uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;
\r
1727 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1729 case svn_wc_conflict_reason_deleted:
\r
1730 uReasonID = IDS_TREECONFLICT_REASON_DELETED;
\r
1731 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1733 case svn_wc_conflict_reason_added:
\r
1734 uReasonID = IDS_TREECONFLICT_REASON_ADDED;
\r
1735 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1737 case svn_wc_conflict_reason_missing:
\r
1738 uReasonID = IDS_TREECONFLICT_REASON_MISSING;
\r
1739 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
\r
1741 case svn_wc_conflict_reason_unversioned:
\r
1742 uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;
\r
1743 sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
\r
1746 sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);
\r
1748 CTreeConflictEditorDlg dlg;
\r
1749 dlg.SetConflictInfoText(sConflictReason);
\r
1750 dlg.SetResolveTexts(sResolveTheirs, sResolveMine);
\r
1751 dlg.SetPath(treeConflictPath);
\r
1752 INT_PTR dlgRet = dlg.DoModal();
\r
1753 bRet = (dlgRet != IDCANCEL);
\r
1762 * FUNCTION : FormatDateAndTime
\r
1763 * DESCRIPTION : Generates a displayable string from a CTime object in
\r
1764 * system short or long format or as a relative value
\r
1765 * cTime - the time
\r
1766 * option - DATE_SHORTDATE or DATE_LONGDATE
\r
1767 * bIncluedeTime - whether to show time as well as date
\r
1768 * bRelative - if true then relative time is shown if reasonable
\r
1769 * If HKCU\Software\TortoiseGit\UseSystemLocaleForDates is 0 then use fixed format
\r
1770 * rather than locale
\r
1771 * RETURN : CString containing date/time
\r
1773 CString CAppUtils::FormatDateAndTime( const CTime& cTime, DWORD option, bool bIncludeTime /*=true*/,
\r
1774 bool bRelative /*=false*/)
\r
1779 datetime = ToRelativeTimeString( cTime );
\r
1783 // should we use the locale settings for formatting the date/time?
\r
1784 if (CRegDWORD(_T("Software\\TortoiseGit\\UseSystemLocaleForDates"), TRUE))
\r
1787 SYSTEMTIME sysTime;
\r
1788 cTime.GetAsSystemTime( sysTime );
\r
1792 GetDateFormat(LOCALE_USER_DEFAULT, option, &sysTime, NULL, buf,
\r
1793 sizeof(buf)/sizeof(TCHAR)-1);
\r
1795 if ( bIncludeTime )
\r
1797 datetime += _T(" ");
\r
1798 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &sysTime, NULL, buf, sizeof(buf)/sizeof(TCHAR)-1);
\r
1804 // no, so fixed format
\r
1805 if ( bIncludeTime )
\r
1807 datetime = cTime.Format(_T("%Y-%m-%d %H:%M:%S"));
\r
1811 datetime = cTime.Format(_T("%Y-%m-%d"));
\r
1819 * Converts a given time to a relative display string (relative to current time)
\r
1820 * Given time must be in local timezone
\r
1822 CString CAppUtils::ToRelativeTimeString(CTime time)
\r
1825 // convert to COleDateTime
\r
1826 SYSTEMTIME sysTime;
\r
1827 time.GetAsSystemTime( sysTime );
\r
1828 COleDateTime oleTime( sysTime );
\r
1829 answer = ToRelativeTimeString(oleTime, COleDateTime::GetCurrentTime());
\r
1834 * Generates a display string showing the relative time between the two given times as COleDateTimes
\r
1836 CString CAppUtils::ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo)
\r
1839 COleDateTimeSpan ts = RelativeTo - time;
\r
1841 if(fabs(ts.GetTotalDays()) >= 3*365)
\r
1843 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/365, IDS_YEAR_AGO, IDS_YEARS_AGO );
\r
1846 if(fabs(ts.GetTotalDays()) >= 60)
\r
1848 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/30, IDS_MONTH_AGO, IDS_MONTHS_AGO );
\r
1852 if(fabs(ts.GetTotalDays()) >= 14)
\r
1854 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/7, IDS_WEEK_AGO, IDS_WEEKS_AGO );
\r
1858 if(fabs(ts.GetTotalDays()) >= 2)
\r
1860 answer = ExpandRelativeTime( (int)ts.GetTotalDays(), IDS_DAY_AGO, IDS_DAYS_AGO );
\r
1864 if(fabs(ts.GetTotalHours()) >= 2)
\r
1866 answer = ExpandRelativeTime( (int)ts.GetTotalHours(), IDS_HOUR_AGO, IDS_HOURS_AGO );
\r
1870 if(fabs(ts.GetTotalMinutes()) >= 2)
\r
1872 answer = ExpandRelativeTime( (int)ts.GetTotalMinutes(), IDS_MINUTE_AGO, IDS_MINUTES_AGO );
\r
1876 answer = ExpandRelativeTime( (int)ts.GetTotalSeconds(), IDS_SECOND_AGO, IDS_SECONDS_AGO );
\r
1881 * Passed a value and two resource string ids
\r
1882 * if count is 1 then FormatString is called with format_1 and the value
\r
1883 * otherwise format_2 is used
\r
1884 * the formatted string is returned
\r
1886 CString CAppUtils::ExpandRelativeTime( int count, UINT format_1, UINT format_n )
\r
1891 answer.FormatMessage( format_1, count );
\r
1895 answer.FormatMessage( format_n, count );
\r
1900 bool CAppUtils::IsSSHPutty()
\r
1902 CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
\r
1903 sshclient=sshclient.MakeLower();
\r
1904 if(sshclient.Find(_T("plink.exe"),0)>=0)
\r
1911 CString CAppUtils::GetClipboardLink()
\r
1913 if (!OpenClipboard(NULL))
\r
1916 CString sClipboardText;
\r
1917 HGLOBAL hglb = GetClipboardData(CF_TEXT);
\r
1920 LPCSTR lpstr = (LPCSTR)GlobalLock(hglb);
\r
1921 sClipboardText = CString(lpstr);
\r
1922 GlobalUnlock(hglb);
\r
1924 hglb = GetClipboardData(CF_UNICODETEXT);
\r
1927 LPCTSTR lpstr = (LPCTSTR)GlobalLock(hglb);
\r
1928 sClipboardText = lpstr;
\r
1929 GlobalUnlock(hglb);
\r
1933 if(!sClipboardText.IsEmpty())
\r
1935 if(sClipboardText[0] == _T('\"') && sClipboardText[sClipboardText.GetLength()-1] == _T('\"'))
\r
1936 sClipboardText=sClipboardText.Mid(1,sClipboardText.GetLength()-2);
\r
1938 if(sClipboardText.Find( _T("http://")) == 0)
\r
1939 return sClipboardText;
\r
1941 if(sClipboardText.Find( _T("https://")) == 0)
\r
1942 return sClipboardText;
\r
1944 if(sClipboardText.Find( _T("git://")) == 0)
\r
1945 return sClipboardText;
\r
1947 if(sClipboardText.Find( _T("ssh://")) == 0)
\r
1948 return sClipboardText;
\r
1950 if(sClipboardText.GetLength()>=2)
\r
1951 if( sClipboardText[1] == _T(':') )
\r
1952 if( (sClipboardText[0] >= 'A' && sClipboardText[0] <= 'Z')
\r
1953 || (sClipboardText[0] >= 'a' && sClipboardText[0] <= 'z') )
\r
1954 return sClipboardText;
\r
1957 return CString(_T(""));
\r
1960 CString CAppUtils::ChooseRepository(CString *path)
\r
1962 CBrowseFolder browseFolder;
\r
1963 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
1964 CString strCloneDirectory;
\r
1966 strCloneDirectory=*path;
\r
1969 title.LoadString(IDS_CHOOSE_REPOSITORY);
\r
1971 browseFolder.SetInfo(title);
\r
1973 if (browseFolder.Show(NULL, strCloneDirectory) == CBrowseFolder::OK)
\r
1975 return strCloneDirectory;
\r
1984 bool CAppUtils::SendPatchMail(CTGitPathList &list,bool autoclose)
\r
1988 dlg.m_PathList = list;
\r
1990 if(dlg.DoModal()==IDOK)
\r
1992 if(dlg.m_PathList.GetCount() == 0)
\r
1995 CGitProgressDlg progDlg;
\r
1997 theApp.m_pMainWnd = &progDlg;
\r
1998 progDlg.SetCommand(CGitProgressDlg::GitProgress_SendMail);
\r
2000 progDlg.SetAutoClose(autoclose);
\r
2002 progDlg.SetPathList(dlg.m_PathList);
\r
2003 //ProjectProperties props;
\r
2004 //props.ReadPropsPathList(dlg.m_pathList);
\r
2005 //progDlg.SetProjectProperties(props);
\r
2006 progDlg.SetItemCount(dlg.m_PathList.GetCount());
\r
2009 if(dlg.m_bAttachment)
\r
2010 flags |= SENDMAIL_ATTACHMENT;
\r
2011 if(dlg.m_bCombine)
\r
2012 flags |= SENDMAIL_COMBINED;
\r
2014 progDlg.SetSendMailOption(dlg.m_To,dlg.m_CC,dlg.m_Subject,flags);
\r
2016 progDlg.DoModal();
\r
2023 bool CAppUtils::SendPatchMail(CString &cmd,CString &formatpatchoutput,bool autoclose)
\r
2025 CTGitPathList list;
\r
2026 CString log=formatpatchoutput;
\r
2027 int start=log.Find(cmd);
\r
2029 CString one=log.Tokenize(_T("\n"),start);
\r
2035 CString one=log.Tokenize(_T("\n"),start);
\r
2039 one.Replace(_T('/'),_T('\\'));
\r
2041 path.SetFromWin(one);
\r
2042 list.AddPath(path);
\r
2044 return SendPatchMail(list,autoclose);
\r
2048 int CAppUtils::GetLogOutputEncode(CGit *pGit)
\r
2050 CString cmd,output;
\r
2052 cmd=_T("git.exe config i18n.logOutputEncoding");
\r
2053 if(pGit->Run(cmd,&output,CP_ACP))
\r
2055 cmd=_T("git.exe config i18n.commitencoding");
\r
2056 if(pGit->Run(cmd,&output,CP_ACP))
\r
2060 output=output.Tokenize(_T("\n"),start);
\r
2061 return CUnicodeUtils::GetCPCode(output);
\r
2065 output=output.Tokenize(_T("\n"),start);
\r
2066 return CUnicodeUtils::GetCPCode(output);
\r
2069 int CAppUtils::SaveCommitUnicodeFile(CString &filename, CString &message)
\r
2071 CFile file(filename,CFile::modeReadWrite|CFile::modeCreate );
\r
2072 CString cmd,output;
\r
2075 cmd=_T("git.exe config i18n.commitencoding");
\r
2076 if(g_Git.Run(cmd,&output,CP_ACP))
\r
2080 output=output.Tokenize(_T("\n"),start);
\r
2081 cp=CUnicodeUtils::GetCPCode(output);
\r
2083 int len=message.GetLength();
\r
2086 buf = new char[len*4 + 4];
\r
2087 SecureZeroMemory(buf, (len*4 + 4));
\r
2089 int lengthIncTerminator = WideCharToMultiByte(cp, 0, message, -1, buf, len*4, NULL, NULL);
\r
2091 file.Write(buf,lengthIncTerminator-1);
\r
2097 bool CAppUtils::Push()
\r
2100 // dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();
\r
2101 if(dlg.DoModal()==IDOK)
\r
2103 // CString dir=dlg.m_Directory;
\r
2104 // CString url=dlg.m_URL;
\r
2110 if(dlg.m_bAutoLoad)
\r
2112 CAppUtils::LaunchPAgent(NULL,&dlg.m_URL);
\r
2116 thin=_T("--thin");
\r
2118 tags=_T("--tags");
\r
2120 force=_T("--force");
\r
2122 cmd.Format(_T("git.exe push %s %s %s \"%s\" %s"),
\r
2125 dlg.m_BranchSourceName);
\r
2126 if (!dlg.m_BranchRemoteName.IsEmpty())
\r
2128 cmd += _T(":") + dlg.m_BranchRemoteName;
\r
2131 CProgressDlg progress;
\r
2132 progress.m_GitCmd=cmd;
\r
2133 if(progress.DoModal()==IDOK)
\r
2140 bool CAppUtils::CreateMultipleDirectory(CString& szPath)
\r
2142 CString strDir(szPath);
\r
2143 if (strDir.GetAt(strDir.GetLength()-1)!=_T('\\'))
\r
2145 strDir.AppendChar(_T('\\'));
\r
2147 std::vector<CString> vPath;
\r
2149 bool bSuccess = false;
\r
2151 for (int i=0;i<strDir.GetLength();++i)
\r
2153 if (strDir.GetAt(i) != _T('\\'))
\r
2155 strTemp.AppendChar(strDir.GetAt(i));
\r
2159 vPath.push_back(strTemp);
\r
2160 strTemp.AppendChar(_T('\\'));
\r
2164 std::vector<CString>::const_iterator vIter;
\r
2165 for (vIter = vPath.begin(); vIter != vPath.end(); vIter++)
\r
2167 bSuccess = CreateDirectory(*vIter, NULL) ? true : false;
\r
2173 void CAppUtils::RemoveTrailSlash(CString &path)
\r
2175 if(path.IsEmpty())
\r
2178 while(path[path.GetLength()-1] == _T('\\') || path[path.GetLength()-1] == _T('/' ) )
\r
2180 path=path.Left(path.GetLength()-1);
\r
2181 if(path.IsEmpty())
\r