src/TortoiseProc/AppUtils.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control\r
   2 \r
   3 // Copyright (C) 2003-2008 - TortoiseGit\r
   4 \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
   9 \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
  14 \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
  18 //\r
  19 #include "StdAfx.h"\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
  29 #include "Git.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 \r
  47 CAppUtils::CAppUtils(void)\r
  48 {\r
  49 }\r
  50 \r
  51 CAppUtils::~CAppUtils(void)\r
  52 {\r
  53 }\r
  54 \r
  55 int      CAppUtils::StashApply(CString ref)\r
  56 {\r
  57         CString cmd,out;\r
  58         cmd=_T("git.exe stash apply ");\r
  59         cmd+=ref;\r
  60         \r
  61         if(g_Git.Run(cmd,&out,CP_ACP))\r
  62         {\r
  63                 CMessageBox::Show(NULL,CString(_T("<ct=0x0000FF>Stash Apply Fail!!!</ct>\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
  64 \r
  65         }else\r
  66         {\r
  67                 if(CMessageBox::Show(NULL,CString(_T("<ct=0xff0000>Stash Apply Success</ct>\nDo you want to show change?"))\r
  68                         ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES)\r
  69                 {\r
  70                         CChangedDlg dlg;\r
  71                         dlg.m_pathList.AddPath(CTGitPath());\r
  72                         dlg.DoModal();                  \r
  73                 }\r
  74                 return 0;\r
  75         }\r
  76         return -1;\r
  77 }\r
  78 bool CAppUtils::GetMimeType(const CTGitPath& file, CString& mimetype)\r
  79 {\r
  80 #if 0\r
  81         GitProperties props(file, GitRev::REV_WC, false);\r
  82         for (int i = 0; i < props.GetCount(); ++i)\r
  83         {\r
  84                 if (props.GetItemName(i).compare(_T("svn:mime-type"))==0)\r
  85                 {\r
  86                         mimetype = props.GetItemValue(i).c_str();\r
  87                         return true;\r
  88                 }\r
  89         }\r
  90 #endif\r
  91         return false;\r
  92 }\r
  93 \r
  94 BOOL CAppUtils::StartExtMerge(\r
  95         const CTGitPath& basefile, const CTGitPath& theirfile, const CTGitPath& yourfile, const CTGitPath& mergedfile,\r
  96         const CString& basename, const CString& theirname, const CString& yourname, const CString& mergedname, bool bReadOnly)\r
  97 {\r
  98 \r
  99         CRegString regCom = CRegString(_T("Software\\TortoiseGit\\Merge"));\r
 100         CString ext = mergedfile.GetFileExtension();\r
 101         CString com = regCom;\r
 102         bool bInternal = false;\r
 103 \r
 104         CString mimetype;\r
 105         if (ext != "")\r
 106         {\r
 107                 // is there an extension specific merge tool?\r
 108                 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + ext.MakeLower());\r
 109                 if (CString(mergetool) != "")\r
 110                 {\r
 111                         com = mergetool;\r
 112                 }\r
 113         }\r
 114         if (GetMimeType(yourfile, mimetype) || GetMimeType(theirfile, mimetype) || GetMimeType(basefile, mimetype))\r
 115         {\r
 116                 // is there a mime type specific merge tool?\r
 117                 CRegString mergetool(_T("Software\\TortoiseGit\\MergeTools\\") + mimetype);\r
 118                 if (CString(mergetool) != "")\r
 119                 {\r
 120                         com = mergetool;\r
 121                 }\r
 122         }\r
 123         \r
 124         if (com.IsEmpty()||(com.Left(1).Compare(_T("#"))==0))\r
 125         {\r
 126                 // use TortoiseMerge\r
 127                 bInternal = true;\r
 128                 CRegString tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T(""), false, HKEY_LOCAL_MACHINE);\r
 129                 com = tortoiseMergePath;\r
 130                 if (com.IsEmpty())\r
 131                 {\r
 132                         com = CPathUtils::GetAppDirectory();\r
 133                         com += _T("TortoiseMerge.exe");\r
 134                 }\r
 135                 com = _T("\"") + com + _T("\"");\r
 136                 com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /merged:%merged");\r
 137                 com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname");\r
 138         }\r
 139         // check if the params are set. If not, just add the files to the command line\r
 140         if ((com.Find(_T("%merged"))<0)&&(com.Find(_T("%base"))<0)&&(com.Find(_T("%theirs"))<0)&&(com.Find(_T("%mine"))<0))\r
 141         {\r
 142                 com += _T(" \"")+basefile.GetWinPathString()+_T("\"");\r
 143                 com += _T(" \"")+theirfile.GetWinPathString()+_T("\"");\r
 144                 com += _T(" \"")+yourfile.GetWinPathString()+_T("\"");\r
 145                 com += _T(" \"")+mergedfile.GetWinPathString()+_T("\"");\r
 146         }\r
 147         if (basefile.IsEmpty())\r
 148         {\r
 149                 com.Replace(_T("/base:%base"), _T(""));\r
 150                 com.Replace(_T("%base"), _T(""));               \r
 151         }\r
 152         else\r
 153                 com.Replace(_T("%base"), _T("\"") + basefile.GetWinPathString() + _T("\""));\r
 154         if (theirfile.IsEmpty())\r
 155         {\r
 156                 com.Replace(_T("/theirs:%theirs"), _T(""));\r
 157                 com.Replace(_T("%theirs"), _T(""));\r
 158         }\r
 159         else\r
 160                 com.Replace(_T("%theirs"), _T("\"") + theirfile.GetWinPathString() + _T("\""));\r
 161         if (yourfile.IsEmpty())\r
 162         {\r
 163                 com.Replace(_T("/mine:%mine"), _T(""));\r
 164                 com.Replace(_T("%mine"), _T(""));\r
 165         }\r
 166         else\r
 167                 com.Replace(_T("%mine"), _T("\"") + yourfile.GetWinPathString() + _T("\""));\r
 168         if (mergedfile.IsEmpty())\r
 169         {\r
 170                 com.Replace(_T("/merged:%merged"), _T(""));\r
 171                 com.Replace(_T("%merged"), _T(""));\r
 172         }\r
 173         else\r
 174                 com.Replace(_T("%merged"), _T("\"") + mergedfile.GetWinPathString() + _T("\""));\r
 175         if (basename.IsEmpty())\r
 176         {\r
 177                 if (basefile.IsEmpty())\r
 178                 {\r
 179                         com.Replace(_T("/basename:%bname"), _T(""));\r
 180                         com.Replace(_T("%bname"), _T(""));\r
 181                 }\r
 182                 else\r
 183                 {\r
 184                         com.Replace(_T("%bname"), _T("\"") + basefile.GetUIFileOrDirectoryName() + _T("\""));\r
 185                 }\r
 186         }\r
 187         else\r
 188                 com.Replace(_T("%bname"), _T("\"") + basename + _T("\""));\r
 189         if (theirname.IsEmpty())\r
 190         {\r
 191                 if (theirfile.IsEmpty())\r
 192                 {\r
 193                         com.Replace(_T("/theirsname:%tname"), _T(""));\r
 194                         com.Replace(_T("%tname"), _T(""));\r
 195                 }\r
 196                 else\r
 197                 {\r
 198                         com.Replace(_T("%tname"), _T("\"") + theirfile.GetUIFileOrDirectoryName() + _T("\""));\r
 199                 }\r
 200         }\r
 201         else\r
 202                 com.Replace(_T("%tname"), _T("\"") + theirname + _T("\""));\r
 203         if (yourname.IsEmpty())\r
 204         {\r
 205                 if (yourfile.IsEmpty())\r
 206                 {\r
 207                         com.Replace(_T("/minename:%yname"), _T(""));\r
 208                         com.Replace(_T("%yname"), _T(""));\r
 209                 }\r
 210                 else\r
 211                 {\r
 212                         com.Replace(_T("%yname"), _T("\"") + yourfile.GetUIFileOrDirectoryName() + _T("\""));\r
 213                 }\r
 214         }\r
 215         else\r
 216                 com.Replace(_T("%yname"), _T("\"") + yourname + _T("\""));\r
 217         if (mergedname.IsEmpty())\r
 218         {\r
 219                 if (mergedfile.IsEmpty())\r
 220                 {\r
 221                         com.Replace(_T("/mergedname:%mname"), _T(""));\r
 222                         com.Replace(_T("%mname"), _T(""));\r
 223                 }\r
 224                 else\r
 225                 {\r
 226                         com.Replace(_T("%mname"), _T("\"") + mergedfile.GetUIFileOrDirectoryName() + _T("\""));\r
 227                 }\r
 228         }\r
 229         else\r
 230                 com.Replace(_T("%mname"), _T("\"") + mergedname + _T("\""));\r
 231 \r
 232         if ((bReadOnly)&&(bInternal))\r
 233                 com += _T(" /readonly");\r
 234 \r
 235         if(!LaunchApplication(com, IDS_ERR_EXTMERGESTART, false))\r
 236         {\r
 237                 return FALSE;\r
 238         }\r
 239 \r
 240         return TRUE;\r
 241 }\r
 242 \r
 243 BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, const CString& sOriginalDescription, const CString& sPatchedDescription, BOOL bReversed, BOOL bWait)\r
 244 {\r
 245         CString viewer;\r
 246         // use TortoiseMerge\r
 247         viewer = CPathUtils::GetAppDirectory();\r
 248         viewer += _T("TortoiseMerge.exe");\r
 249 \r
 250         viewer = _T("\"") + viewer + _T("\"");\r
 251         viewer = viewer + _T(" /diff:\"") + patchfile.GetWinPathString() + _T("\"");\r
 252         viewer = viewer + _T(" /patchpath:\"") + dir.GetWinPathString() + _T("\"");\r
 253         if (bReversed)\r
 254                 viewer += _T(" /reversedpatch");\r
 255         if (!sOriginalDescription.IsEmpty())\r
 256                 viewer = viewer + _T(" /patchoriginal:\"") + sOriginalDescription + _T("\"");\r
 257         if (!sPatchedDescription.IsEmpty())\r
 258                 viewer = viewer + _T(" /patchpatched:\"") + sPatchedDescription + _T("\"");\r
 259         if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))\r
 260         {\r
 261                 return FALSE;\r
 262         }\r
 263         return TRUE;\r
 264 }\r
 265 \r
 266 CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2)\r
 267 {\r
 268         // Is there a mime type specific diff tool?\r
 269         CString mimetype;\r
 270         if (GetMimeType(file1, mimetype) ||  GetMimeType(file2, mimetype))\r
 271         {\r
 272                 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + mimetype);\r
 273                 if (!difftool.IsEmpty())\r
 274                         return difftool;\r
 275         }\r
 276         \r
 277         // Is there an extension specific diff tool?\r
 278         CString ext = file2.GetFileExtension().MakeLower();\r
 279         if (!ext.IsEmpty())\r
 280         {\r
 281                 CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + ext);\r
 282                 if (!difftool.IsEmpty())\r
 283                         return difftool;\r
 284                 // Maybe we should use TortoiseIDiff?\r
 285                 if ((ext == _T(".jpg")) || (ext == _T(".jpeg")) ||\r
 286                         (ext == _T(".bmp")) || (ext == _T(".gif"))  ||\r
 287                         (ext == _T(".png")) || (ext == _T(".ico"))  ||\r
 288                         (ext == _T(".dib")) || (ext == _T(".emf")))\r
 289                 {\r
 290                         return\r
 291                                 _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseIDiff.exe") + _T("\"") +\r
 292                                 _T(" /left:%base /right:%mine /lefttitle:%bname /righttitle:%yname");\r
 293                 }\r
 294         }\r
 295         \r
 296         // Finally, pick a generic external diff tool\r
 297         CString difftool = CRegString(_T("Software\\TortoiseGit\\Diff"));\r
 298         return difftool;\r
 299 }\r
 300 \r
 301 bool CAppUtils::StartExtDiff(\r
 302         const CString& file1,  const CString& file2,\r
 303         const CString& sName1, const CString& sName2, \r
 304         const DiffFlags& flags)\r
 305 {\r
 306         CString viewer;\r
 307 \r
 308         CRegDWORD blamediff(_T("Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge"), FALSE);\r
 309         if (!flags.bBlame || !(DWORD)blamediff)\r
 310         {\r
 311                 viewer = PickDiffTool(file1, file2);\r
 312                 // If registry entry for a diff program is commented out, use TortoiseMerge.\r
 313                 bool bCommentedOut = viewer.Left(1) == _T("#");\r
 314                 if (flags.bAlternativeTool)\r
 315                 {\r
 316                         // Invert external vs. internal diff tool selection.\r
 317                         if (bCommentedOut)\r
 318                                 viewer.Delete(0); // uncomment\r
 319                         else\r
 320                                 viewer = "";\r
 321                 }\r
 322                 else if (bCommentedOut)\r
 323                         viewer = "";\r
 324         }\r
 325 \r
 326         bool bInternal = viewer.IsEmpty();\r
 327         if (bInternal)\r
 328         {\r
 329                 viewer =\r
 330                         _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseMerge.exe") + _T("\"") +\r
 331                         _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");\r
 332                 if (flags.bBlame)\r
 333                         viewer += _T(" /blame");\r
 334         }\r
 335         // check if the params are set. If not, just add the files to the command line\r
 336         if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))\r
 337         {\r
 338                 viewer += _T(" \"")+file1+_T("\"");\r
 339                 viewer += _T(" \"")+file2+_T("\"");\r
 340         }\r
 341         if (viewer.Find(_T("%base")) >= 0)\r
 342         {\r
 343                 viewer.Replace(_T("%base"),  _T("\"")+file1+_T("\""));\r
 344         }\r
 345         if (viewer.Find(_T("%mine")) >= 0)\r
 346         {\r
 347                 viewer.Replace(_T("%mine"),  _T("\"")+file2+_T("\""));\r
 348         }\r
 349 \r
 350         if (sName1.IsEmpty())\r
 351                 viewer.Replace(_T("%bname"), _T("\"") + file1 + _T("\""));\r
 352         else\r
 353                 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));\r
 354 \r
 355         if (sName2.IsEmpty())\r
 356                 viewer.Replace(_T("%yname"), _T("\"") + file2 + _T("\""));\r
 357         else\r
 358                 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));\r
 359 \r
 360         if (flags.bReadOnly && bInternal)\r
 361                 viewer += _T(" /readonly");\r
 362 \r
 363         return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait);\r
 364 }\r
 365 \r
 366 BOOL CAppUtils::StartExtDiffProps(const CTGitPath& file1, const CTGitPath& file2, const CString& sName1, const CString& sName2, BOOL bWait, BOOL bReadOnly)\r
 367 {\r
 368         CRegString diffpropsexe(_T("Software\\TortoiseGit\\DiffProps"));\r
 369         CString viewer = diffpropsexe;\r
 370         bool bInternal = false;\r
 371         if (viewer.IsEmpty()||(viewer.Left(1).Compare(_T("#"))==0))\r
 372         {\r
 373                 //no registry entry (or commented out) for a diff program\r
 374                 //use TortoiseMerge\r
 375                 bInternal = true;\r
 376                 viewer = CPathUtils::GetAppDirectory();\r
 377                 viewer += _T("TortoiseMerge.exe");\r
 378                 viewer = _T("\"") + viewer + _T("\"");\r
 379                 viewer = viewer + _T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");\r
 380         }\r
 381         // check if the params are set. If not, just add the files to the command line\r
 382         if ((viewer.Find(_T("%base"))<0)&&(viewer.Find(_T("%mine"))<0))\r
 383         {\r
 384                 viewer += _T(" \"")+file1.GetWinPathString()+_T("\"");\r
 385                 viewer += _T(" \"")+file2.GetWinPathString()+_T("\"");\r
 386         }\r
 387         if (viewer.Find(_T("%base")) >= 0)\r
 388         {\r
 389                 viewer.Replace(_T("%base"),  _T("\"")+file1.GetWinPathString()+_T("\""));\r
 390         }\r
 391         if (viewer.Find(_T("%mine")) >= 0)\r
 392         {\r
 393                 viewer.Replace(_T("%mine"),  _T("\"")+file2.GetWinPathString()+_T("\""));\r
 394         }\r
 395 \r
 396         if (sName1.IsEmpty())\r
 397                 viewer.Replace(_T("%bname"), _T("\"") + file1.GetUIFileOrDirectoryName() + _T("\""));\r
 398         else\r
 399                 viewer.Replace(_T("%bname"), _T("\"") + sName1 + _T("\""));\r
 400 \r
 401         if (sName2.IsEmpty())\r
 402                 viewer.Replace(_T("%yname"), _T("\"") + file2.GetUIFileOrDirectoryName() + _T("\""));\r
 403         else\r
 404                 viewer.Replace(_T("%yname"), _T("\"") + sName2 + _T("\""));\r
 405 \r
 406         if ((bReadOnly)&&(bInternal))\r
 407                 viewer += _T(" /readonly");\r
 408 \r
 409         if(!LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, !!bWait))\r
 410         {\r
 411                 return FALSE;\r
 412         }\r
 413         return TRUE;\r
 414 }\r
 415 \r
 416 BOOL CAppUtils::StartUnifiedDiffViewer(const CString& patchfile, const CString& title, BOOL bWait)\r
 417 {\r
 418         CString viewer;\r
 419         CRegString v = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));\r
 420         viewer = v;\r
 421         if (viewer.IsEmpty() || (viewer.Left(1).Compare(_T("#"))==0))\r
 422         {\r
 423                 // use TortoiseUDiff\r
 424                 viewer = CPathUtils::GetAppDirectory();\r
 425                 viewer += _T("TortoiseUDiff.exe");\r
 426                 // enquote the path to TortoiseUDiff\r
 427                 viewer = _T("\"") + viewer + _T("\"");\r
 428                 // add the params\r
 429                 viewer = viewer + _T(" /patchfile:%1 /title:\"%title\"");\r
 430 \r
 431         }\r
 432         if (viewer.Find(_T("%1"))>=0)\r
 433         {\r
 434                 if (viewer.Find(_T("\"%1\"")) >= 0)\r
 435                         viewer.Replace(_T("%1"), patchfile);\r
 436                 else\r
 437                         viewer.Replace(_T("%1"), _T("\"") + patchfile + _T("\""));\r
 438         }\r
 439         else\r
 440                 viewer += _T(" \"") + patchfile + _T("\"");\r
 441         if (viewer.Find(_T("%title")) >= 0)\r
 442         {\r
 443                 viewer.Replace(_T("%title"), title);\r
 444         }\r
 445 \r
 446         if(!LaunchApplication(viewer, IDS_ERR_DIFFVIEWSTART, !!bWait))\r
 447         {\r
 448                 return FALSE;\r
 449         }\r
 450         return TRUE;\r
 451 }\r
 452 \r
 453 BOOL CAppUtils::StartTextViewer(CString file)\r
 454 {\r
 455         CString viewer;\r
 456         CRegString txt = CRegString(_T(".txt\\"), _T(""), FALSE, HKEY_CLASSES_ROOT);\r
 457         viewer = txt;\r
 458         viewer = viewer + _T("\\Shell\\Open\\Command\\");\r
 459         CRegString txtexe = CRegString(viewer, _T(""), FALSE, HKEY_CLASSES_ROOT);\r
 460         viewer = txtexe;\r
 461 \r
 462         DWORD len = ExpandEnvironmentStrings(viewer, NULL, 0);\r
 463         TCHAR * buf = new TCHAR[len+1];\r
 464         ExpandEnvironmentStrings(viewer, buf, len);\r
 465         viewer = buf;\r
 466         delete [] buf;\r
 467         len = ExpandEnvironmentStrings(file, NULL, 0);\r
 468         buf = new TCHAR[len+1];\r
 469         ExpandEnvironmentStrings(file, buf, len);\r
 470         file = buf;\r
 471         delete [] buf;\r
 472         file = _T("\"")+file+_T("\"");\r
 473         if (viewer.IsEmpty())\r
 474         {\r
 475                 OPENFILENAME ofn = {0};                         // common dialog box structure\r
 476                 TCHAR szFile[MAX_PATH] = {0};           // buffer for file name. Explorer can't handle paths longer than MAX_PATH.\r
 477                 // Initialize OPENFILENAME\r
 478                 ofn.lStructSize = sizeof(OPENFILENAME);\r
 479                 ofn.hwndOwner = NULL;\r
 480                 ofn.lpstrFile = szFile;\r
 481                 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);\r
 482                 CString sFilter;\r
 483                 sFilter.LoadString(IDS_PROGRAMSFILEFILTER);\r
 484                 TCHAR * pszFilters = new TCHAR[sFilter.GetLength()+4];\r
 485                 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);\r
 486                 // Replace '|' delimiters with '\0's\r
 487                 TCHAR *ptr = pszFilters + _tcslen(pszFilters);  //set ptr at the NULL\r
 488                 while (ptr != pszFilters)\r
 489                 {\r
 490                         if (*ptr == '|')\r
 491                                 *ptr = '\0';\r
 492                         ptr--;\r
 493                 }\r
 494                 ofn.lpstrFilter = pszFilters;\r
 495                 ofn.nFilterIndex = 1;\r
 496                 ofn.lpstrFileTitle = NULL;\r
 497                 ofn.nMaxFileTitle = 0;\r
 498                 ofn.lpstrInitialDir = NULL;\r
 499                 CString temp;\r
 500                 temp.LoadString(IDS_UTILS_SELECTTEXTVIEWER);\r
 501                 CStringUtils::RemoveAccelerators(temp);\r
 502                 ofn.lpstrTitle = temp;\r
 503                 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;\r
 504 \r
 505                 // Display the Open dialog box. \r
 506 \r
 507                 if (GetOpenFileName(&ofn)==TRUE)\r
 508                 {\r
 509                         delete [] pszFilters;\r
 510                         viewer = CString(ofn.lpstrFile);\r
 511                 }\r
 512                 else\r
 513                 {\r
 514                         delete [] pszFilters;\r
 515                         return FALSE;\r
 516                 }\r
 517         }\r
 518         if (viewer.Find(_T("\"%1\"")) >= 0)\r
 519         {\r
 520                 viewer.Replace(_T("\"%1\""), file);\r
 521         }\r
 522         else if (viewer.Find(_T("%1")) >= 0)\r
 523         {\r
 524                 viewer.Replace(_T("%1"),  file);\r
 525         }\r
 526         else\r
 527         {\r
 528                 viewer += _T(" ");\r
 529                 viewer += file;\r
 530         }\r
 531 \r
 532         if(!LaunchApplication(viewer, IDS_ERR_TEXTVIEWSTART, false))\r
 533         {\r
 534                 return FALSE;\r
 535         }\r
 536         return TRUE;\r
 537 }\r
 538 \r
 539 BOOL CAppUtils::CheckForEmptyDiff(const CTGitPath& sDiffPath)\r
 540 {\r
 541         DWORD length = 0;\r
 542         HANDLE hFile = ::CreateFile(sDiffPath.GetWinPath(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);\r
 543         if (hFile == INVALID_HANDLE_VALUE)\r
 544                 return TRUE;\r
 545         length = ::GetFileSize(hFile, NULL);\r
 546         ::CloseHandle(hFile);\r
 547         if (length < 4)\r
 548                 return TRUE;\r
 549         return FALSE;\r
 550 \r
 551 }\r
 552 \r
 553 void CAppUtils::CreateFontForLogs(CFont& fontToCreate)\r
 554 {\r
 555         LOGFONT logFont;\r
 556         HDC hScreenDC = ::GetDC(NULL);\r
 557         logFont.lfHeight         = -MulDiv((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8), GetDeviceCaps(hScreenDC, LOGPIXELSY), 72);\r
 558         ::ReleaseDC(NULL, hScreenDC);\r
 559         logFont.lfWidth          = 0;\r
 560         logFont.lfEscapement     = 0;\r
 561         logFont.lfOrientation    = 0;\r
 562         logFont.lfWeight         = FW_NORMAL;\r
 563         logFont.lfItalic         = 0;\r
 564         logFont.lfUnderline      = 0;\r
 565         logFont.lfStrikeOut      = 0;\r
 566         logFont.lfCharSet        = DEFAULT_CHARSET;\r
 567         logFont.lfOutPrecision   = OUT_DEFAULT_PRECIS;\r
 568         logFont.lfClipPrecision  = CLIP_DEFAULT_PRECIS;\r
 569         logFont.lfQuality        = DRAFT_QUALITY;\r
 570         logFont.lfPitchAndFamily = FF_DONTCARE | FIXED_PITCH;\r
 571         _tcscpy_s(logFont.lfFaceName, 32, (LPCTSTR)(CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")));\r
 572         VERIFY(fontToCreate.CreateFontIndirect(&logFont));\r
 573 }\r
 574 \r
 575 bool CAppUtils::LaunchApplication(const CString& sCommandLine, UINT idErrMessageFormat, bool bWaitForStartup)\r
 576 {\r
 577         STARTUPINFO startup;\r
 578         PROCESS_INFORMATION process;\r
 579         memset(&startup, 0, sizeof(startup));\r
 580         startup.cb = sizeof(startup);\r
 581         memset(&process, 0, sizeof(process));\r
 582 \r
 583         CString cleanCommandLine(sCommandLine);\r
 584 \r
 585         if (CreateProcess(NULL, const_cast<TCHAR*>((LPCTSTR)cleanCommandLine), NULL, NULL, FALSE, 0, 0, sOrigCWD, &startup, &process)==0)\r
 586         {\r
 587                 if(idErrMessageFormat != 0)\r
 588                 {\r
 589                         LPVOID lpMsgBuf;\r
 590                         FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | \r
 591                                 FORMAT_MESSAGE_FROM_SYSTEM | \r
 592                                 FORMAT_MESSAGE_IGNORE_INSERTS,\r
 593                                 NULL,\r
 594                                 GetLastError(),\r
 595                                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language\r
 596                                 (LPTSTR) &lpMsgBuf,\r
 597                                 0,\r
 598                                 NULL \r
 599                                 );\r
 600                         CString temp;\r
 601                         temp.Format(idErrMessageFormat, lpMsgBuf);\r
 602                         CMessageBox::Show(NULL, temp, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);\r
 603                         LocalFree( lpMsgBuf );\r
 604                 }\r
 605                 return false;\r
 606         }\r
 607 \r
 608         if (bWaitForStartup)\r
 609         {\r
 610                 WaitForInputIdle(process.hProcess, 10000);\r
 611         }\r
 612 \r
 613         CloseHandle(process.hThread);\r
 614         CloseHandle(process.hProcess);\r
 615         return true;\r
 616 }\r
 617 \r
 618 /**\r
 619 * Launch the external blame viewer\r
 620 */\r
 621 bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile,CString Rev,const CString& sParams)\r
 622 {\r
 623         CString viewer = CPathUtils::GetAppDirectory();\r
 624         viewer += _T("TortoiseGitBlame.exe");\r
 625         viewer += _T(" \"") + sBlameFile + _T("\"");\r
 626         //viewer += _T(" \"") + sLogFile + _T("\"");\r
 627         //viewer += _T(" \"") + sOriginalFile + _T("\"");\r
 628         if(!Rev.IsEmpty())\r
 629                 viewer += CString(_T(" /rev:"))+Rev;\r
 630         viewer += _T(" ")+sParams;\r
 631         \r
 632         return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, false);\r
 633 }\r
 634 \r
 635 bool CAppUtils::FormatTextInRichEditControl(CWnd * pWnd)\r
 636 {\r
 637         CString sText;\r
 638         if (pWnd == NULL)\r
 639                 return false;\r
 640         bool bStyled = false;\r
 641         pWnd->GetWindowText(sText);\r
 642         // the rich edit control doesn't count the CR char!\r
 643         // to be exact: CRLF is treated as one char.\r
 644         sText.Replace(_T("\r"), _T(""));\r
 645 \r
 646         // style each line separately\r
 647         int offset = 0;\r
 648         int nNewlinePos;\r
 649         do \r
 650         {\r
 651                 nNewlinePos = sText.Find('\n', offset);\r
 652                 CString sLine = sText.Mid(offset);\r
 653                 if (nNewlinePos>=0)\r
 654                         sLine = sLine.Left(nNewlinePos-offset);\r
 655                 int start = 0;\r
 656                 int end = 0;\r
 657                 while (FindStyleChars(sLine, '*', start, end))\r
 658                 {\r
 659                         CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};\r
 660                         pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);\r
 661                         CHARFORMAT2 format;\r
 662                         SecureZeroMemory(&format, sizeof(CHARFORMAT2));\r
 663                         format.cbSize = sizeof(CHARFORMAT2);\r
 664                         format.dwMask = CFM_BOLD;\r
 665                         format.dwEffects = CFE_BOLD;\r
 666                         pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);\r
 667                         bStyled = true;\r
 668                         start = end;\r
 669                 }\r
 670                 start = 0;\r
 671                 end = 0;\r
 672                 while (FindStyleChars(sLine, '^', start, end))\r
 673                 {\r
 674                         CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};\r
 675                         pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);\r
 676                         CHARFORMAT2 format;\r
 677                         SecureZeroMemory(&format, sizeof(CHARFORMAT2));\r
 678                         format.cbSize = sizeof(CHARFORMAT2);\r
 679                         format.dwMask = CFM_ITALIC;\r
 680                         format.dwEffects = CFE_ITALIC;\r
 681                         pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);\r
 682                         bStyled = true;\r
 683                         start = end;\r
 684                 }\r
 685                 start = 0;\r
 686                 end = 0;\r
 687                 while (FindStyleChars(sLine, '_', start, end))\r
 688                 {\r
 689                         CHARRANGE range = {(LONG)start+offset, (LONG)end+offset};\r
 690                         pWnd->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);\r
 691                         CHARFORMAT2 format;\r
 692                         SecureZeroMemory(&format, sizeof(CHARFORMAT2));\r
 693                         format.cbSize = sizeof(CHARFORMAT2);\r
 694                         format.dwMask = CFM_UNDERLINE;\r
 695                         format.dwEffects = CFE_UNDERLINE;\r
 696                         pWnd->SendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);\r
 697                         bStyled = true;\r
 698                         start = end;\r
 699                 }\r
 700                 offset = nNewlinePos+1;\r
 701         } while(nNewlinePos>=0);\r
 702         return bStyled; \r
 703 }\r
 704 \r
 705 bool CAppUtils::FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end)\r
 706 {\r
 707         int i=start;\r
 708         bool bFoundMarker = false;\r
 709         // find a starting marker\r
 710         while (sText[i] != 0)\r
 711         {\r
 712                 if (sText[i] == stylechar)\r
 713                 {\r
 714                         if (((i+1)<sText.GetLength())&&(IsCharAlphaNumeric(sText[i+1])) &&\r
 715                                 (((i>0)&&(!IsCharAlphaNumeric(sText[i-1])))||(i==0)))\r
 716                         {\r
 717                                 start = i+1;\r
 718                                 i++;\r
 719                                 bFoundMarker = true;\r
 720                                 break;\r
 721                         }\r
 722                 }\r
 723                 i++;\r
 724         }\r
 725         if (!bFoundMarker)\r
 726                 return false;\r
 727         // find ending marker\r
 728         bFoundMarker = false;\r
 729         while (sText[i] != 0)\r
 730         {\r
 731                 if (sText[i] == stylechar)\r
 732                 {\r
 733                         if ((IsCharAlphaNumeric(sText[i-1])) &&\r
 734                                 ((((i+1)<sText.GetLength())&&(!IsCharAlphaNumeric(sText[i+1])))||(i+1)==sText.GetLength()))\r
 735                         {\r
 736                                 end = i;\r
 737                                 i++;\r
 738                                 bFoundMarker = true;\r
 739                                 break;\r
 740                         }\r
 741                 }\r
 742                 i++;\r
 743         }\r
 744         return bFoundMarker;\r
 745 }\r
 746 \r
 747 bool CAppUtils::BrowseRepository(CHistoryCombo& combo, CWnd * pParent, GitRev& rev)\r
 748 {\r
 749 #if 0\r
 750         CString strUrl;\r
 751         combo.GetWindowText(strUrl);\r
 752         strUrl.Replace('\\', '/');\r
 753         strUrl.Replace(_T("%"), _T("%25"));\r
 754         strUrl = CUnicodeUtils::GetUnicode(CPathUtils::PathEscape(CUnicodeUtils::GetUTF8(strUrl)));\r
 755         if (strUrl.Left(7) == _T("file://"))\r
 756         {\r
 757                 CString strFile(strUrl);\r
 758                 Git::UrlToPath(strFile);\r
 759 \r
 760                 Git svn;\r
 761                 if (svn.IsRepository(CTGitPath(strFile)))\r
 762                 {\r
 763                         // browse repository - show repository browser\r
 764                         Git::preparePath(strUrl);\r
 765                         CRepositoryBrowser browser(strUrl, rev, pParent);\r
 766                         if (browser.DoModal() == IDOK)\r
 767                         {\r
 768                                 combo.SetCurSel(-1);\r
 769                                 combo.SetWindowText(browser.GetPath());\r
 770                                 rev = browser.GetRevision();\r
 771                                 return true;\r
 772                         }\r
 773                 }\r
 774                 else\r
 775                 {\r
 776                         // browse local directories\r
 777                         CBrowseFolder folderBrowser;\r
 778                         folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
 779                         // remove the 'file:///' so the shell can recognize the local path\r
 780                         Git::UrlToPath(strUrl);\r
 781                         if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)\r
 782                         {\r
 783                                 Git::PathToUrl(strUrl);\r
 784 \r
 785                                 combo.SetCurSel(-1);\r
 786                                 combo.SetWindowText(strUrl);\r
 787                                 return true;\r
 788                         }\r
 789                 }\r
 790         }\r
 791         else if ((strUrl.Left(7) == _T("http://")\r
 792                 ||(strUrl.Left(8) == _T("https://"))\r
 793                 ||(strUrl.Left(6) == _T("svn://"))\r
 794                 ||(strUrl.Left(4) == _T("svn+"))) && strUrl.GetLength() > 6)\r
 795         {\r
 796                 // browse repository - show repository browser\r
 797                 CRepositoryBrowser browser(strUrl, rev, pParent);\r
 798                 if (browser.DoModal() == IDOK)\r
 799                 {\r
 800                         combo.SetCurSel(-1);\r
 801                         combo.SetWindowText(browser.GetPath());\r
 802                         rev = browser.GetRevision();\r
 803                         return true;\r
 804                 }\r
 805         }\r
 806         else\r
 807         {\r
 808                 // browse local directories\r
 809                 CBrowseFolder folderBrowser;\r
 810                 folderBrowser.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
 811                 if (folderBrowser.Show(pParent->GetSafeHwnd(), strUrl) == CBrowseFolder::OK)\r
 812                 {\r
 813                         Git::PathToUrl(strUrl);\r
 814 \r
 815                         combo.SetCurSel(-1);\r
 816                         combo.SetWindowText(strUrl);\r
 817                         return true;\r
 818                 }\r
 819         }\r
 820 #endif\r
 821         return false;\r
 822 }\r
 823 \r
 824 bool CAppUtils::FileOpenSave(CString& path, int * filterindex, UINT title, UINT filter, bool bOpen, HWND hwndOwner)\r
 825 {\r
 826         OPENFILENAME ofn = {0};                         // common dialog box structure\r
 827         TCHAR szFile[MAX_PATH] = {0};           // buffer for file name. Explorer can't handle paths longer than MAX_PATH.\r
 828         ofn.lStructSize = sizeof(OPENFILENAME);\r
 829         ofn.hwndOwner = hwndOwner;\r
 830         _tcscpy_s(szFile, MAX_PATH, (LPCTSTR)path);\r
 831         ofn.lpstrFile = szFile;\r
 832         ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);\r
 833         CString sFilter;\r
 834         TCHAR * pszFilters = NULL;\r
 835         if (filter)\r
 836         {\r
 837                 sFilter.LoadString(filter);\r
 838                 pszFilters = new TCHAR[sFilter.GetLength()+4];\r
 839                 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);\r
 840                 // Replace '|' delimiters with '\0's\r
 841                 TCHAR *ptr = pszFilters + _tcslen(pszFilters);  //set ptr at the NULL\r
 842                 while (ptr != pszFilters)\r
 843                 {\r
 844                         if (*ptr == '|')\r
 845                                 *ptr = '\0';\r
 846                         ptr--;\r
 847                 }\r
 848                 ofn.lpstrFilter = pszFilters;\r
 849         }\r
 850         ofn.nFilterIndex = 1;\r
 851         ofn.lpstrFileTitle = NULL;\r
 852         ofn.nMaxFileTitle = 0;\r
 853         ofn.lpstrInitialDir = NULL;\r
 854         CString temp;\r
 855         if (title)\r
 856         {\r
 857                 temp.LoadString(title);\r
 858                 CStringUtils::RemoveAccelerators(temp);\r
 859         }\r
 860         ofn.lpstrTitle = temp;\r
 861         if (bOpen)\r
 862                 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_EXPLORER;\r
 863         else\r
 864                 ofn.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER;\r
 865 \r
 866 \r
 867         // Display the Open dialog box. \r
 868         bool bRet = false;\r
 869         if (bOpen)\r
 870         {\r
 871                 bRet = !!GetOpenFileName(&ofn);\r
 872         }\r
 873         else\r
 874         {\r
 875                 bRet = !!GetSaveFileName(&ofn);\r
 876         }\r
 877         if (bRet)\r
 878         {\r
 879                 if (pszFilters)\r
 880                         delete [] pszFilters;\r
 881                 path = CString(ofn.lpstrFile);\r
 882                 if (filterindex)\r
 883                         *filterindex = ofn.nFilterIndex;\r
 884                 return true;\r
 885         }\r
 886         if (pszFilters)\r
 887                 delete [] pszFilters;\r
 888         return false;\r
 889 }\r
 890 \r
 891 bool CAppUtils::SetListCtrlBackgroundImage(HWND hListCtrl, UINT nID, int width /* = 128 */, int height /* = 128 */)\r
 892 {\r
 893         ListView_SetTextBkColor(hListCtrl, CLR_NONE);\r
 894         COLORREF bkColor = ListView_GetBkColor(hListCtrl);\r
 895         // create a bitmap from the icon\r
 896         HICON hIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(nID), IMAGE_ICON, width, height, LR_DEFAULTCOLOR);\r
 897         if (!hIcon)\r
 898                 return false;\r
 899 \r
 900         RECT rect = {0};\r
 901         rect.right = width;\r
 902         rect.bottom = height;\r
 903         HBITMAP bmp = NULL;\r
 904 \r
 905         HWND desktop = ::GetDesktopWindow();\r
 906         if (desktop)\r
 907         {\r
 908                 HDC screen_dev = ::GetDC(desktop);\r
 909                 if (screen_dev)\r
 910                 {\r
 911                         // Create a compatible DC\r
 912                         HDC dst_hdc = ::CreateCompatibleDC(screen_dev);\r
 913                         if (dst_hdc)\r
 914                         {\r
 915                                 // Create a new bitmap of icon size\r
 916                                 bmp = ::CreateCompatibleBitmap(screen_dev, rect.right, rect.bottom);\r
 917                                 if (bmp)\r
 918                                 {\r
 919                                         // Select it into the compatible DC\r
 920                                         HBITMAP old_dst_bmp = (HBITMAP)::SelectObject(dst_hdc, bmp);\r
 921                                         // Fill the background of the compatible DC with the given color\r
 922                                         ::SetBkColor(dst_hdc, bkColor);\r
 923                                         ::ExtTextOut(dst_hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL);\r
 924 \r
 925                                         // Draw the icon into the compatible DC\r
 926                                         ::DrawIconEx(dst_hdc, 0, 0, hIcon, rect.right, rect.bottom, 0, NULL, DI_NORMAL);\r
 927                                         ::SelectObject(dst_hdc, old_dst_bmp);\r
 928                                 }\r
 929                                 ::DeleteDC(dst_hdc);\r
 930                         }\r
 931                 }\r
 932                 ::ReleaseDC(desktop, screen_dev); \r
 933         }\r
 934 \r
 935         // Restore settings\r
 936         DestroyIcon(hIcon);\r
 937 \r
 938         if (bmp == NULL)\r
 939                 return false;\r
 940 \r
 941         LVBKIMAGE lv;\r
 942         lv.ulFlags = LVBKIF_TYPE_WATERMARK;\r
 943         lv.hbm = bmp;\r
 944         lv.xOffsetPercent = 100;\r
 945         lv.yOffsetPercent = 100;\r
 946         ListView_SetBkImage(hListCtrl, &lv);\r
 947         return true;\r
 948 }\r
 949 \r
 950 CString CAppUtils::GetProjectNameFromURL(CString url)\r
 951 {\r
 952         CString name;\r
 953         while (name.IsEmpty() || (name.CompareNoCase(_T("branches"))==0) ||\r
 954                 (name.CompareNoCase(_T("tags"))==0) ||\r
 955                 (name.CompareNoCase(_T("trunk"))==0))\r
 956         {\r
 957                 name = url.Mid(url.ReverseFind('/')+1);\r
 958                 url = url.Left(url.ReverseFind('/'));\r
 959         }\r
 960         if ((name.Compare(_T("svn")) == 0)||(name.Compare(_T("svnroot")) == 0))\r
 961         {\r
 962                 // a name of svn or svnroot indicates that it's not really the project name. In that\r
 963                 // case, we try the first part of the URL\r
 964                 // of course, this won't work in all cases (but it works for Google project hosting)\r
 965                 url.Replace(_T("http://"), _T(""));\r
 966                 url.Replace(_T("https://"), _T(""));\r
 967                 url.Replace(_T("svn://"), _T(""));\r
 968                 url.Replace(_T("svn+ssh://"), _T(""));\r
 969                 url.TrimLeft(_T("/"));\r
 970                 name = url.Left(url.Find('.'));\r
 971         }\r
 972         return name;\r
 973 }\r
 974 \r
 975 bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const git_revnum_t& rev1, \r
 976                                                                                                 const CTGitPath& url2, const git_revnum_t& rev2, \r
 977                                                                          //const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */,  \r
 978                                                                                                 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool /* blame = false */)\r
 979 {\r
 980 \r
 981         CString tempfile=GetTempFile();\r
 982         CString cmd;\r
 983         if(rev1 == GitRev::GetWorkingCopy())\r
 984         {\r
 985                 cmd.Format(_T("git.exe diff --stat -p %s"),rev2);\r
 986         }else\r
 987         {       \r
 988                 cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),rev1,rev2);\r
 989         }\r
 990         g_Git.RunLogFile(cmd,tempfile);\r
 991         CAppUtils::StartUnifiedDiffViewer(tempfile,rev1.Left(6)+_T(":")+rev2.Left(6));\r
 992 \r
 993 \r
 994 #if 0\r
 995         CString sCmd;\r
 996         sCmd.Format(_T("%s /command:showcompare /unified"),\r
 997                 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));\r
 998         sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");\r
 999         if (rev1.IsValid())\r
