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