1000                 sCmd += _T(" /revision1:") + rev1.ToString();\r
1001         sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");\r
1002         if (rev2.IsValid())\r
1003                 sCmd += _T(" /revision2:") + rev2.ToString();\r
1004         if (peg.IsValid())\r
1005                 sCmd += _T(" /pegrevision:") + peg.ToString();\r
1006         if (headpeg.IsValid())\r
1007                 sCmd += _T(" /headpegrevision:") + headpeg.ToString();\r
1008 \r
1009         if (bAlternateDiff)\r
1010                 sCmd += _T(" /alternatediff");\r
1011 \r
1012         if (bIgnoreAncestry)\r
1013                 sCmd += _T(" /ignoreancestry");\r
1014 \r
1015         if (hWnd)\r
1016         {\r
1017                 sCmd += _T(" /hwnd:");\r
1018                 TCHAR buf[30];\r
1019                 _stprintf_s(buf, 30, _T("%d"), hWnd);\r
1020                 sCmd += buf;\r
1021         }\r
1022 \r
1023         return CAppUtils::LaunchApplication(sCmd, NULL, false);\r
1024 #endif\r
1025         return TRUE;\r
1026 }\r
1027 \r
1028 bool CAppUtils::StartShowCompare(HWND hWnd, const CTGitPath& url1, const GitRev& rev1, \r
1029                                                                  const CTGitPath& url2, const GitRev& rev2, \r
1030                                                                  const GitRev& peg /* = GitRev */, const GitRev& headpeg /* = GitRev */, \r
1031                                                                  bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool blame /* = false */)\r
1032 {\r
1033 #if 0\r
1034         CString sCmd;\r
1035         sCmd.Format(_T("%s /command:showcompare"),\r
1036                 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")));\r
1037         sCmd += _T(" /url1:\"") + url1.GetGitPathString() + _T("\"");\r
1038         if (rev1.IsValid())\r
1039                 sCmd += _T(" /revision1:") + rev1.ToString();\r
1040         sCmd += _T(" /url2:\"") + url2.GetGitPathString() + _T("\"");\r
1041         if (rev2.IsValid())\r
1042                 sCmd += _T(" /revision2:") + rev2.ToString();\r
1043         if (peg.IsValid())\r
1044                 sCmd += _T(" /pegrevision:") + peg.ToString();\r
1045         if (headpeg.IsValid())\r
1046                 sCmd += _T(" /headpegrevision:") + headpeg.ToString();\r
1047         if (bAlternateDiff)\r
1048                 sCmd += _T(" /alternatediff");\r
1049         if (bIgnoreAncestry)\r
1050                 sCmd += _T(" /ignoreancestry");\r
1051         if (blame)\r
1052                 sCmd += _T(" /blame");\r
1053 \r
1054         if (hWnd)\r
1055         {\r
1056                 sCmd += _T(" /hwnd:");\r
1057                 TCHAR buf[30];\r
1058                 _stprintf_s(buf, 30, _T("%d"), hWnd);\r
1059                 sCmd += buf;\r
1060         }\r
1061 \r
1062         return CAppUtils::LaunchApplication(sCmd, NULL, false);\r
1063 #endif\r
1064         return true;\r
1065 }\r
1066 \r
1067 bool CAppUtils::Export(CString *BashHash)\r
1068 {\r
1069         bool bRet = false;\r
1070 \r
1071                 // ask from where the export has to be done\r
1072         CExportDlg dlg;\r
1073         if(BashHash)\r
1074                 dlg.m_Revision=*BashHash;\r
1075 \r
1076         if (dlg.DoModal() == IDOK)\r
1077         {\r
1078                 CString cmd;\r
1079                 cmd.Format(_T("git.exe archive --format=zip --verbose %s"),\r
1080                                         dlg.m_VersionName);\r
1081 \r
1082                 //g_Git.RunLogFile(cmd,dlg.m_strExportDirectory);\r
1083                 CProgressDlg pro;\r
1084                 pro.m_GitCmd=cmd;\r
1085                 pro.m_LogFile=dlg.m_strExportDirectory;\r
1086                 pro.DoModal();\r
1087                 return TRUE;\r
1088         }\r
1089         return bRet;\r
1090 }\r
1091 \r
1092 bool CAppUtils::CreateBranchTag(bool IsTag,CString *CommitHash)\r
1093 {\r
1094         CCreateBranchTagDlg dlg;\r
1095         dlg.m_bIsTag=IsTag;\r
1096         if(CommitHash)\r
1097                 dlg.m_Base = *CommitHash;\r
1098 \r
1099         if(dlg.DoModal()==IDOK)\r
1100         {\r
1101                 CString cmd;\r
1102                 CString force;\r
1103                 CString track;\r
1104                 if(dlg.m_bTrack)\r
1105                         track=_T(" --track ");\r
1106 \r
1107                 if(dlg.m_bForce)\r
1108                         force=_T(" -f ");\r
1109 \r
1110                 if(IsTag)\r
1111                 {\r
1112                         cmd.Format(_T("git.exe tag %s %s %s %s"),\r
1113                                 track,\r
1114                                 force,\r
1115                                 dlg.m_BranchTagName,\r
1116                                 dlg.m_VersionName\r
1117                                 );\r
1118 \r
1119         \r
1120                 }else\r
1121                 {\r
1122                         cmd.Format(_T("git.exe branch %s %s %s %s"),\r
1123                                 track,\r
1124                                 force,\r
1125                                 dlg.m_BranchTagName,\r
1126                                 dlg.m_VersionName\r
1127                                 );\r
1128                 }\r
1129                 CString out;\r
1130                 if(g_Git.Run(cmd,&out,CP_UTF8))\r
1131                 {\r
1132                         CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
1133                 }\r
1134                 if( !IsTag  &&  dlg.m_bSwitch )\r
1135                 {\r
1136                         // it is a new branch and the user has requested to switch to it\r
1137                         cmd.Format(_T("git.exe checkout %s"), dlg.m_BranchTagName);\r
1138                         g_Git.Run(cmd,&out,CP_UTF8);\r
1139                         CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
1140                 }\r
1141                 \r
1142                 return TRUE;\r
1143                 \r
1144         }\r
1145         return FALSE;\r
1146 }\r
1147 \r
1148 bool CAppUtils::Switch(CString *CommitHash)\r
1149 {\r
1150         CGitSwitchDlg dlg;\r
1151         if(CommitHash)\r
1152                 dlg.m_Base=*CommitHash;\r
1153         \r
1154         if (dlg.DoModal() == IDOK)\r
1155         {\r
1156                 CString cmd;\r
1157                 CString track;\r
1158                 CString base;\r
1159                 CString force;\r
1160                 CString branch;\r
1161 \r
1162                 if(dlg.m_bBranch)\r
1163                         branch.Format(_T("-b %s"),dlg.m_NewBranch);\r
1164                 if(dlg.m_bForce)\r
1165                         force=_T("-f");\r
1166                 if(dlg.m_bTrack)\r
1167                         track=_T("--track");\r
1168 \r
1169                 cmd.Format(_T("git.exe checkout %s %s %s %s"),\r
1170                          force,\r
1171                          track,\r
1172                          branch,\r
1173                          dlg.m_VersionName);\r
1174 \r
1175                 CProgressDlg progress;\r
1176                 progress.m_GitCmd=cmd;\r
1177                 if(progress.DoModal()==IDOK)\r
1178                         return TRUE;\r
1179 \r
1180         }\r
1181         return FALSE;\r
1182 }\r
1183 \r
1184 bool CAppUtils::IgnoreFile(CTGitPathList &path,bool IsMask)\r
1185 {\r
1186         CString ignorefile;\r
1187         ignorefile=g_Git.m_CurrentDir+_T("\\");\r
1188 \r
1189         if(IsMask)\r
1190         {\r
1191                 ignorefile+=path.GetCommonRoot().GetDirectory().GetWinPathString()+_T("\\.gitignore");\r
1192 \r
1193         }else\r
1194         {\r
1195                 ignorefile+=_T("\\.gitignore");\r
1196         }\r
1197 \r
1198         CStdioFile file;\r
1199         if(!file.Open(ignorefile,CFile::modeCreate|CFile::modeReadWrite|CFile::modeNoTruncate))\r
1200         {\r
1201                 CMessageBox::Show(NULL,ignorefile+_T(" Open Failure"),_T("TortoiseGit"),MB_OK);\r
1202                 return FALSE;\r
1203         }\r
1204 \r
1205         CString ignorelist;\r
1206         CString mask;\r
1207         try\r
1208         {\r
1209                 //file.ReadString(ignorelist);\r
1210                 file.SeekToEnd();\r
1211                 for(int i=0;i<path.GetCount();i++)\r
1212                 {\r
1213                         if(IsMask)\r
1214                         {\r
1215                                 mask=_T("*")+path[i].GetFileExtension();\r
1216                                 if(ignorelist.Find(mask)<0)\r
1217                                         ignorelist+=_T("\n")+mask;\r
1218                                 \r
1219                         }else\r
1220                         {\r
1221                                 ignorelist+=_T("\n/")+path[i].GetGitPathString();\r
1222                         }\r
1223                 }\r
1224                 file.WriteString(ignorelist);\r
1225 \r
1226                 file.Close();\r
1227 \r
1228         }catch(...)\r
1229         {\r
1230                 file.Close();\r
1231                 return FALSE;\r
1232         }\r
1233         \r
1234         return TRUE;\r
1235 }\r
1236 \r
1237 \r
1238 bool CAppUtils::GitReset(CString *CommitHash,int type)\r
1239 {\r
1240         CResetDlg dlg;\r
1241         dlg.m_ResetType=type;\r
1242         if (dlg.DoModal() == IDOK)\r
1243         {\r
1244                 CString cmd;\r
1245                 CString type;\r
1246                 switch(dlg.m_ResetType)\r
1247                 {\r
1248                 case 0:\r
1249                         type=_T("--soft");\r
1250                         break;\r
1251                 case 1:\r
1252                         type=_T("--mixed");\r
1253                         break;\r
1254                 case 2:\r
1255                         type=_T("--hard");\r
1256                         break;\r
1257                 default:\r
1258                         type=_T("--mixed");\r
1259                         break;\r
1260                 }\r
1261                 cmd.Format(_T("git.exe reset %s %s"),type, *CommitHash);\r
1262 \r
1263                 CProgressDlg progress;\r
1264                 progress.m_GitCmd=cmd;\r
1265                 if(progress.DoModal()==IDOK)\r
1266                         return TRUE;\r
1267 \r
1268         }\r
1269         return FALSE;\r
1270 }\r
1271 \r
1272 void CAppUtils::DescribeFile(bool mode, bool base,CString &descript)\r
1273 {\r
1274         if(mode == FALSE)\r
1275         {\r
1276                 descript=_T("Deleted");\r
1277                 return;\r
1278         }\r
1279         if(base)\r
1280         {\r
1281                 descript=_T("Modified");\r
1282                 return;\r
1283         }\r
1284         descript=_T("Created");\r
1285         return;\r
1286 }\r
1287 \r
1288 CString CAppUtils::GetMergeTempFile(CString type,CTGitPath &merge)\r
1289 {\r
1290         CString file;\r
1291         file=g_Git.m_CurrentDir+_T("\\")+merge.GetDirectory().GetWinPathString()+_T("\\")+merge.GetFilename()+_T(".")+type+merge.GetFileExtension();\r
1292 \r
1293         return file;\r
1294 }\r
1295 \r
1296 bool CAppUtils::ConflictEdit(CTGitPath &path,bool bAlternativeTool)\r
1297 {\r
1298         bool bRet = false;\r
1299 \r
1300         CTGitPath merge=path;\r
1301         CTGitPath directory = merge.GetDirectory();\r
1302         \r
1303         \r
1304 \r
1305         // we have the conflicted file (%merged)\r
1306         // now look for the other required files\r
1307         //GitStatus stat;\r
1308         //stat.GetStatus(merge);\r
1309         //if (stat.status == NULL)\r
1310         //      return false;\r
1311 \r
1312         BYTE_VECTOR vector;\r
1313 \r
1314         CString cmd;\r
1315         cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),merge.GetGitPathString());\r
1316 \r
1317         if(g_Git.Run(cmd,&vector))\r
1318         {\r
1319                 return FALSE;\r
1320         }\r
1321 \r
1322         CTGitPathList list;\r
1323         list.ParserFromLsFile(vector);\r
1324 \r
1325         if(list.GetCount() == 0)\r
1326                 return FALSE;\r
1327 \r
1328         TCHAR szTempName[512];  \r
1329         GetTempFileName(_T(""),_T(""),0,szTempName);\r
1330         CString temp(szTempName);\r
1331         temp=temp.Mid(1,temp.GetLength()-5);\r
1332 \r
1333         CTGitPath theirs;\r
1334         CTGitPath mine;\r
1335         CTGitPath base;\r
1336 \r
1337         \r
1338         mine.SetFromGit(GetMergeTempFile(_T("LOCAL"),merge));\r
1339         theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"),merge));\r
1340         base.SetFromGit(GetMergeTempFile(_T("BASE"),merge));\r
1341 \r
1342         CString format;\r
1343 \r
1344         format=_T("git.exe cat-file blob \":%d:%s\"");\r
1345         CFile tempfile;\r
1346         //create a empty file, incase stage is not three\r
1347         tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);\r
1348         tempfile.Close();\r
1349         tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);\r
1350         tempfile.Close();\r
1351         tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);\r
1352         tempfile.Close();\r
1353 \r
1354         bool b_base=false, b_local=false, b_remote=false;\r
1355 \r
1356         for(int i=0;i<list.GetCount();i++)\r
1357         {\r
1358                 CString cmd;\r
1359                 CString outfile;\r
1360                 cmd.Format(format,list[i].m_Stage,list[i].GetGitPathString());\r
1361                 \r
1362                 if( list[i].m_Stage == 1)\r
1363                 {\r
1364                         b_base = true;\r
1365                         outfile=base.GetWinPathString();\r
1366                 }\r
1367                 if( list[i].m_Stage == 2 )\r
1368                 {\r
1369                         b_local = true;\r
1370                         outfile=mine.GetWinPathString();\r
1371                 }\r
1372                 if( list[i].m_Stage == 3 )\r
1373                 {\r
1374                         b_remote = true;\r
1375                         outfile=theirs.GetWinPathString();\r
1376                 }       \r
1377                 g_Git.RunLogFile(cmd,outfile);\r
1378         }\r
1379 \r
1380         if(b_local && b_remote )\r
1381         {\r
1382                 merge.SetFromWin(g_Git.m_CurrentDir+_T("\\")+merge.GetWinPathString());\r
1383                 bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));\r
1384         \r
1385         }else\r
1386         {\r
1387                 CFile::Remove(mine.GetWinPathString());\r
1388                 CFile::Remove(theirs.GetWinPathString());\r
1389                 CFile::Remove(base.GetWinPathString());\r
1390 \r
1391                 CDeleteConflictDlg dlg;\r
1392                 DescribeFile(b_local, b_base,dlg.m_LocalStatus);\r
1393                 DescribeFile(b_remote,b_base,dlg.m_RemoteStatus);\r
1394                 dlg.m_bShowModifiedButton=b_base;\r
1395                 dlg.m_File=merge.GetGitPathString();\r
1396                 if(dlg.DoModal() == IDOK)\r
1397                 {\r
1398                         CString cmd,out;\r
1399                         if(dlg.m_bIsDelete)\r
1400                         {\r
1401                                 cmd.Format(_T("git.exe rm \"%s\""),merge.GetGitPathString());\r
1402                         }else\r
1403                                 cmd.Format(_T("git.exe add \"%s\""),merge.GetGitPathString());\r
1404 \r
1405                         if(g_Git.Run(cmd,&out,CP_ACP))\r
1406                         {\r
1407                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
1408                                 return FALSE;\r
1409                         }\r
1410                         return TRUE;\r
1411                 }\r
1412                 else \r
1413                         return FALSE;\r
1414 \r
1415                 \r
1416 \r
1417         }\r
1418 \r
1419 #if 0\r
1420 \r
1421         CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool), \r
1422                         base, theirs, mine, merge);\r
1423 #endif\r
1424 #if 0\r
1425         if (stat.status->text_status == svn_wc_status_conflicted)\r
1426         {\r
1427                 // we have a text conflict, use our merge tool to resolve the conflict\r
1428 \r
1429                 CTSVNPath theirs(directory);\r
1430                 CTSVNPath mine(directory);\r
1431                 CTSVNPath base(directory);\r
1432                 bool bConflictData = false;\r
1433 \r
1434                 if ((stat.status->entry)&&(stat.status->entry->conflict_new))\r
1435                 {\r
1436                         theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));\r
1437                         bConflictData = true;\r
1438                 }\r
1439                 if ((stat.status->entry)&&(stat.status->entry->conflict_old))\r
1440                 {\r
1441                         base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));\r
1442                         bConflictData = true;\r
1443                 }\r
1444                 if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))\r
1445                 {\r
1446                         mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));\r
1447                         bConflictData = true;\r
1448                 }\r
1449                 else\r
1450                 {\r
1451                         mine = merge;\r
1452                 }\r
1453                 if (bConflictData)\r
1454                         bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool), \r
1455                                                                                                 base, theirs, mine, merge);\r
1456         }\r
1457 \r
1458         if (stat.status->prop_status == svn_wc_status_conflicted)\r
1459         {\r
1460                 // we have a property conflict\r
1461                 CTSVNPath prej(directory);\r
1462                 if ((stat.status->entry)&&(stat.status->entry->prejfile))\r
1463                 {\r
1464                         prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));\r
1465                         // there's a problem: the prej file contains a _description_ of the conflict, and\r
1466                         // that description string might be translated. That means we have no way of parsing\r
1467                         // the file to find out the conflicting values.\r
1468                         // The only thing we can do: show a dialog with the conflict description, then\r
1469                         // let the user either accept the existing property or open the property edit dialog\r
1470                         // to manually change the properties and values. And a button to mark the conflict as\r
1471                         // resolved.\r
1472                         CEditPropConflictDlg dlg;\r
1473                         dlg.SetPrejFile(prej);\r
1474                         dlg.SetConflictedItem(merge);\r
1475                         bRet = (dlg.DoModal() != IDCANCEL);\r
1476                 }\r
1477         }\r
1478 \r
1479         if (stat.status->tree_conflict)\r
1480         {\r
1481                 // we have a tree conflict\r
1482                 SVNInfo info;\r
1483                 const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());\r
1484                 if (pInfoData)\r
1485                 {\r
1486                         if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)\r
1487                         {\r
1488                                 CTSVNPath theirs(directory);\r
1489                                 CTSVNPath mine(directory);\r
1490                                 CTSVNPath base(directory);\r
1491                                 bool bConflictData = false;\r
1492 \r
1493                                 if (pInfoData->treeconflict_theirfile)\r
1494                                 {\r
1495                                         theirs.AppendPathString(pInfoData->treeconflict_theirfile);\r
1496                                         bConflictData = true;\r
1497                                 }\r
1498                                 if (pInfoData->treeconflict_basefile)\r
1499                                 {\r
1500                                         base.AppendPathString(pInfoData->treeconflict_basefile);\r
1501                                         bConflictData = true;\r
1502                                 }\r
1503                                 if (pInfoData->treeconflict_myfile)\r
1504                                 {\r
1505                                         mine.AppendPathString(pInfoData->treeconflict_myfile);\r
1506                                         bConflictData = true;\r
1507                                 }\r
1508                                 else\r
1509                                 {\r
1510                                         mine = merge;\r
1511                                 }\r
1512                                 if (bConflictData)\r
1513                                         bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),\r
1514                                                                                                                 base, theirs, mine, merge);\r
1515                         }\r
1516                         else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)\r
1517                         {\r
1518                                 CString sConflictAction;\r
1519                                 CString sConflictReason;\r
1520                                 CString sResolveTheirs;\r
1521                                 CString sResolveMine;\r
1522                                 CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);\r
1523                                 CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();\r
1524                                 \r
1525                                 if (pInfoData->treeconflict_nodekind == svn_node_file)\r
1526                                 {\r
1527                                         switch (pInfoData->treeconflict_operation)\r
1528                                         {\r
1529                                         case svn_wc_operation_update:\r
1530                                                 switch (pInfoData->treeconflict_action)\r
1531                                                 {\r
1532                                                 case svn_wc_conflict_action_edit:\r
1533                                                         sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);\r
1534                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1535                                                         break;\r
1536                                                 case svn_wc_conflict_action_add:\r
1537                                                         sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);\r
1538                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1539                                                         break;\r
1540                                                 case svn_wc_conflict_action_delete:\r
1541                                                         sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);\r
1542                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);\r
1543                                                         break;\r
1544                                                 }\r
1545                                                 break;\r
1546                                         case svn_wc_operation_switch:\r
1547                                                 switch (pInfoData->treeconflict_action)\r
1548                                                 {\r
1549                                                 case svn_wc_conflict_action_edit:\r
1550                                                         sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);\r
1551                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1552                                                         break;\r
1553                                                 case svn_wc_conflict_action_add:\r
1554                                                         sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);\r
1555                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1556                                                         break;\r
1557                                                 case svn_wc_conflict_action_delete:\r
1558                                                         sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);\r
1559                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);\r
1560                                                         break;\r
1561                                                 }\r
1562                                                 break;\r
1563                                         case svn_wc_operation_merge:\r
1564                                                 switch (pInfoData->treeconflict_action)\r
1565                                                 {\r
1566                                                 case svn_wc_conflict_action_edit:\r
1567                                                         sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);\r
1568                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1569                                                         break;\r
1570                                                 case svn_wc_conflict_action_add:\r
1571                                                         sResolveTheirs.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);\r
1572                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);\r
1573                                                         break;\r
1574                                                 case svn_wc_conflict_action_delete:\r
1575                                                         sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);\r
1576                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);\r
1577                                                         break;\r
1578                                                 }\r
1579                                                 break;\r
1580                                         }\r
1581                                 }\r
1582                                 else if (pInfoData->treeconflict_nodekind == svn_node_dir)\r
1583                                 {\r
1584                                         switch (pInfoData->treeconflict_operation)\r
1585                                         {\r
1586                                         case svn_wc_operation_update:\r
1587                                                 switch (pInfoData->treeconflict_action)\r
1588                                                 {\r
1589                                                 case svn_wc_conflict_action_edit:\r
1590                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);\r
1591                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1592                                                         break;\r
1593                                                 case svn_wc_conflict_action_add:\r
1594                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);\r
1595                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1596                                                         break;\r
1597                                                 case svn_wc_conflict_action_delete:\r
1598                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);\r
1599                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);\r
1600                                                         break;\r
1601                                                 }\r
1602                                                 break;\r
1603                                         case svn_wc_operation_switch:\r
1604                                                 switch (pInfoData->treeconflict_action)\r
1605                                                 {\r
1606                                                 case svn_wc_conflict_action_edit:\r
1607                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);\r
1608                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1609                                                         break;\r
1610                                                 case svn_wc_conflict_action_add:\r
1611                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);\r
1612                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1613                                                         break;\r
1614                                                 case svn_wc_conflict_action_delete:\r
1615                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);\r
1616                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);\r
1617                                                         break;\r
1618                                                 }\r
1619                                                 break;\r
1620                                         case svn_wc_operation_merge:\r
1621                                                 switch (pInfoData->treeconflict_action)\r
1622                                                 {\r
1623                                                 case svn_wc_conflict_action_edit:\r
1624                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);\r
1625                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1626                                                         break;\r
1627                                                 case svn_wc_conflict_action_add:\r
1628                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);\r
1629                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);\r
1630                                                         break;\r
1631                                                 case svn_wc_conflict_action_delete:\r
1632                                                         sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);\r
1633                                                         sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);\r
1634                                                         break;\r
1635                                                 }\r
1636                                                 break;\r
1637                                         }\r
1638                                 }\r
1639 \r
1640                                 UINT uReasonID = 0;\r
1641                                 switch (pInfoData->treeconflict_reason)\r
1642                                 { \r
1643                                 case svn_wc_conflict_reason_edited:\r
1644                                         uReasonID = IDS_TREECONFLICT_REASON_EDITED;\r
1645                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);\r
1646                                         break;\r
1647                                 case svn_wc_conflict_reason_obstructed:\r
1648                                         uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;\r
1649                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);\r
1650                                         break;\r
1651                                 case svn_wc_conflict_reason_deleted:\r
1652                                         uReasonID = IDS_TREECONFLICT_REASON_DELETED;\r
1653                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);\r
1654                                         break;\r
1655                                 case svn_wc_conflict_reason_added:\r
1656                                         uReasonID = IDS_TREECONFLICT_REASON_ADDED;\r
1657                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);\r
1658                                         break;\r
1659                                 case svn_wc_conflict_reason_missing:\r
1660                                         uReasonID = IDS_TREECONFLICT_REASON_MISSING;\r
1661                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_REMOVEDIR : IDS_TREECONFLICT_RESOLVE_REMOVEFILE);\r
1662                                         break;\r
1663                                 case svn_wc_conflict_reason_unversioned:\r
1664                                         uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;\r
1665                                         sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);\r
1666                                         break;\r
1667                                 }\r
1668                                 sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);\r
1669 \r
1670                                 CTreeConflictEditorDlg dlg;\r
1671                                 dlg.SetConflictInfoText(sConflictReason);\r
1672                                 dlg.SetResolveTexts(sResolveTheirs, sResolveMine);\r
1673                                 dlg.SetPath(treeConflictPath);\r
1674                                 INT_PTR dlgRet = dlg.DoModal();\r
1675                                 bRet = (dlgRet != IDCANCEL);\r
1676                         }\r
1677                 }\r
1678         }\r
1679 #endif\r
1680         return bRet;\r
1681 }\r
1682 \r
1683 /**\r
1684  * FUNCTION    :   FormatDateAndTime\r
1685  * DESCRIPTION :   Generates a displayable string from a CTime object in\r
1686  *                 system short or long format  or as a relative value\r
1687  *                                 cTime - the time\r
1688  *                                 option - DATE_SHORTDATE or DATE_LONGDATE\r
1689  *                                 bIncluedeTime - whether to show time as well as date\r
1690  *                                 bRelative - if true then relative time is shown if reasonable \r
1691  *                                 If HKCU\Software\TortoiseGit\UseSystemLocaleForDates is 0 then use fixed format\r
1692  *                                 rather than locale\r
1693  * RETURN      :   CString containing date/time\r
1694  */\r
1695 CString CAppUtils::FormatDateAndTime( const CTime& cTime, DWORD option, bool bIncludeTime /*=true*/,\r
1696         bool bRelative /*=false*/)\r
1697 {\r
1698         CString datetime;\r
1699         if ( bRelative )\r
1700         {\r
1701                 datetime = ToRelativeTimeString( cTime );\r
1702         }\r
1703         else\r
1704         {\r
1705                 // should we use the locale settings for formatting the date/time?\r
1706                 if (CRegDWORD(_T("Software\\TortoiseGit\\UseSystemLocaleForDates"), TRUE))\r
1707                 {\r
1708                         // yes\r
1709                         SYSTEMTIME sysTime;\r
1710                         cTime.GetAsSystemTime( sysTime );\r
1711                         \r
1712                         TCHAR buf[100];\r
1713                         \r
1714                         GetDateFormat(LOCALE_USER_DEFAULT, option, &sysTime, NULL, buf, \r
1715                                 sizeof(buf)/sizeof(TCHAR)-1);\r
1716                         datetime = buf;\r
1717                         if ( bIncludeTime )\r
1718                         {\r
1719                                 datetime += _T(" ");\r
1720                                 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &sysTime, NULL, buf, sizeof(buf)/sizeof(TCHAR)-1);\r
1721                                 datetime += buf;\r
1722                         }\r
1723                 }\r
1724                 else\r
1725                 {\r
1726                         // no, so fixed format\r
1727                         if ( bIncludeTime )\r
1728                         {\r
1729                                 datetime = cTime.Format(_T("%Y-%m-%d %H:%M:%S"));\r
1730                         }\r
1731                         else\r
1732                         {\r
1733                                 datetime = cTime.Format(_T("%Y-%m-%d"));\r
1734                         }\r
1735                 }\r
1736         }\r
1737         return datetime;\r
1738 }\r
1739 \r
1740 /**\r
1741  *      Converts a given time to a relative display string (relative to current time)\r
1742  *      Given time must be in local timezone\r
1743  */\r
1744 CString CAppUtils::ToRelativeTimeString(CTime time)\r
1745 {\r
1746     CString answer;\r
1747         // convert to COleDateTime\r
1748         SYSTEMTIME sysTime;\r
1749         time.GetAsSystemTime( sysTime );\r
1750         COleDateTime oleTime( sysTime );\r
1751         answer = ToRelativeTimeString(oleTime, COleDateTime::GetCurrentTime());\r
1752         return answer;\r
1753 }\r
1754 \r
1755 /**\r
1756  *      Generates a display string showing the relative time between the two given times as COleDateTimes\r
1757  */\r
1758 CString CAppUtils::ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo)\r
1759 {\r
1760     CString answer;\r
1761         COleDateTimeSpan ts = RelativeTo - time;\r
1762     //years\r
1763         if(fabs(ts.GetTotalDays()) >= 3*365)\r
1764     {\r
1765                 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/365, IDS_YEAR_AGO, IDS_YEARS_AGO );\r
1766         }\r
1767         //Months\r
1768         if(fabs(ts.GetTotalDays()) >= 60)\r
1769         {\r
1770                 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/30, IDS_MONTH_AGO, IDS_MONTHS_AGO );\r
1771                 return answer;\r
1772         }\r
1773         //Weeks\r
1774         if(fabs(ts.GetTotalDays()) >= 14)\r
1775         {\r
1776                 answer = ExpandRelativeTime( (int)ts.GetTotalDays()/7, IDS_WEEK_AGO, IDS_WEEKS_AGO );\r
1777                 return answer;\r
1778         }\r
1779         //Days\r
1780         if(fabs(ts.GetTotalDays()) >= 2)\r
1781         {\r
1782                 answer = ExpandRelativeTime( (int)ts.GetTotalDays(), IDS_DAY_AGO, IDS_DAYS_AGO );\r
1783                 return answer;\r
1784         }\r
1785         //hours\r
1786         if(fabs(ts.GetTotalHours()) >= 2)\r
1787         {\r
1788                 answer = ExpandRelativeTime( (int)ts.GetTotalHours(), IDS_HOUR_AGO, IDS_HOURS_AGO );\r
1789                 return answer;\r
1790         }\r
1791         //minutes\r
1792         if(fabs(ts.GetTotalMinutes()) >= 2)\r
1793         {\r
1794                 answer = ExpandRelativeTime( (int)ts.GetTotalMinutes(), IDS_MINUTE_AGO, IDS_MINUTES_AGO );\r
1795                 return answer;\r
1796         }\r
1797         //seconds\r
1798                 answer = ExpandRelativeTime( (int)ts.GetTotalSeconds(), IDS_SECOND_AGO, IDS_SECONDS_AGO );\r
1799     return answer;\r
1800 }\r
1801 \r
1802 /** \r
1803  * Passed a value and two resource string ids\r
1804  * if count is 1 then FormatString is called with format_1 and the value\r
1805  * otherwise format_2 is used\r
1806  * the formatted string is returned\r
1807 */\r
1808 CString CAppUtils::ExpandRelativeTime( int count, UINT format_1, UINT format_n )\r
1809 {\r
1810         CString answer;\r
1811         if ( count == 1 )\r
1812         {\r
1813                 answer.FormatMessage( format_1, count );\r
1814         }\r
1815         else\r
1816         {\r
1817                 answer.FormatMessage( format_n, count );\r
1818         }\r
1819         return answer;\r
1820 }\r
1821 \r