src/Git/GitStatusListCtrl.cpp

   1 \r
   2 \r
   3 // TortoiseSVN - a Windows shell extension for easy version control\r
   4 \r
   5 // Copyright (C) 2003-2008 - TortoiseSVN\r
   6 \r
   7 // This program is free software; you can redistribute it and/or\r
   8 // modify it under the terms of the GNU General Public License\r
   9 // as published by the Free Software Foundation; either version 2\r
  10 // of the License, or (at your option) any later version.\r
  11 \r
  12 // This program is distributed in the hope that it will be useful,\r
  13 // but WITHOUT ANY WARRANTY; without even the implied warranty of\r
  14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
  15 // GNU General Public License for more details.\r
  16 \r
  17 // You should have received a copy of the GNU General Public License\r
  18 // along with this program; if not, write to the Free Software Foundation,\r
  19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
  20 //\r
  21 \r
  22 #include "StdAfx.h"\r
  23 #include "GitStatusListCtrl.h"\r
  24 #include "resource.h"\r
  25 #include "..\\TortoiseShell\resource.h"\r
  26 #include "MessageBox.h"\r
  27 #include "MyMemDC.h"\r
  28 #include "UnicodeUtils.h"\r
  29 #include "AppUtils.h"\r
  30 #include "PathUtils.h"\r
  31 #include "TempFile.h"\r
  32 #include "StringUtils.h"\r
  33 #include "DirFileEnum.h"\r
  34 #include "GitConfig.h"\r
  35 //#include "SVNProperties.h"\r
  36 #include "Git.h"\r
  37 #include "GitDiff.h"\r
  38 //#include "LogDlg.h"\r
  39 //#include "SVNProgressDlg.h"\r
  40 #include "SysImageList.h"\r
  41 //#include "Svnstatuslistctrl.h"\r
  42 #include "TGitPath.h"\r
  43 #include "Registry.h"\r
  44 #include "GitStatus.h"\r
  45 //#include "SVNHelpers.h"\r
  46 #include "InputDlg.h"\r
  47 #include "ShellUpdater.h"\r
  48 #include "GitAdminDir.h"\r
  49 //#include "DropFiles.h"\r
  50 #include "IconMenu.h"\r
  51 //#include "AddDlg.h"\r
  52 //#include "EditPropertiesDlg.h"\r
  53 //#include "CreateChangelistDlg.h"\r
  54 #include "XPTheme.h"\r
  55 #include "CommonResource.h"\r
  56 \r
  57 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED\r
  58                                         = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));\r
  59 const UINT CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH\r
  60                                         = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));\r
  61 const UINT CGitStatusListCtrl::SVNSLNM_ADDFILE\r
  62                                         = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));\r
  63 const UINT CGitStatusListCtrl::SVNSLNM_CHECKCHANGED\r
  64                                         = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));\r
  65 \r
  66 #define IDSVNLC_REVERT                   1\r
  67 #define IDSVNLC_COMPARE                  2\r
  68 #define IDSVNLC_OPEN                     3\r
  69 #define IDSVNLC_DELETE                   4\r
  70 #define IDSVNLC_IGNORE                   5\r
  71 #define IDSVNLC_GNUDIFF1                 6\r
  72 #define IDSVNLC_UPDATE           7\r
  73 #define IDSVNLC_LOG              8\r
  74 #define IDSVNLC_EDITCONFLICT     9\r
  75 #define IDSVNLC_IGNOREMASK          10\r
  76 #define IDSVNLC_ADD                         11\r
  77 #define IDSVNLC_RESOLVECONFLICT 12\r
  78 #define IDSVNLC_LOCK                    13\r
  79 #define IDSVNLC_LOCKFORCE               14\r
  80 #define IDSVNLC_UNLOCK                  15\r
  81 #define IDSVNLC_UNLOCKFORCE             16\r
  82 #define IDSVNLC_OPENWITH                17\r
  83 #define IDSVNLC_EXPLORE                 18\r
  84 #define IDSVNLC_RESOLVETHEIRS   19\r
  85 #define IDSVNLC_RESOLVEMINE             20\r
  86 #define IDSVNLC_REMOVE                  21\r
  87 #define IDSVNLC_COMMIT                  22\r
  88 #define IDSVNLC_PROPERTIES              23\r
  89 #define IDSVNLC_COPY                    24\r
  90 #define IDSVNLC_COPYEXT                 25\r
  91 #define IDSVNLC_REPAIRMOVE              26\r
  92 #define IDSVNLC_REMOVEFROMCS    27\r
  93 #define IDSVNLC_CREATECS                28\r
  94 #define IDSVNLC_CREATEIGNORECS  29\r
  95 #define IDSVNLC_CHECKGROUP              30\r
  96 #define IDSVNLC_UNCHECKGROUP    31\r
  97 #define IDSVNLC_ADD_RECURSIVE   32\r
  98 #define IDSVNLC_COMPAREWC               33\r
  99 #define IDSVNLC_BLAME                   34\r
 100 // the IDSVNLC_MOVETOCS *must* be the last index, because it contains a dynamic submenu where \r
 101 // the submenu items get command ID's sequent to this number\r
 102 #define IDSVNLC_MOVETOCS                35\r
 103 \r
 104 \r
 105 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)\r
 106         ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)\r
 107         ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)\r
 108         ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)\r
 109         ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)\r
 110         ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)\r
 111         ON_WM_CONTEXTMENU()\r
 112         ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)\r
 113         ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)\r
 114         ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)\r
 115         ON_WM_SETCURSOR()\r
 116         ON_WM_GETDLGCODE()\r
 117         ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)\r
 118         ON_WM_KEYDOWN()\r
 119         ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)\r
 120         ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)\r
 121         ON_WM_PAINT()\r
 122         ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)\r
 123         ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)\r
 124         ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)\r
 125         ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)\r
 126         ON_WM_DESTROY()\r
 127         ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)\r
 128         ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)\r
 129 END_MESSAGE_MAP()\r
 130 \r
 131 \r
 132 \r
 133 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()\r
 134         //, m_HeadRev(GitRev::REV_HEAD)\r
 135         , m_pbCanceled(NULL)\r
 136         , m_pStatLabel(NULL)\r
 137         , m_pSelectButton(NULL)\r
 138         , m_pConfirmButton(NULL)\r
 139         , m_bBusy(false)\r
 140         , m_bEmpty(false)\r
 141         , m_bUnversionedRecurse(true)\r
 142         , m_bShowIgnores(false)\r
 143         , m_pDropTarget(NULL)\r
 144         , m_bIgnoreRemoveOnly(false)\r
 145         , m_bCheckChildrenWithParent(false)\r
 146         , m_bUnversionedLast(true)\r
 147         , m_bHasChangeLists(false)\r
 148         , m_bHasLocks(false)\r
 149         , m_bBlock(false)\r
 150         , m_bBlockUI(false)\r
 151         , m_bHasCheckboxes(false)\r
 152         , m_bCheckIfGroupsExist(true)\r
 153         , m_bFileDropsEnabled(false)\r
 154         , m_bOwnDrag(false)\r
 155     , m_dwDefaultColumns(0)\r
 156     , m_ColumnManager(this)\r
 157     , m_bAscending(false)\r
 158     , m_nSortedColumn(-1)\r
 159         , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))\r
 160 {\r
 161         m_FileLoaded=0;\r
 162         m_critSec.Init();\r
 163 }\r
 164 \r
 165 CGitStatusListCtrl::~CGitStatusListCtrl()\r
 166 {\r
 167 //      if (m_pDropTarget)\r
 168 //              delete m_pDropTarget;\r
 169         ClearStatusArray();\r
 170 }\r
 171 \r
 172 void CGitStatusListCtrl::ClearStatusArray()\r
 173 {\r
 174 #if 0\r
 175         Locker lock(m_critSec);\r
 176         for (size_t i=0; i < m_arStatusArray.size(); i++)\r
 177         {\r
 178                 delete m_arStatusArray[i];\r
 179         }\r
 180         m_arStatusArray.clear();\r
 181 #endif\r
 182 }\r
 183 #if 0\r
 184 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)\r
 185 {\r
 186 \r
 187         if (index >= (UINT_PTR)m_arListArray.size())\r
 188                 return NULL;\r
 189         if (m_arListArray[index] >= m_arStatusArray.size())\r
 190                 return NULL;\r
 191         return m_arStatusArray[m_arListArray[index]];\r
 192 \r
 193         return NULL;\r
 194 }\r
 195 #endif\r
 196 #if 0\r
 197 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)\r
 198 {\r
 199         int itemCount = GetItemCount();\r
 200         for (int i=0; i < itemCount; i++)\r
 201         {\r
 202                 FileEntry * entry = GetListEntry(i);\r
 203                 if (entry->GetPath().IsEquivalentTo(path))\r
 204                         return entry;\r
 205         }\r
 206         return NULL;\r
 207 }\r
 208 #endif\r
 209 #if 0\r
 210 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)\r
 211 {\r
 212 \r
 213         for (size_t i=0; i < m_arStatusArray.size(); i++)\r
 214         {\r
 215                 FileEntry * entry = m_arStatusArray[i];\r
 216                 if (entry->GetPath().IsEquivalentTo(path))\r
 217                         return entry;\r
 218         }\r
 219 \r
 220         return NULL;\r
 221 }\r
 222 #endif\r
 223 \r
 224 #if 0\r
 225 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)\r
 226 {\r
 227         int itemCount = GetItemCount();\r
 228         for (int i=0; i < itemCount; i++)\r
 229         {\r
 230                 FileEntry * entry = GetListEntry(i);\r
 231                 if (entry->GetPath().IsEquivalentTo(path))\r
 232                         return i;\r
 233         }\r
 234         return -1;\r
 235 }\r
 236 #endif \r
 237 \r
 238 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, DWORD dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)\r
 239 {\r
 240         Locker lock(m_critSec);\r
 241 \r
 242     m_dwDefaultColumns = dwColumns | 1;\r
 243     m_dwContextMenus = dwContextMenus;\r
 244         m_bHasCheckboxes = bHasCheckboxes;\r
 245 \r
 246     // set the extended style of the listcontrol\r
 247         // the style LVS_EX_FULLROWSELECT interferes with the background watermark image but it's more important to be able to select in the whole row.\r
 248         CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);\r
 249         DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;\r
 250         if (DWORD(regFullRowSelect))\r
 251                 exStyle |= LVS_EX_FULLROWSELECT;\r
 252         exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);\r
 253         SetRedraw(false);\r
 254         SetExtendedStyle(exStyle);\r
 255 \r
 256         CXPTheme theme;\r
 257         theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);\r
 258 \r
 259         m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();\r
 260         SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);\r
 261 \r
 262     m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);\r
 263 \r
 264         // enable file drops\r
 265 #if 0\r
 266         if (m_pDropTarget == NULL)\r
 267         {\r
 268                 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);\r
 269                 RegisterDragDrop(m_hWnd,m_pDropTarget);\r
 270                 // create the supported formats:\r
 271                 FORMATETC ftetc={0};\r
 272                 ftetc.dwAspect = DVASPECT_CONTENT;\r
 273                 ftetc.lindex = -1;\r
 274                 ftetc.tymed = TYMED_HGLOBAL;\r
 275                 ftetc.cfFormat=CF_HDROP;\r
 276                 m_pDropTarget->AddSuportedFormat(ftetc);\r
 277         }\r
 278 #endif\r
 279 \r
 280         SetRedraw(true);\r
 281 \r
 282         m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));\r
 283 }\r
 284 \r
 285 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)\r
 286 {\r
 287         return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);\r
 288 }\r
 289 \r
 290 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList\r
 291                                    , bool bUpdate /* = FALSE */\r
 292                                    , bool bShowIgnores /* = false */\r
 293                                                                    , bool bShowUnRev\r
 294                                    , bool bShowUserProps /* = false */)\r
 295 {\r
 296         Locker lock(m_critSec);\r
 297         int mask= CGitStatusListCtrl::FILELIST_MODIFY;\r
 298         if(bShowIgnores)\r
 299                 mask|= CGitStatusListCtrl::FILELIST_IGNORE;\r
 300         if(bShowUnRev)\r
 301                 mask|= CGitStatusListCtrl::FILELIST_UNVER;\r
 302         this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);\r
 303 \r
 304 \r
 305 #if 0\r
 306         \r
 307         int refetchcounter = 0;\r
 308         BOOL bRet = TRUE;\r
 309         Invalidate();\r
 310         // force the cursor to change\r
 311         POINT pt;\r
 312         GetCursorPos(&pt);\r
 313         SetCursorPos(pt.x, pt.y);\r
 314 \r
 315         m_mapFilenameToChecked.clear();\r
 316         //m_StatusUrlList.Clear();\r
 317         bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));\r
 318         m_changelists.clear();\r
 319         for (size_t i=0; i < m_arStatusArray.size(); i++)\r
 320         {\r
 321                 FileEntry * entry = m_arStatusArray[i];\r
 322                 if ( bHasChangelists && entry->checked)\r
 323                 {\r
 324                         // If change lists are present, remember all checked entries\r
 325                         CString path = entry->GetPath().GetGitPathString();\r
 326                         m_mapFilenameToChecked[path] = true;\r
 327                 }\r
 328                 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )\r
 329                 {\r
 330                         // The user manually selected an unversioned or missing file. We remember\r
 331                         // this so that the selection can be restored when refreshing.\r
 332                         CString path = entry->GetPath().GetGitPathString();\r
 333                         m_mapFilenameToChecked[path] = true;\r
 334                 }\r
 335                 else if ( entry->status > git_wc_status_normal && !entry->checked )\r
 336                 {\r
 337                         // The user manually deselected a versioned file. We remember\r
 338                         // this so that the deselection can be restored when refreshing.\r
 339                         CString path = entry->GetPath().GetGitPathString();\r
 340                         m_mapFilenameToChecked[path] = false;\r
 341                 }\r
 342         }\r
 343 \r
 344         // use a sorted path list to make sure we fetch the status of\r
 345         // parent items first, *then* the child items (if any)\r
 346         CTGitPathList sortedPathList = pathList;\r
 347         sortedPathList.SortByPathname();\r
 348         do\r
 349         {\r
 350                 bRet = TRUE;\r
 351                 m_nTargetCount = 0;\r
 352                 m_bHasExternalsFromDifferentRepos = FALSE;\r
 353                 m_bHasExternals = FALSE;\r
 354                 m_bHasUnversionedItems = FALSE;\r
 355                 m_bHasLocks = false;\r
 356                 m_bHasChangeLists = false;\r
 357                 m_bShowIgnores = bShowIgnores;\r
 358                 m_nSortedColumn = 0;\r
 359                 m_bBlock = TRUE;\r
 360                 m_bBusy = true;\r
 361                 m_bEmpty = false;\r
 362                 Invalidate();\r
 363 \r
 364                 // first clear possible status data left from\r
 365                 // previous GetStatus() calls\r
 366                 ClearStatusArray();\r
 367 \r
 368                 m_StatusFileList = sortedPathList;\r
 369 \r
 370                 // Since Git_client_status() returns all files, even those in\r
 371                 // folders included with Git:externals we need to check if all\r
 372                 // files we get here belongs to the same repository.\r
 373                 // It is possible to commit changes in an external folder, as long\r
 374                 // as the folder belongs to the same repository (but another path),\r
 375                 // but it is not possible to commit all files if the externals are\r
 376                 // from a different repository.\r
 377                 //\r
 378                 // To check if all files belong to the same repository, we compare the\r
 379                 // UUID's - if they're identical then the files belong to the same\r
 380                 // repository and can be committed. But if they're different, then\r
 381                 // tell the user to commit all changes in the external folders\r
 382                 // first and exit.\r
 383                 CStringA sUUID;                                 // holds the repo UUID\r
 384                 CTGitPathList arExtPaths;               // list of Git:external paths\r
 385 \r
 386                 GitConfig config;\r
 387 \r
 388                 m_sURL.Empty();\r
 389 \r
 390                 m_nTargetCount = sortedPathList.GetCount();\r
 391 \r
 392                 GitStatus status(m_pbCanceled);\r
 393                 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())\r
 394                 {\r
 395                         // This is a special case, where we've been given a list of files\r
 396                         // all from one folder\r
 397                         // We handle them by setting a status filter, then requesting the Git status of\r
 398                         // all the files in the directory, filtering for the ones we're interested in\r
 399                         status.SetFilter(sortedPathList);\r
 400 \r
 401                         // if all selected entries are files, we don't do a recursive status\r
 402                         // fetching. But if only one is a directory, we have to recurse.\r
 403                         git_depth_t depth = git_depth_files;\r
 404                         // We have set a filter. If all selected items were files or we fetch\r
 405                         // the status not recursively, then we have to include\r
 406                         // ignored items too - the user has selected them\r
 407                         bool bShowIgnoresRight = true;\r
 408                         for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)\r
 409                         {\r
 410                                 if (sortedPathList[fcindex].IsDirectory())\r
 411                                 {\r
 412                                         depth = git_depth_infinity;\r
 413                                         bShowIgnoresRight = false;\r
 414                                         break;\r
 415                                 }\r
 416                         }\r
 417                         if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))\r
 418                         {\r
 419                                 bRet = FALSE;\r
 420                         }\r
 421                 }\r
 422                 else\r
 423                 {\r
 424                         for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)\r
 425                         {\r
 426                                 // check whether the path we want the status for is already fetched due to status-fetching\r
 427                                 // of a parent path.\r
 428                                 // this check is only done for file paths, because folder paths could be included already\r
 429                                 // but not recursively\r
 430                                 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)\r
 431                                 {\r
 432                                         if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID, \r
 433                                                 arExtPaths, false, git_depth_infinity, bShowIgnores))\r
 434                                         {\r
 435                                                 bRet = FALSE;\r
 436                                         }\r
 437                                 }\r
 438                         }\r
 439                 }\r
 440 \r
 441                 // remove the 'helper' files of conflicted items from the list.\r
 442                 // otherwise they would appear as unversioned files.\r
 443                 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)\r
 444                 {\r
 445                         for (size_t i=0; i < m_arStatusArray.size(); i++)\r
 446                         {\r
 447                                 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))\r
 448                                 {\r
 449                                         delete m_arStatusArray[i];\r
 450                                         m_arStatusArray.erase(m_arStatusArray.begin()+i);\r
 451                                         break;\r
 452                                 }\r
 453                         }\r
 454                 }\r
 455                 refetchcounter++;\r
 456         } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));\r
 457 \r
 458     if (bShowUserProps)\r
 459         FetchUserProperties();\r
 460 \r
 461     m_ColumnManager.UpdateUserPropList (m_arStatusArray);\r
 462 \r
 463         m_bBlock = FALSE;\r
 464         m_bBusy = false;\r
 465         GetCursorPos(&pt);\r
 466         SetCursorPos(pt.x, pt.y);\r
 467         return bRet;\r
 468 #endif \r
 469         BuildStatistics();\r
 470         return TRUE;\r
 471 }\r
 472 \r
 473 //\r
 474 // Fetch all local properties for all elements in the status array\r
 475 //\r
 476 void CGitStatusListCtrl::FetchUserProperties()\r
 477 {\r
 478 #if 0\r
 479         GitPool globalPool;\r
 480 \r
 481     for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)\r
 482     {\r
 483         // local / temp pool to hold parameters and props for a single item\r
 484 \r
 485         GitPool localPool ((apr_pool_t*)globalPool);\r
 486 \r
 487         // open working copy for this path\r
 488 \r
 489         const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);\r
 490          \r
 491             Git_wc_adm_access_t *adm_access = NULL;          \r
 492         Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access\r
 493                                                      , NULL\r
 494                                                      , path\r
 495                                                      , FALSE    // no write lock\r
 496                                                                                                          , 0            // lock just the directory/file itself\r
 497                                                      , NULL\r
 498                                                                                                          , NULL\r
 499                                                      , localPool);\r
 500         if (error == NULL)\r
 501         {\r
 502             // get the props and add them to the status info\r
 503 \r
 504             apr_hash_t* props = NULL;\r
 505             Git_error_t * error = Git_wc_prop_list ( &props\r
 506                                                    , path\r
 507                                                    , adm_access\r
 508                                                    , localPool);\r
 509             if (error == NULL)\r
 510             {\r
 511                 for ( apr_hash_index_t *index \r
 512                         = apr_hash_first (localPool, props)\r
 513                     ; index != NULL\r
 514                     ; index = apr_hash_next (index))\r
 515                 {\r
 516                     // extract next entry from hash\r
 517 \r
 518                     const char* key = NULL;\r
 519                     ptrdiff_t keyLen;\r
 520                     const char** val = NULL;\r
 521 \r
 522                     apr_hash_this ( index\r
 523                                   , reinterpret_cast<const void**>(&key)\r
 524                                   , &keyLen\r
 525                                   , reinterpret_cast<void**>(&val));\r
 526 \r
 527                     // decode / dispatch it\r
 528 \r
 529                         CString name = CUnicodeUtils::GetUnicode (key);\r
 530                         CString value = CUnicodeUtils::GetUnicode (*val);\r
 531 \r
 532                     // store in property container (truncate it after ~100 chars)\r
 533 \r
 534                     m_arStatusArray[i]->present_props[name] \r
 535                         = value.Left (GitSLC_MAXUSERPROPLENGTH);\r
 536                 }\r
 537             }\r
 538             error = Git_wc_adm_close2 (adm_access, localPool);\r
 539         }\r
 540         Git_error_clear (error);\r
 541     }\r
 542 #endif\r
 543 }\r
 544 \r
 545 \r
 546 //\r
 547 // Work on a single item from the list of paths which is provided to us\r
 548 //\r
 549 bool CGitStatusListCtrl::FetchStatusForSingleTarget(\r
 550                                                         GitConfig& config,\r
 551                                                         GitStatus& status,\r
 552                                                         const CTGitPath& target,\r
 553                                                         bool bFetchStatusFromRepository,\r
 554                                                         CStringA& strCurrentRepositoryUUID,\r
 555                                                         CTGitPathList& arExtPaths,\r
 556                                                         bool bAllDirect,\r
 557                                                         git_depth_t depth,\r
 558                                                         bool bShowIgnores\r
 559                                                         )\r
 560 {\r
 561 #if 0\r
 562         config.GetDefaultIgnores();\r
 563 \r
 564         CTGitPath workingTarget(target);\r
 565 \r
 566         git_wc_status2_t * s;\r
 567         CTGitPath GitPath;\r
 568         s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);\r
 569 \r
 570         m_HeadRev = SVNRev(status.headrev);\r
 571         if (s!=0)\r
 572         {\r
 573                 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);\r
 574 \r
 575                 // This one fixes a problem with externals:\r
 576                 // If a strLine is a file, Git:externals and its parent directory\r
 577                 // will also be returned by GetXXXFileStatus. Hence, we skip all\r
 578                 // status info until we find the one matching workingTarget.\r
 579                 if (!workingTarget.IsDirectory())\r
 580                 {\r
 581                         if (!workingTarget.IsEquivalentTo(GitPath))\r
 582                         {\r
 583                                 while (s != 0)\r
 584                                 {\r
 585                                         s = status.GetNextFileStatus(GitPath);\r
 586                                         if(workingTarget.IsEquivalentTo(GitPath))\r
 587                                         {\r
 588                                                 break;\r
 589                                         }\r
 590                                 }\r
 591                                 if (s == 0)\r
 592                                 {\r
 593                                         m_sLastError = status.GetLastErrorMsg();\r
 594                                         return false;\r
 595                                 }\r
 596                                 // Now, set working target to be the base folder of this item\r
 597                                 workingTarget = workingTarget.GetDirectory();\r
 598                         }\r
 599                 }\r
 600                 bool bEntryFromDifferentRepo = false;\r
 601                 // Is this a versioned item with an associated repos UUID?\r
 602                 if ((s->entry)&&(s->entry->uuid))\r
 603                 {\r
 604                         // Have we seen a repos UUID yet?\r
 605                         if (strCurrentRepositoryUUID.IsEmpty())\r
 606                         {\r
 607                                 // This is the first repos UUID we've seen - record it\r
 608                                 strCurrentRepositoryUUID = s->entry->uuid;\r
 609                                 m_sUUID = strCurrentRepositoryUUID;\r
 610                         }\r
 611                         else\r
 612                         {\r
 613                                 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)\r
 614                                 {\r
 615                                         // This item comes from a different repository than our main one\r
 616                                         m_bHasExternalsFromDifferentRepos = TRUE;\r
 617                                         bEntryFromDifferentRepo = true;\r
 618                                         if (s->entry->kind == Git_node_dir)\r
 619                                                 arExtPaths.AddPath(workingTarget);\r
 620                                 }\r
 621                         }\r
 622                 }\r
 623                 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))\r
 624                 {\r
 625                         // An added entry doesn't have an UUID assigned to it yet.\r
 626                         // So we fetch the status of the parent directory instead and\r
 627                         // check if that one has an UUID assigned to it.\r
 628                         Git_wc_status2_t * sparent;\r
 629                         CTGitPath path = workingTarget;\r
 630                         do\r
 631                         {\r
 632                                 CTGitPath GitParentPath;\r
 633                                 GitStatus tempstatus;\r
 634                                 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);\r
 635                                 path = GitParentPath;\r
 636                         } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );\r
 637                         if (sparent && sparent->entry && sparent->entry->uuid)\r
 638                         {\r
 639                                 strCurrentRepositoryUUID = sparent->entry->uuid;\r
 640                                 m_sUUID = strCurrentRepositoryUUID;\r
 641                         }\r
 642                 }\r
 643 \r
 644                 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())\r
 645                 {\r
 646                         // check if the unversioned folder is maybe versioned. This\r
 647                         // could happen with nested layouts\r
 648                         Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);\r
 649                         if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))\r
 650                         {\r
 651                                 return true;    // ignore nested layouts\r
 652                         }\r
 653                 }\r
 654                 if (status.IsExternal(GitPath))\r
 655                 {\r
 656                         m_bHasExternals = TRUE;\r
 657                 }\r
 658 \r
 659                 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);\r
 660 \r
 661                 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())\r
 662                 {\r
 663                         // we have an unversioned folder -> get all files in it recursively!\r
 664                         AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);\r
 665                 }\r
 666 \r
 667                 // for folders, get all statuses inside it too\r
 668                 if(workingTarget.IsDirectory())\r
 669                 {\r
 670                         ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);\r
 671                 }\r
 672 \r
 673         } // if (s!=0)\r
 674         else\r
 675         {\r
 676                 m_sLastError = status.GetLastErrorMsg();\r
 677                 return false;\r
 678         }\r
 679 #endif\r
 680         return true;\r
 681 }\r
 682 #if 0\r
 683 const CGitStatusListCtrl::FileEntry*\r
 684 CGitStatusListCtrl::AddNewFileEntry(\r
 685                         const git_wc_status2_t* pGitStatus,  // The return from the Git GetStatus functions\r
 686                         const CTGitPath& path,                          // The path of the item we're adding\r
 687                         const CTGitPath& basePath,                      // The base directory for this status build\r
 688                         bool bDirectItem,                                       // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call\r
 689                         bool bInExternal,                                       // Are we in an 'external' folder\r
 690                         bool bEntryfromDifferentRepo            // if the entry is from a different repository\r
 691                         )\r
 692 {\r
 693         FileEntry * entry = new FileEntry();\r
 694 \r
 695         \r
 696         entry->path = path;\r
 697         entry->basepath = basePath;\r
 698         entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);\r
 699         entry->textstatus = pGitStatus->text_status;\r
 700         entry->propstatus = pGitStatus->prop_status;\r
 701 //      entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);\r
 702 //      entry->remotetextstatus = pGitStatus->repos_text_status;\r
 703 //      entry->remotepropstatus = pGitStatus->repos_prop_status;\r
 704         entry->inexternal = bInExternal;\r
 705         entry->differentrepo = bEntryfromDifferentRepo;\r
 706         entry->direct = bDirectItem;\r
 707 //      entry->copied = !!pGitStatus->copied;\r
 708 //      entry->switched = !!pGitStatus->switched;\r
 709 \r
 710         entry->last_commit_date = pGitStatus->ood_last_cmt_date;\r
 711         if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))\r
 712                 entry->last_commit_date = pGitStatus->entry->cmt_date;\r
 713         entry->remoterev = pGitStatus->ood_last_cmt_rev;\r
 714         if (pGitStatus->entry)\r
 715                 entry->last_commit_rev = pGitStatus->entry->cmt_rev;\r
 716         if (pGitStatus->ood_last_cmt_author)\r
 717                 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);\r
 718         if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))\r
 719                 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);\r
 720 \r
 721         if (pGitStatus->entry)\r
 722                 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;\r
 723 \r
 724         if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))\r
 725         {\r
 726                 entry->isConflicted = true;\r
 727                 if (pGitStatus->entry)\r
 728                 {\r
 729                         CTGitPath cpath;\r
 730                         if (pGitStatus->entry->conflict_wrk)\r
 731                         {\r
 732                                 cpath = path.GetDirectory();\r
 733                                 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));\r
 734                                 m_ConflictFileList.AddPath(cpath);\r
 735                         }\r
 736                         if (pGitStatus->entry->conflict_old)\r
 737                         {\r
 738                                 cpath = path.GetDirectory();\r
 739                                 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));\r
 740                                 m_ConflictFileList.AddPath(cpath);\r
 741                         }\r
 742                         if (pGitStatus->entry->conflict_new)\r
 743                         {\r
 744                                 cpath = path.GetDirectory();\r
 745                                 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));\r
 746                                 m_ConflictFileList.AddPath(cpath);\r
 747                         }\r
 748                         if (pGitStatus->entry->prejfile)\r
 749                         {\r
 750                                 cpath = path.GetDirectory();\r
 751                                 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));\r
 752                                 m_ConflictFileList.AddPath(cpath);\r
 753                         }\r
 754                 }\r
 755         }\r
 756 \r
 757         if (pGitStatus->entry)\r
 758         {\r
 759                 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);\r
 760                 entry->Revision = pGitStatus->entry->revision;\r
 761                 entry->keeplocal = !!pGitStatus->entry->keep_local;\r
 762                 entry->working_size = pGitStatus->entry->working_size;\r
 763                 entry->depth = pGitStatus->entry->depth;\r
 764 \r
 765                 if (pGitStatus->entry->url)\r
 766                 {\r
 767                         entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));\r
 768                 }\r
 769                 if (pGitStatus->entry->copyfrom_url)\r
 770                 {\r
 771                         entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));\r
 772                         entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;\r
 773                 }\r
 774                 else\r
 775                         entry->copyfrom_rev = 0;\r
 776 \r
 777                 if(bDirectItem)\r
 778                 {\r
 779                         if (m_sURL.IsEmpty())\r
 780                                 m_sURL = entry->url;\r
 781                         else\r
 782                                 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);\r
 783                         m_StatusUrlList.AddPath(CTGitPath(entry->url));\r
 784                 }\r
 785                 if (pGitStatus->entry->lock_owner)\r
 786                         entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);\r
 787                 if (pGitStatus->entry->lock_token)\r
 788                 {\r
 789                         entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);\r
 790                         m_bHasLocks = true;\r
 791                 }\r
 792                 if (pGitStatus->entry->lock_comment)\r
 793                         entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);\r
 794 \r
 795                 if (pGitStatus->entry->present_props)\r
 796                 {\r
 797                         entry->present_props = pGitStatus->entry->present_props;\r
 798                 }\r
 799 \r
 800                 if (pGitStatus->entry->changelist)\r
 801                 {\r
 802                         entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);\r
 803                         m_changelists[entry->changelist] = -1;\r
 804                         m_bHasChangeLists = true;\r
 805                 }\r
 806                 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );\r
 807         }\r
 808         else\r
 809         {\r
 810                 if (pGitStatus->ood_kind == Git_node_none)\r
 811                         entry->isfolder = path.IsDirectory();\r
 812                 else\r
 813                         entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);\r
 814         }\r
 815         if (pGitStatus->repos_lock)\r
 816         {\r
 817                 if (pGitStatus->repos_lock->owner)\r
 818                         entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);\r
 819                 if (pGitStatus->repos_lock->token)\r
 820                         entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);\r
 821                 if (pGitStatus->repos_lock->comment)\r
 822                         entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);\r
 823         }\r
 824 \r
 825         // Pass ownership of the entry to the array\r
 826         m_arStatusArray.push_back(entry);\r
 827 \r
 828         return entry;\r
 829 }\r
 830 #endif\r
 831 \r
 832 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,\r
 833                                                                                                 const CTGitPath& basePath,\r
 834                                                                                                 GitConfig * config)\r
 835 {\r
 836 #if 0\r
 837         if (!m_bUnversionedRecurse)\r
 838                 return;\r
 839         CSimpleFileFind filefinder(folderName.GetWinPathString());\r
 840 \r
 841         CTGitPath filename;\r
 842         m_bHasUnversionedItems = TRUE;\r
 843         while (filefinder.FindNextFileNoDots())\r
 844         {\r
 845                 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());\r
 846 \r
 847                 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());\r
 848                 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());\r
 849                 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))\r
 850                 {\r
 851                         FileEntry * entry = new FileEntry();\r
 852                         entry->path = filename;\r
 853                         entry->basepath = basePath;\r
 854                         entry->inunversionedfolder = true;\r
 855                         entry->isfolder = filefinder.IsDirectory();\r
 856 \r
 857                         m_arStatusArray.push_back(entry);\r
 858                         if (entry->isfolder)\r
 859                         {\r
 860                                 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))\r
 861                                         AddUnversionedFolder(entry->path, basePath, config);\r
 862                         }\r
 863                 }\r
 864         }\r
 865 #endif\r
 866 }\r
 867 \r
 868 \r
 869 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,\r
 870                                                                                   CStringA& strCurrentRepositoryUUID,\r
 871                                                                                   CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)\r
 872 {\r
 873 #if 0\r
 874         git_wc_status2_t * s;\r
 875 \r
 876         CTGitPath lastexternalpath;\r
 877         CTGitPath GitPath;\r
 878         while ((s = status.GetNextFileStatus(GitPath)) != NULL)\r
 879         {\r
 880                 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);\r
 881                 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))\r
 882                 {\r
 883                         // check if the unversioned folder is maybe versioned. This\r
 884                         // could happen with nested layouts\r
 885                         Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);\r
 886                         if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))\r
 887                         {\r
 888                                 FileEntry * entry = new FileEntry();\r
 889                                 entry->path = GitPath;\r
 890                                 entry->basepath = basePath;\r
 891                                 entry->inunversionedfolder = true;\r
 892                                 entry->isfolder = true;\r
 893                                 entry->isNested = true;\r
 894                                 m_arStatusArray.push_back(entry);\r
 895                                 continue;\r
 896                         }\r
 897                 }\r
 898                 bool bDirectoryIsExternal = false;\r
 899                 bool bEntryfromDifferentRepo = false;\r
 900                 if (s->entry)\r
 901                 {\r
 902                         if (s->entry->uuid)\r
 903                         {\r
 904                                 if (strCurrentRepositoryUUID.IsEmpty())\r
 905                                         strCurrentRepositoryUUID = s->entry->uuid;\r
 906                                 else\r
 907                                 {\r
 908                                         if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)\r
 909                                         {\r
 910                                                 bEntryfromDifferentRepo = true;\r
 911                                                 if (GitStatus::IsImportant(wcFileStatus))\r
 912                                                         m_bHasExternalsFromDifferentRepos = TRUE;\r
 913                                                 if (s->entry->kind == Git_node_dir)\r
 914                                                 {\r
 915                                                         if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))\r
 916                                                         {\r
 917                                                                 arExtPaths.AddPath(GitPath);\r
 918                                                                 lastexternalpath = GitPath;\r
 919                                                         }\r
 920                                                 }\r
 921                                         }\r
 922                                 }\r
 923                         }\r
 924                         else\r
 925                         {\r
 926                                 // we don't have an UUID - maybe an added file/folder\r
 927                                 if (!strCurrentRepositoryUUID.IsEmpty())\r
 928                                 {\r
 929                                         if ((!lastexternalpath.IsEmpty())&&\r
 930                                                 (lastexternalpath.IsAncestorOf(GitPath)))\r
 931                                         {\r
 932                                                 bEntryfromDifferentRepo = true;\r
 933                                                 m_bHasExternalsFromDifferentRepos = TRUE;\r
 934                                         }\r
 935                                 }\r
 936                         }\r
 937                 }\r
 938                 else\r
 939                 {\r
 940                         // if unversioned items lie around in external\r
 941                         // directories from different repos, we have to mark them\r
 942                         // as such too.\r
 943                         if (!strCurrentRepositoryUUID.IsEmpty())\r
 944                         {\r
 945                                 if ((!lastexternalpath.IsEmpty())&&\r
 946                                         (lastexternalpath.IsAncestorOf(GitPath)))\r
 947                                 {\r
 948                                         bEntryfromDifferentRepo = true;\r
 949                                 }\r
 950                         }\r
 951                 }\r
 952                 if (status.IsExternal(GitPath))\r
 953                 {\r
 954                         arExtPaths.AddPath(GitPath);\r
 955                         m_bHasExternals = TRUE;\r
 956                 }\r
 957                 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))\r
 958                 {\r
 959                         // if the externals are inside an unversioned folder (this happens if\r
 960                         // the externals are specified with e.g. "ext\folder url" instead of just\r
 961                         // "folder url"), then a commit won't succeed.\r
 962                         // therefore, we treat those as if the externals come from a different\r
 963                         // repository\r
 964                         CTGitPath extpath = GitPath;\r
 965                         while (basePath.IsAncestorOf(extpath))\r
 966                         {\r
 967                                 if (!extpath.HasAdminDir())\r
 968                                 {\r
 969                                         bEntryfromDifferentRepo = true;\r
 970                                         break;\r
 971                                 }\r
 972                                 extpath = extpath.GetContainingDirectory();\r
 973                         }\r
 974                 }\r
 975                 // Do we have any external paths?\r
 976                 if(arExtPaths.GetCount() > 0)\r
 977                 {\r
 978                         // If do have external paths, we need to check if the current item belongs\r
 979                         // to one of them\r
 980                         for (int ix=0; ix<arExtPaths.GetCount(); ix++)\r
 981                         {\r
 982                                 if (arExtPaths[ix].IsAncestorOf(GitPath))\r
 983                                 {\r
 984                                         bDirectoryIsExternal = true;\r
 985                                         break;\r
 986                                 }\r
 987                         }\r
 988                 }\r
 989 \r
 990                 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))\r
 991                         m_bHasUnversionedItems = TRUE;\r
 992 \r
 993                 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);\r
 994 \r
 995                 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());\r
 996                 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());\r
 997                 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||\r
 998                         ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||\r
 999                         (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))\r
1000                 {\r
1001                         if (entry->isfolder)\r
1002                         {\r
1003                                 // we have an unversioned folder -> get all files in it recursively!\r
1004                                 AddUnversionedFolder(GitPath, basePath, config);\r
1005                         }\r
1006                 }\r
1007         } // while ((s = status.GetNextFileStatus(GitPath)) != NULL) \r
1008 #endif\r
1009 }\r
1010 \r
1011 // Get the show-flags bitmap value which corresponds to a particular Git status\r
1012 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)\r
1013 {\r
1014         switch (status)\r
1015         {\r
1016         case git_wc_status_none:\r
1017         case git_wc_status_unversioned:\r
1018                 return SVNSLC_SHOWUNVERSIONED;\r
1019         case git_wc_status_ignored:\r
1020                 if (!m_bShowIgnores)\r
1021                         return SVNSLC_SHOWDIRECTS;\r
1022                 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;\r
1023         case git_wc_status_incomplete:\r
1024                 return SVNSLC_SHOWINCOMPLETE;\r
1025         case git_wc_status_normal:\r
1026                 return SVNSLC_SHOWNORMAL;\r
1027         case git_wc_status_external:\r
1028                 return SVNSLC_SHOWEXTERNAL;\r
1029         case git_wc_status_added:\r
1030                 return SVNSLC_SHOWADDED;\r
1031         case git_wc_status_missing:\r
1032                 return SVNSLC_SHOWMISSING;\r
1033         case git_wc_status_deleted:\r
1034                 return SVNSLC_SHOWREMOVED;\r
1035         case git_wc_status_replaced:\r
1036                 return SVNSLC_SHOWREPLACED;\r
1037         case git_wc_status_modified:\r
1038                 return SVNSLC_SHOWMODIFIED;\r
1039         case git_wc_status_merged:\r
1040                 return SVNSLC_SHOWMERGED;\r
1041         case git_wc_status_conflicted:\r
1042                 return SVNSLC_SHOWCONFLICTED;\r
1043         case git_wc_status_obstructed:\r
1044                 return SVNSLC_SHOWOBSTRUCTED;\r
1045         default:\r
1046                 // we should NEVER get here!\r
1047                 ASSERT(FALSE);\r
1048                 break;\r
1049         }\r
1050         return 0;\r
1051 }\r
1052 \r
1053 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */,BOOL UpdateStatusList)\r
1054 {\r
1055         CWinApp * pApp = AfxGetApp();\r
1056         if (pApp)\r
1057                 pApp->DoWaitCursor(1);\r
1058 \r
1059         Locker lock(m_critSec);\r
1060         WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
1061         \r
1062         //SetItemCount(listIndex);\r
1063         SetRedraw(FALSE);\r
1064         DeleteAllItems();\r
1065         PrepareGroups();\r
1066         m_nSelected = 0;\r
1067 \r
1068         if(UpdateStatusList)\r
1069         {\r
1070                 m_arStatusArray.clear();\r
1071                 for(int i=0;i<this->m_StatusFileList.GetCount();i++)\r
1072                 {\r
1073                         m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);\r
1074                 }\r
1075 \r
1076                 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)\r
1077                 {\r
1078                         m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);\r
1079                 }\r
1080 \r
1081                 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)\r
1082                 {\r
1083                         m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);\r
1084                 }\r
1085         }\r
1086         for(int i=0;i<this->m_arStatusArray.size();i++)\r
1087         {\r
1088                 //set default checkbox status\r
1089                 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwCheck)\r
1090                         ((CTGitPath*)m_arStatusArray[i])->m_Checked=true;\r
1091 \r
1092                 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwShow)\r
1093                         AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);\r
1094         }\r
1095         \r
1096         int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
1097         for (int col = 0; col <= maxcol; col++)\r
1098         SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));\r
1099 \r
1100     SetRedraw(TRUE);\r
1101         GetStatisticsString();\r
1102 \r
1103         CHeaderCtrl * pHeader = GetHeaderCtrl();\r
1104         HDITEM HeaderItem = {0};\r
1105         HeaderItem.mask = HDI_FORMAT;\r
1106         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
1107         {\r
1108                 pHeader->GetItem(i, &HeaderItem);\r
1109                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
1110                 pHeader->SetItem(i, &HeaderItem);\r
1111         }\r
1112         if (m_nSortedColumn)\r
1113         {\r
1114                 pHeader->GetItem(m_nSortedColumn, &HeaderItem);\r
1115                 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
1116                 pHeader->SetItem(m_nSortedColumn, &HeaderItem);\r
1117         }\r
1118 \r
1119 #if 0\r
1120         if (nSelectedEntry)\r
1121         {\r
1122                 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);\r
1123                 EnsureVisible(nSelectedEntry, false);\r
1124         }\r
1125         else\r
1126         {\r
1127                 // Restore the item at the top of the list.\r
1128                 for (int i=0;GetTopIndex() != nTopIndex;i++)\r
1129                 {\r
1130                         if ( !EnsureVisible(nTopIndex+i,false) )\r
1131                         {\r
1132                                 break;\r
1133                         }\r
1134                 }\r
1135         }\r
1136 #endif\r
1137         if (pApp)\r
1138                 pApp->DoWaitCursor(-1);\r
1139 \r
1140         Invalidate();\r
1141         \r
1142         m_dwShow = dwShow;\r
1143 \r
1144 #if 0\r
1145 \r
1146         CWinApp * pApp = AfxGetApp();\r
1147         if (pApp)\r
1148                 pApp->DoWaitCursor(1);\r
1149 \r
1150         m_bShowFolders = bShowFolders;\r
1151         \r
1152         int nTopIndex = GetTopIndex();\r
1153         POSITION posSelectedEntry = GetFirstSelectedItemPosition();\r
1154         int nSelectedEntry = 0;\r
1155         if (posSelectedEntry)\r
1156                 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);\r
1157         SetRedraw(FALSE);\r
1158         DeleteAllItems();\r
1159 \r
1160         PrepareGroups();\r
1161 \r
1162         m_arListArray.clear();\r
1163 \r
1164         m_arListArray.reserve(m_arStatusArray.size());\r
1165         SetItemCount (static_cast<int>(m_arStatusArray.size()));\r
1166 \r
1167         int listIndex = 0;\r
1168         for (size_t i=0; i < m_arStatusArray.size(); ++i)\r
1169         {\r
1170                 FileEntry * entry = m_arStatusArray[i];\r
1171                 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))\r
1172                         continue;\r
1173                 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))\r
1174                         continue;\r
1175                 if (entry->IsFolder() && (!bShowFolders))\r
1176                         continue;       // don't show folders if they're not wanted.\r
1177 \r
1178 #if 0\r
1179                 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);\r
1180                 DWORD showFlags = GetShowFlagsFromGitStatus(status);\r
1181                 if (entry->IsLocked())\r
1182                         showFlags |= SVNSLC_SHOWLOCKS;\r
1183                 if (entry->switched)\r
1184                         showFlags |= SVNSLC_SHOWSWITCHED;\r
1185                 if (!entry->changelist.IsEmpty())\r
1186                         showFlags |= SVNSLC_SHOWINCHANGELIST;\r
1187 #endif\r
1188                 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0) \r
1189                         && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));\r
1190 \r
1191                 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item\r
1192 #if 0\r
1193                 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))\r
1194                 {\r
1195                         if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))\r
1196                         {\r
1197                                 if (PathFileExists(entry->GetPath().GetWinPath()))\r
1198                                 {\r
1199                                         m_arListArray.push_back(i);\r
1200                                         if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))\r
1201                                         {\r
1202                                                 if (bAllowCheck)\r
1203                                                         entry->checked = true;\r
1204                                         }\r
1205                                         AddEntry(entry, langID, listIndex++);\r
1206                                 }\r
1207                         }\r
1208                         else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))\r
1209                         {\r
1210                                 m_arListArray.push_back(i);\r
1211                                 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))\r
1212                                 {\r
1213                                         if (bAllowCheck)\r
1214                                                 entry->checked = true;\r
1215                                 }\r
1216                                 AddEntry(entry, langID, listIndex++);\r
1217                         }\r
1218                         else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))\r
1219                         {\r
1220                                 m_arListArray.push_back(i);\r
1221                                 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))\r
1222                                 {\r
1223                                         if (bAllowCheck)\r
1224                                                 entry->checked = true;\r
1225                                 }\r
1226                                 AddEntry(entry, langID, listIndex++);\r
1227                         }\r
1228                 }\r
1229 #endif\r
1230         }\r
1231 \r
1232         SetItemCount(listIndex);\r
1233 \r
1234     m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);\r
1235 \r
1236         int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
1237         for (int col = 0; col <= maxcol; col++)\r
1238         SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));\r
1239 \r
1240     SetRedraw(TRUE);\r
1241         GetStatisticsString();\r
1242 \r
1243         CHeaderCtrl * pHeader = GetHeaderCtrl();\r
1244         HDITEM HeaderItem = {0};\r
1245         HeaderItem.mask = HDI_FORMAT;\r
1246         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
1247         {\r
1248                 pHeader->GetItem(i, &HeaderItem);\r
1249                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
1250                 pHeader->SetItem(i, &HeaderItem);\r
1251         }\r
1252         if (m_nSortedColumn)\r
1253         {\r
1254                 pHeader->GetItem(m_nSortedColumn, &HeaderItem);\r
1255                 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
1256                 pHeader->SetItem(m_nSortedColumn, &HeaderItem);\r
1257         }\r
1258 \r
1259         if (nSelectedEntry)\r
1260         {\r
1261                 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);\r
1262                 EnsureVisible(nSelectedEntry, false);\r
1263         }\r
1264         else\r
1265         {\r
1266                 // Restore the item at the top of the list.\r
1267                 for (int i=0;GetTopIndex() != nTopIndex;i++)\r
1268                 {\r
1269                         if ( !EnsureVisible(nTopIndex+i,false) )\r
1270                         {\r
1271                                 break;\r
1272                         }\r
1273                 }\r
1274         }\r
1275 \r
1276         if (pApp)\r
1277                 pApp->DoWaitCursor(-1);\r
1278 \r
1279         m_bEmpty = (GetItemCount() == 0);\r
1280         Invalidate();\r
1281 #endif\r
1282 \r
1283 }\r
1284 \r
1285 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)\r
1286 {\r
1287         return ;\r
1288 #if 0\r
1289 \r
1290         Locker lock(m_critSec);\r
1291         WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
1292 \r
1293         CWinApp * pApp = AfxGetApp();\r
1294         if (pApp)\r
1295                 pApp->DoWaitCursor(1);\r
1296         m_dwShow = dwShow;\r
1297         m_bShowFolders = bShowFolders;\r
1298         m_nSelected = 0;\r
1299         int nTopIndex = GetTopIndex();\r
1300         POSITION posSelectedEntry = GetFirstSelectedItemPosition();\r
1301         int nSelectedEntry = 0;\r
1302         if (posSelectedEntry)\r
1303                 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);\r
1304         SetRedraw(FALSE);\r
1305         DeleteAllItems();\r
1306 \r
1307         PrepareGroups();\r
1308 \r
1309         m_arListArray.clear();\r
1310 \r
1311         m_arListArray.reserve(m_arStatusArray.size());\r
1312         SetItemCount (static_cast<int>(m_arStatusArray.size()));\r
1313 \r
1314         int listIndex = 0;\r
1315         for (size_t i=0; i < m_arStatusArray.size(); ++i)\r
1316         {\r
1317                 FileEntry * entry = m_arStatusArray[i];\r
1318                 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))\r
1319                         continue;\r
1320                 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))\r
1321                         continue;\r
1322                 if (entry->IsFolder() && (!bShowFolders))\r
1323                         continue;       // don't show folders if they're not wanted.\r
1324 #if 0\r
1325                 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);\r
1326                 DWORD showFlags = GetShowFlagsFromSVNStatus(status);\r
1327                 if (entry->IsLocked())\r
1328                         showFlags |= SVNSLC_SHOWLOCKS;\r
1329                 if (!entry->changelist.IsEmpty())\r
1330                         showFlags |= SVNSLC_SHOWINCHANGELIST;\r
1331 \r
1332                 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item\r
1333                 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))\r
1334                 {\r
1335                         for (int npath = 0; npath < checkedList.GetCount(); ++npath)\r
1336                         {\r
1337                                 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))\r
1338                                 {\r
1339                                         entry->checked = true;\r
1340                                         break;\r
1341                                 }\r
1342                         }\r
1343                         if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))\r
1344                         {\r
1345                                 if (PathFileExists(entry->GetPath().GetWinPath()))\r
1346                                 {\r
1347                                         m_arListArray.push_back(i);\r
1348                                         AddEntry(entry, langID, listIndex++);\r
1349                                 }\r
1350                         }\r
1351                         else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))\r
1352                         {\r
1353                                 m_arListArray.push_back(i);\r
1354                                 AddEntry(entry, langID, listIndex++);\r
1355                         }\r
1356                         else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))\r
1357                         {\r
1358                                 m_arListArray.push_back(i);\r
1359                                 AddEntry(entry, langID, listIndex++);\r
1360                         }\r
1361                         else if (entry->switched)\r
1362                         {\r
1363                                 m_arListArray.push_back(i);\r
1364                                 AddEntry(entry, langID, listIndex++);\r
1365                         }\r
1366                 }\r
1367 #endif\r
1368         }\r
1369 \r
1370         SetItemCount(listIndex);\r
1371 \r
1372         int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
1373         for (int col = 0; col <= maxcol; col++)\r
1374         SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));\r
1375 \r
1376     SetRedraw(TRUE);\r
1377         GetStatisticsString();\r
1378 \r
1379         CHeaderCtrl * pHeader = GetHeaderCtrl();\r
1380         HDITEM HeaderItem = {0};\r
1381         HeaderItem.mask = HDI_FORMAT;\r
1382         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
1383         {\r
1384                 pHeader->GetItem(i, &HeaderItem);\r
1385                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
1386                 pHeader->SetItem(i, &HeaderItem);\r
1387         }\r
1388         if (m_nSortedColumn)\r
1389         {\r
1390                 pHeader->GetItem(m_nSortedColumn, &HeaderItem);\r
1391                 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
1392                 pHeader->SetItem(m_nSortedColumn, &HeaderItem);\r
1393         }\r
1394 \r
1395         if (nSelectedEntry)\r
1396         {\r
1397                 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);\r
1398                 EnsureVisible(nSelectedEntry, false);\r
1399         }\r
1400         else\r
1401         {\r
1402                 // Restore the item at the top of the list.\r
1403                 for (int i=0;GetTopIndex() != nTopIndex;i++)\r
1404                 {\r
1405                         if ( !EnsureVisible(nTopIndex+i,false) )\r
1406                         {\r
1407                                 break;\r
1408                         }\r
1409                 }\r
1410         }\r
1411 \r
1412         if (pApp)\r
1413                 pApp->DoWaitCursor(-1);\r
1414 \r
1415         m_bEmpty = (GetItemCount() == 0);\r
1416         Invalidate();\r
1417 #endif\r
1418 \r
1419 }\r
1420 int CGitStatusListCtrl::GetColumnIndex(int mask)\r
1421 {\r
1422         int i=0;\r
1423         for(i=0;i<32;i++)\r
1424                 if(mask&0x1)\r
1425                         return i-1;\r
1426                 else\r
1427                         mask=mask>>1;\r
1428         return -1;\r
1429 }\r
1430 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)\r
1431 {\r
1432         static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));\r
1433         static HINSTANCE hResourceHandle(AfxGetResourceHandle());\r
1434 \r
1435         CString path = GitPath->GetGitPathString();\r
1436 \r
1437         m_bBlock = TRUE;\r
1438         TCHAR buf[100];\r
1439         int index = listIndex;\r
1440         int nCol = 1;\r
1441         CString entryname = GitPath->GetGitPathString();\r
1442         int icon_idx = 0;\r
1443 //      if (entry->isfolder)\r
1444 //              icon_idx = m_nIconFolder;\r
1445 //      else\r
1446         {\r
1447                 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);\r
1448         }\r
1449         // relative path\r
1450         CString rename;\r
1451         rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());\r
1452         if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
1453                 entryname+=rename;\r
1454         \r
1455         InsertItem(index, entryname, icon_idx);\r
1456 \r
1457         this->SetItemData(index, (DWORD_PTR)GitPath);\r
1458         // SVNSLC_COLFILENAME\r
1459         SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());\r
1460         // SVNSLC_COLEXT\r
1461         SetItemText(index, nCol++, GitPath->GetFileExtension());\r
1462         // SVNSLC_COLSTATUS\r
1463         SetItemText(index, nCol++, GitPath->GetActionName());\r
1464 \r
1465         SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);\r
1466         SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);\r
1467 \r
1468 \r
1469         SetCheck(index, GitPath->m_Checked);\r
1470         if (GitPath->m_Checked)\r
1471                 m_nSelected++;\r
1472 \r
1473 \r
1474         if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)\r
1475                 SetItemGroup(index, 2);\r
1476         else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)\r
1477                 SetItemGroup(index,1);\r
1478         else\r
1479                 SetItemGroup(index,0);\r
1480         m_bBlock = FALSE;\r
1481 \r
1482 \r
1483 }\r
1484 #if 0\r
1485 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)\r
1486 {\r
1487         static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));\r
1488         static HINSTANCE hResourceHandle(AfxGetResourceHandle());\r
1489 \r
1490         CString path = entry->GetPath().GetGitPathString();\r
1491         if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )\r
1492         {\r
1493                 // The user manually de-/selected an item. We now restore this status\r
1494                 // when refreshing.\r
1495                 entry->checked = m_mapFilenameToChecked[path];\r
1496         }\r
1497 \r
1498         m_bBlock = TRUE;\r
1499         TCHAR buf[100];\r
1500         int index = listIndex;\r
1501         int nCol = 1;\r
1502         CString entryname = entry->GetDisplayName();\r
1503         int icon_idx = 0;\r
1504         if (entry->isfolder)\r
1505                 icon_idx = m_nIconFolder;\r
1506         else\r
1507         {\r
1508                 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);\r
1509         }\r
1510         // relative path\r
1511         InsertItem(index, entryname, icon_idx);\r
1512         // SVNSLC_COLFILENAME\r
1513         SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());\r
1514         // SVNSLC_COLEXT\r
1515         SetItemText(index, nCol++, entry->path.GetFileExtension());\r
1516         // SVNSLC_COLSTATUS\r
1517         if (entry->isNested)\r
1518         {\r
1519                 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));\r
1520                 SetItemText(index, nCol++, sTemp);\r
1521         }\r
1522         else\r
1523         {\r
1524                 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1525                 if ((entry->copied)&&(_tcslen(buf)>1))\r
1526                         _tcscat_s(buf, 100, _T(" (+)"));\r
1527                 if ((entry->switched)&&(_tcslen(buf)>1))\r
1528                         _tcscat_s(buf, 100, _T(" (s)"));\r
1529 #if 0\r
1530                 if ((entry->status == entry->propstatus)&&\r
1531                         (entry->status != git_wc_status_normal)&&\r
1532                         (entry->status != git_wc_status_unversioned)&&\r
1533                         (!GitStatus::IsImportant(entry->textstatus)))\r
1534                         _tcscat_s(buf, 100, ponly);\r
1535 #endif\r
1536                 SetItemText(index, nCol++, buf);\r
1537         }\r
1538         // SVNSLC_COLREMOTESTATUS\r
1539         if (entry->isNested)\r
1540         {\r
1541                 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));\r
1542                 SetItemText(index, nCol++, sTemp);\r
1543         }\r
1544         else\r
1545         {\r
1546 #if 0\r
1547                 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1548                 if ((entry->copied)&&(_tcslen(buf)>1))\r
1549                         _tcscat_s(buf, 100, _T(" (+)"));\r
1550                 if ((entry->switched)&&(_tcslen(buf)>1))\r
1551                         _tcscat_s(buf, 100, _T(" (s)"));\r
1552                 if ((entry->remotestatus == entry->remotepropstatus)&&\r
1553                         (entry->remotestatus != git_wc_status_none)&&\r
1554                         (entry->remotestatus != git_wc_status_normal)&&\r
1555                         (entry->remotestatus != git_wc_status_unversioned)&&\r
1556                         (!SVNStatus::IsImportant(entry->remotetextstatus)))\r
1557                         _tcscat_s(buf, 100, ponly);\r
1558 #endif\r
1559                 SetItemText(index, nCol++, buf);\r
1560         }\r
1561         // SVNSLC_COLTEXTSTATUS\r
1562         if (entry->isNested)\r
1563         {\r
1564                 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));\r
1565                 SetItemText(index, nCol++, sTemp);\r
1566         }\r
1567         else\r
1568         {\r
1569 #if 0\r
1570                 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1571                 if ((entry->copied)&&(_tcslen(buf)>1))\r
1572                         _tcscat_s(buf, 100, _T(" (+)"));\r
1573                 if ((entry->switched)&&(_tcslen(buf)>1))\r
1574                         _tcscat_s(buf, 100, _T(" (s)"));\r
1575 #endif\r
1576                 SetItemText(index, nCol++, buf);\r
1577         }\r
1578         // SVNSLC_COLPROPSTATUS\r
1579         if (entry->isNested)\r
1580         {\r
1581                 SetItemText(index, nCol++, _T(""));\r
1582         }\r
1583         else\r
1584         {\r
1585 #if 0\r
1586                 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1587                 if ((entry->copied)&&(_tcslen(buf)>1))\r
1588                         _tcscat_s(buf, 100, _T(" (+)"));\r
1589                 if ((entry->switched)&&(_tcslen(buf)>1))\r
1590                         _tcscat_s(buf, 100, _T(" (s)"));\r
1591 #endif\r
1592                 SetItemText(index, nCol++, buf);\r
1593         }\r
1594         // SVNSLC_COLREMOTETEXT\r
1595         if (entry->isNested)\r
1596         {\r
1597                 SetItemText(index, nCol++, _T(""));\r
1598         }\r
1599         else\r
1600         {\r
1601 #if 0\r
1602                 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1603                 SetItemText(index, nCol++, buf);\r
1604 #endif\r
1605         }\r
1606         // SVNSLC_COLREMOTEPROP\r
1607         if (entry->isNested)\r
1608         {\r
1609                 SetItemText(index, nCol++, _T(""));\r
1610         }\r
1611         else\r
1612         {\r
1613 //              SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
1614                 SetItemText(index, nCol++, buf);\r
1615         }\r
1616         // SVNSLC_COLURL\r
1617 //      SetItemText(index, nCol++, entry->url);\r
1618         // SVNSLC_COLLOCK\r
1619 #if 0\r
1620         if (!m_HeadRev.IsHead())\r
1621         {\r
1622                 // we have contacted the repository\r
1623 \r
1624                 // decision-matrix\r
1625                 // wc           repository              text\r
1626                 // ""           ""                              ""\r
1627                 // ""           UID1                    owner\r
1628                 // UID1         UID1                    owner\r
1629                 // UID1         ""                              lock has been broken\r
1630                 // UID1         UID2                    lock has been stolen\r
1631                 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))\r
1632                 {\r
1633                         if (entry->lock_owner.IsEmpty())\r
1634                                 SetItemText(index, nCol++, entry->lock_remoteowner);\r
1635                         else\r
1636                                 SetItemText(index, nCol++, entry->lock_owner);\r
1637                 }\r
1638                 else if (entry->lock_remotetoken.IsEmpty())\r
1639                 {\r
1640                         // broken lock\r
1641                         CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));\r
1642                         SetItemText(index, nCol++, temp);\r
1643                 }\r
1644                 else\r
1645                 {\r
1646                         // stolen lock\r
1647                         CString temp;\r
1648                         temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);\r
1649                         SetItemText(index, nCol++, temp);\r
1650                 }\r
1651         }\r
1652         else\r
1653                 SetItemText(index, nCol++, entry->lock_owner);\r
1654         // SVNSLC_COLLOCKCOMMENT\r
1655         SetItemText(index, nCol++, entry->lock_comment);\r
1656         // SVNSLC_COLAUTHOR\r
1657         SetItemText(index, nCol++, entry->last_commit_author);\r
1658         // SVNSLC_COLREVISION\r
1659         CString temp;\r
1660         temp.Format(_T("%ld"), entry->last_commit_rev);\r
1661         if (entry->last_commit_rev > 0)\r
1662                 SetItemText(index, nCol++, temp);\r
1663         else\r
1664                 SetItemText(index, nCol++, _T(""));\r
1665         // SVNSLC_COLREMOTEREVISION\r
1666         temp.Format(_T("%ld"), entry->remoterev);\r
1667         if (entry->remoterev > 0)\r
1668                 SetItemText(index, nCol++, temp);\r
1669         else\r
1670                 SetItemText(index, nCol++, _T(""));\r
1671         // SVNSLC_COLDATE\r
1672         TCHAR datebuf[SVN_DATE_BUFFER];\r
1673         apr_time_t date = entry->last_commit_date;\r
1674         SVN::formatDate(datebuf, date, true);\r
1675         if (date)\r
1676                 SetItemText(index, nCol++, datebuf);\r
1677         else\r
1678                 SetItemText(index, nCol++, _T(""));\r
1679         // SVNSLC_COLSVNNEEDSLOCK\r
1680     BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();\r
1681         CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");\r
1682         SetItemText(index, nCol++, strSVNNeedsLock);\r
1683         // SVNSLC_COLCOPYFROM\r
1684         if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)\r
1685                 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());\r
1686         else\r
1687                 temp = entry->copyfrom_url;\r
1688         SetItemText(index, nCol++, temp);\r
1689         // SVNSLC_COLMODIFICATIONDATE\r
1690         __int64 filetime = entry->GetPath().GetLastWriteTime();\r
1691         if ( (filetime) && (entry->status!=git_wc_status_deleted) )\r
1692         {\r
1693                 FILETIME* f = (FILETIME*)(__int64*)&filetime;\r
1694                 TCHAR datebuf[SVN_DATE_BUFFER];\r
1695                 SVN::formatDate(datebuf,*f,true);\r
1696                 SetItemText(index, nCol++, datebuf);\r
1697         }\r
1698         else\r
1699         {\r
1700                 SetItemText(index, nCol++, _T(""));\r
1701         }\r
1702 \r
1703     // user-defined properties\r
1704     for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()\r
1705         ; i < count\r
1706         ; ++i)\r
1707     {\r
1708         assert (i == nCol++);\r
1709         assert (m_ColumnManager.IsUserProp (i));\r
1710 \r
1711         CString name = m_ColumnManager.GetName(i);\r
1712         if (entry->present_props.HasProperty (name))\r
1713                 {\r
1714                         const CString& propVal = entry->present_props [name];\r
1715                         if (propVal.IsEmpty())\r
1716                                 SetItemText(index, i, m_sNoPropValueText);\r
1717                         else\r
1718                                 SetItemText(index, i, propVal);\r
1719                 }\r
1720                 else\r
1721             SetItemText(index, i, _T(""));\r
1722     }\r
1723 \r
1724         SetCheck(index, entry->checked);\r
1725         if (entry->checked)\r
1726                 m_nSelected++;\r
1727         if (m_changelists.find(entry->changelist) != m_changelists.end())\r
1728                 SetItemGroup(index, m_changelists[entry->changelist]);\r
1729         else\r
1730                 SetItemGroup(index, 0);\r
1731         m_bBlock = FALSE;\r
1732 #endif\r
1733 }\r
1734 #endif\r
1735 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)\r
1736 {\r
1737 //      if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)\r
1738 //              return false;\r
1739         if (groupindex < 0)\r
1740                 return false;\r
1741         LVITEM i = {0};\r
1742         i.mask = LVIF_GROUPID;\r
1743         i.iItem = item;\r
1744         i.iSubItem = 0;\r
1745         i.iGroupId = groupindex;\r
1746 \r
1747         return !!SetItem(&i);\r
1748 }\r
1749 \r
1750 void CGitStatusListCtrl::Sort()\r
1751 {\r
1752         Locker lock(m_critSec);\r
1753 \r
1754     CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);\r
1755 \r
1756         std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);\r
1757         SaveColumnWidths();\r
1758         Show(m_dwShow, 0, m_bShowFolders);\r
1759 \r
1760 }\r
1761 \r
1762 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)\r
1763 {\r
1764         LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
1765         *pResult = 0;\r
1766         if (m_bBlock)\r
1767                 return;\r
1768         m_bBlock = TRUE;\r
1769         if (m_nSortedColumn == phdr->iItem)\r
1770                 m_bAscending = !m_bAscending;\r
1771         else\r
1772                 m_bAscending = TRUE;\r
1773         m_nSortedColumn = phdr->iItem;\r
1774         m_mapFilenameToChecked.clear();\r
1775         Sort();\r
1776 \r
1777         CHeaderCtrl * pHeader = GetHeaderCtrl();\r
1778         HDITEM HeaderItem = {0};\r
1779         HeaderItem.mask = HDI_FORMAT;\r
1780         for (int i=0; i<pHeader->GetItemCount(); ++i)\r
1781         {\r
1782                 pHeader->GetItem(i, &HeaderItem);\r
1783                 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);\r
1784                 pHeader->SetItem(i, &HeaderItem);\r
1785         }\r
1786         pHeader->GetItem(m_nSortedColumn, &HeaderItem);\r
1787         HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);\r
1788         pHeader->SetItem(m_nSortedColumn, &HeaderItem);\r
1789 \r
1790         // the checked state of the list control items must be restored\r
1791 \r
1792         for (int i=0; i<GetItemCount(); ++i)\r
1793         {\r
1794                 CTGitPath * entry = (CTGitPath*)GetItemData(i);\r
1795                 ASSERT(entry);\r
1796                 if(entry)\r
1797                         SetCheck(i, entry->m_Checked);\r
1798         }\r
1799 \r
1800         m_bBlock = FALSE;\r
1801 }\r
1802 \r
1803 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)\r
1804 {\r
1805         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
1806         *pResult = 0;\r
1807 \r
1808 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)\r
1809         if ((m_bBlock)&&(m_bBlockUI))\r
1810         {\r
1811                 // if we're blocked, prevent changing of the check state\r
1812                 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||\r
1813                         (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))\r
1814                         *pResult = TRUE;\r
1815         }\r
1816 }\r
1817 \r
1818 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)\r
1819 {\r
1820         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
1821         *pResult = 0;\r
1822         if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))\r
1823                 return FALSE;\r
1824 \r
1825         if (m_bBlock)\r
1826                 return FALSE;\r
1827 \r
1828         bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);\r
1829         int nListItems = GetItemCount();\r
1830 \r
1831         m_bBlock = TRUE;\r
1832         // was the item checked?\r
1833         \r
1834         //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);\r
1835         //gitpath->m_Checked=GetCheck(pNMLV->iItem);\r
1836 \r
1837         if (GetCheck(pNMLV->iItem))\r
1838         {\r
1839                 CheckEntry(pNMLV->iItem, nListItems);\r
1840                 if (bSelected)\r
1841                 {\r
1842                         POSITION pos = GetFirstSelectedItemPosition();\r
1843                         int index;\r
1844                         while ((index = GetNextSelectedItem(pos)) >= 0)\r
1845                         {\r
1846                                 if (index != pNMLV->iItem)\r
1847                                         CheckEntry(index, nListItems);\r
1848                         }\r
1849                 }\r
1850         }\r
1851         else\r
1852         {\r
1853                 UncheckEntry(pNMLV->iItem, nListItems);\r
1854                 if (bSelected)\r
1855                 {\r
1856                         POSITION pos = GetFirstSelectedItemPosition();\r
1857                         int index;\r
1858                         while ((index = GetNextSelectedItem(pos)) >= 0)\r
1859                         {\r
1860                                 if (index != pNMLV->iItem)\r
1861                                         UncheckEntry(index, nListItems);\r
1862                         }\r
1863                 }\r
1864         }\r
1865 \r
1866         GetStatisticsString();\r
1867         m_bBlock = FALSE;\r
1868         NotifyCheck();\r
1869 \r
1870         return FALSE;\r
1871 }\r
1872 \r
1873 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)\r
1874 {\r
1875         LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
1876     if (   (header != NULL) \r
1877         && (header->iItem >= 0) \r
1878         && (header->iItem < m_ColumnManager.GetColumnCount()))\r
1879     {\r
1880         m_ColumnManager.ColumnResized (header->iItem);\r
1881     }\r
1882 \r
1883     *pResult = FALSE;\r
1884 }\r
1885 \r
1886 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)\r
1887 {\r
1888         LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
1889         *pResult = TRUE;\r
1890     if (   (header != NULL) \r
1891         && (header->iItem >= 0) \r
1892         && (header->iItem < m_ColumnManager.GetColumnCount())\r
1893                 // only allow the reordering if the column was not moved left of the first\r
1894                 // visible item - otherwise the 'invisible' columns are not at the far left\r
1895                 // anymore and we get all kinds of redrawing problems.\r
1896                 && (header->pitem)\r
1897                 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))\r
1898     {\r
1899         m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);\r
1900                 *pResult = FALSE;\r
1901     }\r
1902 \r
1903     Invalidate(FALSE);\r
1904 }\r
1905 \r
1906 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)\r
1907 {\r
1908         Locker lock(m_critSec);\r
1909         //FileEntry * entry = GetListEntry(index);\r
1910         CTGitPath *path=(CTGitPath*)GetItemData(index);\r
1911         ASSERT(path != NULL);\r
1912         if (path == NULL)\r
1913                 return;\r
1914         SetCheck(index, TRUE);\r
1915         //entry = GetListEntry(index);\r
1916         // if an unversioned item was checked, then we need to check if\r
1917         // the parent folders are unversioned too. If the parent folders actually\r
1918         // are unversioned, then check those too.\r
1919 #if 0\r
1920         if (entry->status == git_wc_status_unversioned)\r
1921         {\r
1922                 // we need to check the parent folder too\r
1923                 const CTGitPath& folderpath = entry->path;\r
1924                 for (int i=0; i< nListItems; ++i)\r
1925                 {\r
1926                         FileEntry * testEntry = GetListEntry(i);\r
1927                         ASSERT(testEntry != NULL);\r
1928                         if (testEntry == NULL)\r
1929                                 continue;\r
1930                         if (!testEntry->checked)\r
1931                         {\r
1932                                 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))\r
1933                                 {\r
1934                                         SetEntryCheck(testEntry,i,true);\r
1935                                         m_nSelected++;\r
1936                                 }\r
1937                         }\r
1938                 }\r
1939         }\r
1940         bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);\r
1941         if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )\r
1942         {\r
1943                 // if a deleted folder gets checked, we have to check all\r
1944                 // children of that folder too.\r
1945                 if (entry->path.IsDirectory())\r
1946                 {\r
1947                         SetCheckOnAllDescendentsOf(entry, true);\r
1948                 }\r
1949 \r
1950                 // if a deleted file or folder gets checked, we have to\r
1951                 // check all parents of this item too.\r
1952                 for (int i=0; i<nListItems; ++i)\r
1953                 {\r
1954                         FileEntry * testEntry = GetListEntry(i);\r
1955                         ASSERT(testEntry != NULL);\r
1956                         if (testEntry == NULL)\r
1957                                 continue;\r
1958                         if (!testEntry->checked)\r
1959                         {\r
1960                                 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))\r
1961                                 {\r
1962                                         if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))\r
1963                                         {\r
1964                                                 SetEntryCheck(testEntry,i,true);\r
1965                                                 m_nSelected++;\r
1966                                                 // now we need to check all children of this parent folder\r
1967                                                 SetCheckOnAllDescendentsOf(testEntry, true);\r
1968                                         }\r
1969                                 }\r
1970                         }\r
1971                 }\r
1972         }\r
1973 #endif\r
1974         if ( !path->m_Checked )\r
1975         {\r
1976                 path->m_Checked = TRUE;\r
1977                 m_nSelected++;\r
1978         }\r
1979 }\r
1980 \r
1981 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)\r
1982 {\r
1983         Locker lock(m_critSec);\r
1984         CTGitPath *path=(CTGitPath*)GetItemData(index);\r
1985         ASSERT(path != NULL);\r
1986         if (path == NULL)\r
1987                 return;\r
1988         SetCheck(index, FALSE);\r
1989         //entry = GetListEntry(index);\r
1990         // item was unchecked\r
1991 #if 0\r
1992         if (entry->path.IsDirectory())\r
1993         {\r
1994                 // disable all files within an unselected folder, except when unchecking a folder with property changes\r
1995                 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);\r
1996                 if ( (entry->status != git_wc_status_modified) || (bShift) )\r
1997                 {\r
1998                         SetCheckOnAllDescendentsOf(entry, false);\r
1999                 }\r
2000         }\r
2001         else if (entry->status == git_wc_status_deleted)\r
2002         {\r
2003                 // a "deleted" file was unchecked, so uncheck all parent folders\r
2004                 // and all children of those parents\r
2005                 for (int i=0; i<nListItems; i++)\r
2006                 {\r
2007                         FileEntry * testEntry = GetListEntry(i);\r
2008                         ASSERT(testEntry != NULL);\r
2009                         if (testEntry == NULL)\r
2010                                 continue;\r
2011                         if (testEntry->checked)\r
2012                         {\r
2013                                 if (testEntry->path.IsAncestorOf(entry->path))\r
2014                                 {\r
2015                                         if (testEntry->status == git_wc_status_deleted)\r
2016                                         {\r
2017                                                 SetEntryCheck(testEntry,i,false);\r
2018                                                 m_nSelected--;\r
2019 \r
2020                                                 SetCheckOnAllDescendentsOf(testEntry, false);\r
2021                                         }\r
2022                                 }\r
2023                         }\r
2024                 }\r
2025         }\r
2026 #endif\r
2027         if ( path->m_Checked )\r
2028         {\r
2029                 path->m_Checked  = FALSE;\r
2030                 m_nSelected--;\r
2031         }\r
2032 }\r
2033 #if 0\r
2034 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)\r
2035 {\r
2036         return pEntry1->path < pEntry2->path;\r
2037 }\r
2038 \r
2039 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)\r
2040 {\r
2041         return pEntry1->status != git_wc_status_unversioned;\r
2042 }\r
2043 #endif\r
2044 bool CGitStatusListCtrl::BuildStatistics()\r
2045 {\r
2046 \r
2047         bool bRefetchStatus = false;\r
2048 \r
2049         // now gather some statistics\r
2050         m_nUnversioned = 0;\r
2051         m_nNormal = 0;\r
2052         m_nModified = 0;\r
2053         m_nAdded = 0;\r
2054         m_nDeleted = 0;\r
2055         m_nConflicted = 0;\r
2056         m_nTotal = 0;\r
2057         m_nSelected = 0;\r
2058         \r
2059         for (int i=0; i < (int)m_arStatusArray.size(); ++i)\r
2060         {\r
2061                 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;\r
2062 \r
2063                 if(status&CTGitPath::LOGACTIONS_ADDED)\r
2064                         m_nAdded++;\r
2065                 \r
2066                 if(status&CTGitPath::LOGACTIONS_DELETED)\r
2067                         m_nDeleted++;\r
2068                 \r
2069                 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))\r
2070                         m_nModified++;\r
2071                 \r
2072                 if(status&CTGitPath::LOGACTIONS_UNMERGED)\r
2073                         m_nConflicted++;\r
2074                 \r
2075                 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))\r
2076                         m_nUnversioned++;\r
2077         \r
2078         \r
2079 \r
2080 //                      } // switch (entry->status)\r
2081 //              } // if (entry)\r
2082         } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)\r
2083         return !bRefetchStatus;\r
2084 \r
2085         return FALSE;\r
2086 }\r
2087 \r
2088 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)\r
2089 {\r
2090 #if 0\r
2091         Locker lock(m_critSec);\r
2092         rMin = LONG_MAX;\r
2093         rMax = 0;\r
2094 \r
2095         if ((bShownOnly)||(bCheckedOnly))\r
2096         {\r
2097                 for (int i=0; i<GetItemCount(); ++i)\r
2098                 {\r
2099                         const FileEntry * entry = GetListEntry(i);\r
2100 \r
2101                         if ((entry)&&(entry->last_commit_rev))\r
2102                         {\r
2103                                 if ((!bCheckedOnly)||(entry->IsChecked()))\r
2104                                 {\r
2105                                         if (entry->last_commit_rev >= 0)\r
2106                                         {\r
2107                                                 rMin = min(rMin, entry->last_commit_rev);\r
2108                                                 rMax = max(rMax, entry->last_commit_rev);\r
2109                                         }\r
2110                                 }\r
2111                         }\r
2112                 }\r
2113         }\r
2114         else\r
2115         {\r
2116                 for (int i=0; i < (int)m_arStatusArray.size(); ++i)\r
2117                 {\r
2118                         const FileEntry * entry = m_arStatusArray[i];\r
2119                         if ((entry)&&(entry->last_commit_rev))\r
2120                         {\r
2121                                 if (entry->last_commit_rev >= 0)\r
2122                                 {\r
2123                                         rMin = min(rMin, entry->last_commit_rev);\r
2124                                         rMax = max(rMax, entry->last_commit_rev);\r
2125                                 }\r
2126                         }\r
2127                 }\r
2128         }\r
2129         if (rMin == LONG_MAX)\r
2130                 rMin = 0;\r
2131 #endif\r
2132 }\r
2133 \r
2134 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)\r
2135 {\r
2136         // the point must be relative to the upper left corner of the control\r
2137 \r
2138         if (ppt == NULL)\r
2139                 return -1;\r
2140         if (!IsGroupViewEnabled())\r
2141                 return -1;\r
2142 \r
2143         POINT pt = *ppt;\r
2144         pt.x = 10;\r
2145         UINT flags = 0;\r
2146         int nItem = -1;\r
2147         RECT rc;\r
2148         GetWindowRect(&rc);\r
2149         while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))\r
2150         {\r
2151                 nItem = HitTest(pt, &flags);\r
2152                 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))\r
2153                 {\r
2154                         // the first item below the point\r
2155 \r
2156                         // check if the point is too much right (i.e. if the point\r
2157                         // is farther to the right than the width of the item)\r
2158                         RECT r;\r
2159                         GetItemRect(nItem, &r, LVIR_LABEL);\r
2160                         if (ppt->x > r.right)\r
2161                                 return -1;\r
2162 \r
2163                         LVITEM lv = {0};\r
2164                         lv.mask = LVIF_GROUPID;\r
2165                         lv.iItem = nItem;\r
2166                         GetItem(&lv);\r
2167                         int groupID = lv.iGroupId;\r
2168                         // now we search upwards and check if the item above this one\r
2169                         // belongs to another group. If it belongs to the same group,\r
2170                         // we're not over a group header\r
2171                         while (pt.y >= 0)\r
2172                         {\r
2173                                 pt.y -= 2;\r
2174                                 nItem = HitTest(pt, &flags);\r
2175                                 if ((flags & LVHT_ONITEM)&&(nItem >= 0))\r
2176                                 {\r
2177                                         // the first item below the point\r
2178                                         LVITEM lv = {0};\r
2179                                         lv.mask = LVIF_GROUPID;\r
2180                                         lv.iItem = nItem;\r
2181                                         GetItem(&lv);\r
2182                                         if (lv.iGroupId != groupID)\r
2183                                                 return groupID;\r
2184                                         else\r
2185                                                 return -1;\r
2186                                 }\r
2187                         }\r
2188                         if (pt.y < 0)\r
2189                                 return groupID;\r
2190                         return -1;\r
2191                 }\r
2192                 pt.y += 2;\r
2193         };\r
2194         return -1;\r
2195 }\r
2196 \r
2197 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)\r
2198 {\r
2199         POINT clientpoint = point;\r
2200         ScreenToClient(&clientpoint);\r
2201         if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))\r
2202         {\r
2203                 CMenu popup;\r
2204                 if (popup.CreatePopupMenu())\r
2205                 {\r
2206                         CString temp;\r
2207                         temp.LoadString(IDS_STATUSLIST_CHECKGROUP);\r
2208                         popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);\r
2209                         temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);\r
2210                         popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);\r
2211                         int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
2212                         bool bCheck = false;\r
2213                         switch (cmd)\r
2214                         {\r
2215                         case IDSVNLC_CHECKGROUP:\r
2216                                 bCheck = true;\r
2217                                 // fall through here\r
2218                         case IDSVNLC_UNCHECKGROUP:\r
2219                                 {\r
2220                                         int group = GetGroupFromPoint(&clientpoint);\r
2221                                         // go through all items and check/uncheck those assigned to the group\r
2222                                         // but block the OnLvnItemChanged handler\r
2223                                         m_bBlock = true;\r
2224                                         LVITEM lv;\r
2225                                         for (int i=0; i<GetItemCount(); ++i)\r
2226                                         {\r
2227                                                 SecureZeroMemory(&lv, sizeof(LVITEM));\r
2228                                                 lv.mask = LVIF_GROUPID;\r
2229                                                 lv.iItem = i;\r
2230                                                 GetItem(&lv);\r
2231 #if 0\r
2232                                                 if (lv.iGroupId == group)\r
2233                                                 {\r
2234                                                         FileEntry * entry = GetListEntry(i);\r
2235                                                         if (entry)\r
2236                                                         {\r
2237                                                                 bool bOldCheck = !!GetCheck(i);\r
2238                                                                 //SetEntryCheck(entry, i, bCheck);\r
2239                                                                 if (bCheck != bOldCheck)\r
2240                                                                 {\r
2241                                                                         if (bCheck)\r
2242                                                                                 m_nSelected++;\r
2243                                                                         else\r
2244                                                                                 m_nSelected--;\r
2245                                                                 }\r
2246                                                         }\r
2247                                                 }\r
2248 #endif\r
2249                                         }\r
2250                                         GetStatisticsString();\r
2251                                         NotifyCheck();\r
2252                                         m_bBlock = false;\r
2253                                 }\r
2254                                 break;\r
2255                         }\r
2256                 }\r
2257         }\r
2258 }\r
2259 \r
2260 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)\r
2261 {\r
2262 \r
2263         WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
2264 \r
2265         bool XPorLater = false;\r
2266         OSVERSIONINFOEX inf;\r
2267         SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));\r
2268         inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);\r
2269         GetVersionEx((OSVERSIONINFO *)&inf);\r
2270         WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);\r
2271         if (fullver >= 0x0501)\r
2272                 XPorLater = true;\r
2273         bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);\r
2274         CTGitPath * filepath;\r
2275 \r
2276         int selIndex = GetSelectionMark();\r
2277         if ((point.x == -1) && (point.y == -1))\r
2278         {\r
2279                 CRect rect;\r
2280                 GetItemRect(selIndex, &rect, LVIR_LABEL);\r
2281                 ClientToScreen(&rect);\r
2282                 point = rect.CenterPoint();\r
2283         }\r
2284         if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))\r
2285         {\r
2286                 // nothing selected could mean the context menu is requested for\r
2287                 // a group header\r
2288                 OnContextMenuGroup(pWnd, point);\r
2289         }\r
2290         else if (selIndex >= 0)\r
2291         {\r
2292                 //FileEntry * entry = GetListEntry(selIndex);\r
2293 \r
2294                 filepath = (CTGitPath * )GetItemData(selIndex);\r
2295 \r
2296                 ASSERT(filepath != NULL);\r
2297                 if (filepath == NULL)\r
2298                         return;\r
2299 \r
2300                 //const CTGitPath& filepath = entry->path;\r
2301                 int wcStatus = filepath->m_Action;\r
2302                 // entry is selected, now show the popup menu\r
2303                 Locker lock(m_critSec);\r
2304                 CIconMenu popup;\r
2305                 CMenu changelistSubMenu;\r
2306                 CMenu ignoreSubMenu;\r
2307                 if (popup.CreatePopupMenu())\r
2308                 {\r
2309                         //Add Menu for verion controled file\r
2310                 \r
2311                         if (wcStatus & CTGitPath::LOGACTIONS_UNMERGED)\r
2312                         {\r
2313                                 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)\r
2314                                 {\r
2315                                         popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);\r
2316                                 }\r
2317                                 if (m_dwContextMenus & SVNSLC_POPRESOLVE)\r
2318                                 {\r
2319                                         popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);\r
2320                                 }\r
2321                                 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)\r
2322                                 {\r
2323                                         //popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);\r
2324                                         //popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);\r
2325                                 }\r
2326                                 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))\r
2327                                         popup.AppendMenu(MF_SEPARATOR);\r
2328                         }\r
2329 \r
2330                         if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))\r
2331                         {\r
2332                                 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)\r
2333                                 {\r
2334                                         popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);\r
2335                                         popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);\r
2336                                 }\r
2337                                 //Select one items\r
2338                                 if (GetSelectedCount() == 1)\r
2339                                 {\r
2340                                         bool bEntryAdded = false;\r
2341                                         //if (entry->remotestatus <= git_wc_status_normal)\r
2342                                         //{\r
2343                                         //      if (wcStatus > git_wc_status_normal)\r
2344                                         //      {\r
2345                                         //              if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))\r
2346                                         //              {\r
2347                                         if(!g_Git.IsInitRepos())\r
2348                                                 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);\r
2349 \r
2350                                         bEntryAdded = true;\r
2351                                         //              }\r
2352                                         //      }\r
2353                                         //\r
2354                                         //}\r
2355                                         //else if (wcStatus != git_wc_status_deleted)\r
2356                                         //{\r
2357                                         //      if (m_dwContextMenus & SVNSLC_POPCOMPARE)\r
2358                                         //      {\r
2359                                         //              popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);\r
2360                                         //              popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);\r
2361                                         //              bEntryAdded = true;\r
2362                                         //      }\r
2363                                         //      if (m_dwContextMenus & SVNSLC_POPGNUDIFF)\r
2364                                         //      {\r
2365                                         //              popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);\r
2366                                         //              bEntryAdded = true;\r
2367                                         //      }\r
2368                                         //}\r
2369                                         if (bEntryAdded)\r
2370                                                 popup.AppendMenu(MF_SEPARATOR);\r
2371                                 }\r
2372                                 //else if (GetSelectedCount() > 1)  \r
2373                                 //{\r
2374                                 //      if (m_dwContextMenus & SVNSLC_POPCOMMIT)\r
2375                                 //      {\r
2376                                 //              popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);\r
2377                                 //              popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);\r
2378                                 //      }\r
2379                                 //}\r
2380                         }\r
2381                         \r
2382         \r
2383                         ///Select Multi item\r
2384                         //if (GetSelectedCount() > 0)\r
2385                         //{\r
2386                         //      if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))\r
2387                         //      {\r
2388                         //              POSITION pos = GetFirstSelectedItemPosition();\r
2389                         //              int index = GetNextSelectedItem(pos);\r
2390                         //              if (index >= 0)\r
2391                         //              {\r
2392                         //                      FileEntry * entry = GetListEntry(index);\r
2393                         //                      git_wc_status_kind status1 = git_wc_status_none;\r
2394                         //                      git_wc_status_kind status2 = git_wc_status_none;\r
2395                         //                      if (entry)\r
2396                         //                              status1 = entry->status;\r
2397                         //                      index = GetNextSelectedItem(pos);\r
2398                         //                      if (index >= 0)\r
2399                         //                      {\r
2400                         //                              entry = GetListEntry(index);\r
2401                         //                              if (entry)\r
2402                         //                                      status2 = entry->status;\r
2403                         //                              if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||\r
2404                         //                                      (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))\r
2405                         //                              {\r
2406                         //                                      popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);\r
2407                         //                              }\r
2408                         //                      }\r
2409                         //              }\r
2410                         //      }\r
2411                         //      if (wcStatus > git_wc_status_normal)\r
2412                         //      {\r
2413                         //              if (m_dwContextMenus & SVNSLC_POPREVERT)\r
2414                         //              {\r
2415                         //                      // reverting missing folders is not possible\r
2416                         //                      if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))\r
2417                         //                      {\r
2418                         //                              popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);\r
2419                         //                      }\r
2420                         //              }\r
2421                         //      }\r
2422                         //      if (entry->remotestatus > git_wc_status_normal)\r
2423                         //      {\r
2424                         //              if (m_dwContextMenus & SVNSLC_POPUPDATE)\r
2425                         //              {\r
2426                         //                      popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);\r
2427                         //              }\r
2428                         //      }\r
2429                         //}\r
2430                         if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))\r
2431                                 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))\r
2432                         {\r
2433                                 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)\r
2434                                 {\r
2435                                         popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);\r
2436                                 }\r
2437                                 if (m_dwContextMenus & SVNSLC_POPBLAME)\r
2438                                 {\r
2439                                         popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);\r
2440                                 }\r
2441                         }\r
2442 //                      if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))\r
2443 //                      {\r
2444                                 if (m_dwContextMenus & SVNSLC_POPOPEN)\r
2445                                 {\r
2446                                         popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);\r
2447                                         popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);\r
2448                                 }\r
2449                                 if (m_dwContextMenus & SVNSLC_POPEXPLORE)\r
2450                                 {\r
2451                                         popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);\r
2452                                 }\r
2453 //                      }\r
2454                         if (GetSelectedCount() > 0)\r
2455                         {\r
2456 //                              if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))\r
2457 //                              {\r
2458 //                                      popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);\r
2459 //                              }\r
2460 //                              if ((wcStatus != Git_wc_status_unversioned)&&(wcStatus != git_wc_status_ignored)&&(wcStatus != Git_wc_status_deleted)&&(wcStatus != Git_wc_status_added)&&(m_dwContextMenus & GitSLC_POPDELETE))\r
2461 //                              {\r
2462 //                                      if (bShift)\r
2463 //                                              popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);\r
2464 //                                      else\r
2465 //                                              popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);\r
2466 //                              }\r
2467                                 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)\r
2468                                 {\r
2469                                         if (m_dwContextMenus & SVNSLC_POPADD)\r
2470                                         {\r
2471                                                 //if ( entry->IsFolder() )\r
2472                                                 //{\r
2473                                                 //      popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);\r
2474                                                 //}\r
2475                                                 //else\r
2476                                                 {\r
2477                                                         popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);\r
2478                                                 }\r
2479                                         }\r
2480                                 //}\r
2481                                 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )\r
2482                                 //{\r
2483                                         if (m_dwContextMenus & SVNSLC_POPIGNORE)\r
2484                                         {\r
2485 \r
2486                                                 CTGitPathList ignorelist;\r
2487                                                 FillListOfSelectedItemPaths(ignorelist);\r
2488                                                 //check if all selected entries have the same extension\r
2489                                                 bool bSameExt = true;\r
2490                                                 CString sExt;\r
2491                                                 for (int i=0; i<ignorelist.GetCount(); ++i)\r
2492                                                 {\r
2493                                                         if (sExt.IsEmpty() && (i==0))\r
2494                                                                 sExt = ignorelist[i].GetFileExtension();\r
2495                                                         else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)\r
2496                                                                 bSameExt = false;\r
2497                                                 }\r
2498                                                 if (bSameExt)\r
2499                                                 {\r
2500                                                         if (ignoreSubMenu.CreateMenu())\r
2501                                                         {\r
2502                                                                 CString ignorepath;\r
2503                                                                 if (ignorelist.GetCount()==1)\r
2504                                                                         ignorepath = ignorelist[0].GetFileOrDirectoryName();\r
2505                                                                 else\r
2506                                                                         ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());\r
2507                                                                 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);\r
2508                                                                 ignorepath = _T("*")+sExt;\r
2509                                                                 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);\r
2510                                                                 CString temp;\r
2511                                                                 temp.LoadString(IDS_MENUIGNORE);\r
2512                                                                 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);\r
2513                                                         }\r
2514                                                 }\r
2515                                                 else\r
2516                                                 {\r
2517                                                         CString temp;\r
2518                                                         if (ignorelist.GetCount()==1)\r
2519                                                         {\r
2520                                                                 temp.LoadString(IDS_MENUIGNORE);\r
2521                                                         }\r
2522                                                         else\r
2523                                                         {\r
2524                                                                 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());\r
2525                                                         }\r
2526                                                         popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);\r
2527                                                 }\r
2528                                         }\r
2529                                 }\r
2530                         }\r
2531 \r
2532 \r
2533 #if 0                   \r
2534                         if (GetSelectedCount() > 0)\r
2535                         {\r
2536 \r
2537                                 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)\r
2538                                         &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)\r
2539                                         &&(wcStatus!=git_wc_status_added))\r
2540                                 {\r
2541                                         popup.AppendMenu(MF_SEPARATOR);\r
2542                                         if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))\r
2543                                         {\r
2544                                                 if (m_dwContextMenus & SVNSLC_POPLOCK)\r
2545                                                 {\r
2546                                                         popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);\r
2547                                                 }\r
2548                                         }\r
2549                                         if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))\r
2550                                         {\r
2551                                                 if (m_dwContextMenus & SVNSLC_POPUNLOCK)\r
2552                                                 {\r
2553                                                         popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);\r
2554                                                 }\r
2555                                         }\r
2556                                 }\r
2557 \r
2558                                 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))\r
2559                                 {\r
2560                                         if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)\r
2561                                         {\r
2562                                                 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);\r
2563                                         }\r
2564                                 }\r
2565 \r
2566                                 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)\r
2567                                 {\r
2568                                         popup.AppendMenu(MF_SEPARATOR);\r
2569                                         popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);\r
2570                                 }\r
2571                                 popup.AppendMenu(MF_SEPARATOR);\r
2572                                 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);\r
2573                                 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);\r
2574                                 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)\r
2575                                         &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))\r
2576                                 {\r
2577                                         popup.AppendMenu(MF_SEPARATOR);\r
2578                                         // changelist commands\r
2579                                         size_t numChangelists = GetNumberOfChangelistsInSelection();\r
2580                                         if (numChangelists > 0)\r
2581                                         {\r
2582                                                 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);\r
2583                                         }\r
2584                                         if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))\r
2585                                         {\r
2586                                                 CString temp;\r
2587                                                 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);\r
2588                                                 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);\r
2589 \r
2590                                                 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))\r
2591                                                 {\r
2592                                                         changelistSubMenu.AppendMenu(MF_SEPARATOR);\r
2593                                                         changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);\r
2594                                                 }\r
2595 \r
2596                                                 if (m_changelists.size() > 0)\r
2597                                                 {\r
2598                                                         // find the changelist names\r
2599                                                         bool bNeedSeparator = true;\r
2600                                                         int cmdID = IDSVNLC_MOVETOCS;\r
2601                                                         for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)\r
2602                                                         {\r
2603                                                                 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))\r
2604                                                                 {\r
2605                                                                         if (bNeedSeparator)\r
2606                                                                         {\r
2607                                                                                 changelistSubMenu.AppendMenu(MF_SEPARATOR);\r
2608                                                                                 bNeedSeparator = false;\r
2609                                                                         }\r
2610                                                                         changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);\r
2611                                                                         cmdID++;\r
2612                                                                 }\r
2613                                                         }\r
2614                                                 }\r
2615                                                 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);\r
2616                                                 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);\r
2617                                         }\r
2618                                 }\r
2619                         }\r
2620 #endif\r
2621                         int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
2622 \r
2623                         m_bBlock = TRUE;\r
2624                         AfxGetApp()->DoWaitCursor(1);\r
2625                         int iItemCountBeforeMenuCmd = GetItemCount();\r
2626                         bool bForce = false;\r
2627                         switch (cmd)\r
2628                         {\r
2629                         case IDSVNLC_OPEN:\r
2630                                 {\r
2631                                         CString file;\r
2632                                         if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)\r
2633                                         {\r
2634                                                 file= filepath->GetWinPath();\r
2635                                         }else\r
2636                                         {\r
2637                                                 CString temppath;\r
2638                                                 GetTempPath(temppath);\r
2639                                                 file.Format(_T("%s%s_%s%s"),\r
2640                                                         temppath,                                               \r
2641                                                         filepath->GetBaseFilename(),\r
2642                                                         m_CurrentVersion.Left(6),\r
2643                                                         filepath->GetFileExtension());\r
2644 \r
2645                                         }\r
2646                                         int ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);\r
2647                                         if (ret <= HINSTANCE_ERROR)\r
2648                                         {\r
2649                                                 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
2650                                                 cmd += file;\r
2651                                                 CAppUtils::LaunchApplication(cmd, NULL, false);\r
2652                                         }\r
2653                                 }\r
2654                                 break;\r
2655                         case IDSVNLC_OPENWITH:\r
2656                                 {\r
2657                                         CString file;\r
2658                                         if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)\r
2659                                         {\r
2660                                                 file= filepath->GetWinPath();\r
2661                                         }else\r
2662                                         {\r
2663                                                 CString temppath;\r
2664                                                 GetTempPath(temppath);\r
2665                                                 file.Format(_T("%s%s_%s%s"),\r
2666                                                         temppath,                                               \r
2667                                                         filepath->GetBaseFilename(),\r
2668                                                         m_CurrentVersion.Left(6),\r
2669                                                         filepath->GetFileExtension());\r
2670 \r
2671                                         }\r
2672 \r
2673                                         CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
2674                                         cmd += file + _T(" ");\r
2675                                         CAppUtils::LaunchApplication(cmd, NULL, false);\r
2676                                 }\r
2677                                 break;\r
2678                         case IDSVNLC_EXPLORE:\r
2679                                 {\r
2680                                         ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);\r
2681                                 }\r
2682                                 break;\r
2683                         case IDSVNLC_COMPARE:\r
2684                                 {\r
2685                                         POSITION pos = GetFirstSelectedItemPosition();\r
2686                                         while ( pos )\r
2687                                         {\r
2688                                                 int index = GetNextSelectedItem(pos);\r
2689                                                 StartDiff(index);\r
2690                                         }\r
2691                                 }\r
2692                                 break;\r
2693                         case IDSVNLC_GNUDIFF1:\r
2694                                 {\r
2695                                 //      SVNDiff diff(NULL, this->m_hWnd, true);\r
2696                                 //\r
2697                                 //      if (entry->remotestatus <= git_wc_status_normal)\r
2698                                 //              CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);\r
2699                                 //      else\r
2700                                 //              CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);\r
2701                                         if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)\r
2702                                                 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),\r
2703                                                                                                                         *filepath,GitRev::GetHead());\r
2704                                         else\r
2705                                                 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,\r
2706                                                                                                                         *filepath,m_CurrentVersion+_T("~1"));\r
2707                                 }\r
2708                                 break;\r
2709                         case IDSVNLC_ADD:\r
2710                                 {       // The add went ok, but we now need to run through the selected items again\r
2711                                         // and update their status\r
2712                                         POSITION pos = GetFirstSelectedItemPosition();\r
2713                                         int index;\r
2714                                         while ((index = GetNextSelectedItem(pos)) >= 0)\r
2715                                         {\r
2716                                                 CTGitPath * path=(CTGitPath*)GetItemData(index);\r
2717                                                 ASSERT(path);\r
2718                                                 if(path == NULL)\r
2719                                                         continue;\r
2720                                                 CString cmd;\r
2721                                                 cmd.Format(_T("git.exe add %s"),path->GetGitPathString());\r
2722                                                 CString output;\r
2723                                                 if(!g_Git.Run(cmd,&output,CP_OEMCP))\r
2724                                                 {\r
2725                                                         path->m_Action = CTGitPath::LOGACTIONS_ADDED;\r
2726                                                         SetEntryCheck(path,index,true);\r
2727                                                         SetItemGroup(index,0);\r
2728                                                         this->m_StatusFileList.AddPath(*path);\r
2729                                                         this->m_UnRevFileList.RemoveItem(*path);\r
2730                                                         this->m_IgnoreFileList.RemoveItem(*path);\r
2731                                                         Show(this->m_dwShow,0,true,true);\r
2732                                                 }\r
2733                                         }\r
2734                                         \r
2735                                 }\r
2736                                 break;\r
2737 \r
2738                         case IDSVNLC_BLAME:\r
2739                                 {\r
2740                                         CString sCmd;\r
2741                                         sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),\r
2742                                                 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath());\r
2743 \r
2744                                         CAppUtils::LaunchApplication(sCmd, NULL, false);\r
2745                                 }\r
2746                                 break;\r
2747 \r
2748                         case IDSVNLC_LOG:\r
2749                                 {\r
2750                                         CString sCmd;\r
2751                                         sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),\r
2752                                                 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath());\r
2753 \r
2754                                         CAppUtils::LaunchApplication(sCmd, NULL, false);\r
2755                                 }\r
2756                                 break;\r
2757 \r
2758                         case IDSVNLC_EDITCONFLICT:\r
2759                         {\r
2760                                 CAppUtils::ConflictEdit(*filepath);\r
2761                                 break;\r
2762                         }\r
2763                         case IDSVNLC_RESOLVECONFLICT:\r
2764                         {\r
2765                                 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)\r
2766                                 {\r
2767                                         POSITION pos = GetFirstSelectedItemPosition();\r
2768                                         while (pos != 0)\r
2769                                         {\r
2770                                                 int index;\r
2771                                                 index = GetNextSelectedItem(pos);\r
2772                                                 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);\r
2773                                                 if(fentry == NULL)\r
2774                                                         continue;\r
2775 \r
2776                                                 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)\r
2777                                                 {\r
2778                                                         CString cmd,output;\r
2779                                                         cmd.Format(_T("git.exe add \"%s\""),fentry->GetGitPathString());\r
2780                                                         if(g_Git.Run(cmd,&output,CP_OEMCP))\r
2781                                                         {\r
2782                                                                 CMessageBox::Show(m_hWnd, output, _T("TortoiseSVN"), MB_ICONERROR);\r
2783                                                         }else\r
2784                                                         {\r
2785                                                                 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;\r
2786                                                                 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;\r
2787                                                         }\r
2788                                                 }\r
2789                                                 \r
2790                                         }\r
2791                                         Show(m_dwShow, 0, m_bShowFolders);\r
2792                                 }\r
2793                         }\r
2794                         break;\r
2795 \r
2796                         case IDSVNLC_IGNORE:\r
2797                         {\r
2798                                 CTGitPathList ignorelist;\r
2799                                 //std::vector<CString> toremove;\r
2800                                 FillListOfSelectedItemPaths(ignorelist, true);\r
2801                                 SetRedraw(FALSE);\r
2802 \r
2803                                 if(!CAppUtils::IgnoreFile(ignorelist,false))\r
2804                                         break;\r
2805 \r
2806                                 for(int i=0;i<ignorelist.GetCount();i++)\r
2807                                 {\r
2808                                         int nListboxEntries = GetItemCount();\r
2809                                         for (int nItem=0; nItem<nListboxEntries; ++nItem)\r
2810                                         {\r
2811                                                 CTGitPath *path=(CTGitPath*)GetItemData(nItem);\r
2812                                                 if (path->GetGitPathString()==ignorelist[i].GetGitPathString())\r
2813                                                 {\r
2814                                                         RemoveListEntry(nItem);\r
2815                                                         break;\r
2816                                                 }\r
2817                                         }\r
2818                                 }\r
2819                                 SetRedraw(TRUE);\r
2820                         }\r
2821 #if 0\r
2822                                         CTSVNPathList ignorelist;\r
2823                                         std::vector<CString> toremove;\r
2824                                         FillListOfSelectedItemPaths(ignorelist, true);\r
2825                                         SetRedraw(FALSE);\r
2826                                         for (int j=0; j<ignorelist.GetCount(); ++j)\r
2827                                         {\r
2828                                                 int nListboxEntries = GetItemCount();\r
2829                                                 for (int i=0; i<nListboxEntries; ++i)\r
2830                                                 {\r
2831                                                         if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))\r
2832                                                         {\r
2833                                                                 selIndex = i;\r
2834                                                                 break;\r
2835                                                         }\r
2836                                                 }\r
2837                                                 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());\r
2838                                                 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();\r
2839                                                 SVNProperties props(parentfolder, SVNRev::REV_WC, false);\r
2840                                                 CStringA value;\r
2841                                                 for (int i=0; i<props.GetCount(); i++)\r
2842                                                 {\r
2843                                                         CString propname(props.GetItemName(i).c_str());\r
2844                                                         if (propname.CompareNoCase(_T("git:ignore"))==0)\r
2845                                                         {\r
2846                                                                 stdstring stemp;\r
2847                                                                 // treat values as normal text even if they're not\r
2848                                                                 value = (char *)props.GetItemValue(i).c_str();\r
2849                                                         }\r
2850                                                 }\r
2851                                                 if (value.IsEmpty())\r
2852                                                         value = name;\r
2853                                                 else\r
2854                                                 {\r
2855                                                         value = value.Trim("\n\r");\r
2856                                                         value += "\n";\r
2857                                                         value += name;\r
2858                                                         value.Remove('\r');\r
2859                                                 }\r
2860                                                 if (!props.Add(_T("git:ignore"), (LPCSTR)value))\r
2861                                                 {\r
2862                                                         CString temp;\r
2863                                                         temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
2864                                                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
2865                                                         break;\r
2866                                                 }\r
2867                                                 if (GetCheck(selIndex))\r
2868                                                         m_nSelected--;\r
2869                                                 m_nTotal--;\r
2870 \r
2871                                                 // now, if we ignored a folder, remove all its children\r
2872                                                 if (ignorelist[j].IsDirectory())\r
2873                                                 {\r
2874                                                         for (int i=0; i<(int)m_arListArray.size(); ++i)\r
2875                                                         {\r
2876                                                                 FileEntry * entry = GetListEntry(i);\r
2877                                                                 if (entry->status == git_wc_status_unversioned)\r
2878                                                                 {\r
2879                                                                         if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))\r
2880                                                                         {\r
2881                                                                                 entry->status = git_wc_status_ignored;\r
2882                                                                                 entry->textstatus = git_wc_status_ignored;\r
2883                                                                                 if (GetCheck(i))\r
2884                                                                                         m_nSelected--;\r
2885                                                                                 toremove.push_back(entry->GetPath().GetSVNPathString());\r
2886                                                                         }\r
2887                                                                 }\r
2888                                                         }\r
2889                                                 }\r
2890 \r
2891                                                 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;\r
2892 \r
2893                                                 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];\r
2894                                                 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items\r
2895                                                         toremove.push_back(entry->GetPath().GetSVNPathString());\r
2896 \r
2897                                                 if (!m_bIgnoreRemoveOnly)\r
2898                                                 {\r
2899                                                         SVNStatus status;\r
2900                                                         git_wc_status2_t * s;\r
2901                                                         CTSVNPath gitPath;\r
2902                                                         s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);\r
2903                                                         // first check if the folder isn't already present in the list\r
2904                                                         bool bFound = false;\r
2905                                                         nListboxEntries = GetItemCount();\r
2906                                                         for (int i=0; i<nListboxEntries; ++i)\r
2907                                                         {\r
2908                                                                 FileEntry * entry = GetListEntry(i);\r
2909                                                                 if (entry->path.IsEquivalentTo(gitPath))\r
2910                                                                 {\r
2911                                                                         bFound = true;\r
2912                                                                         break;\r
2913                                                                 }\r
2914                                                         }\r
2915                                                         if (!bFound)\r
2916                                                         {\r
2917                                                                 if (s!=0)\r
2918                                                                 {\r
2919                                                                         FileEntry * entry = new FileEntry();\r
2920                                                                         entry->path = gitPath;\r
2921                                                                         entry->basepath = basepath;\r
2922                                                                         entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);\r
2923                                                                         entry->textstatus = s->text_status;\r
2924                                                                         entry->propstatus = s->prop_status;\r
2925                                                                         entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);\r
2926                                                                         entry->remotetextstatus = s->repos_text_status;\r
2927                                                                         entry->remotepropstatus = s->repos_prop_status;\r
2928                                                                         entry->inunversionedfolder = FALSE;\r
2929                                                                         entry->checked = true;\r
2930                                                                         entry->inexternal = false;\r
2931                                                                         entry->direct = false;\r
2932                                                                         entry->isfolder = true;\r
2933                                                                         entry->last_commit_date = 0;\r
2934                                                                         entry->last_commit_rev = 0;\r
2935                                                                         entry->remoterev = 0;\r
2936                                                                         if (s->entry)\r
2937                                                                         {\r
2938                                                                                 if (s->entry->url)\r
2939                                                                                 {\r
2940                                                                                         entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));\r
2941                                                                                 }\r
2942                                                                         }\r
2943                                                                         if (s->entry && s->entry->present_props)\r
2944                                                                         {\r
2945                                                                                 entry->present_props = s->entry->present_props;\r
2946                                                                         }\r
2947                                                                         m_arStatusArray.push_back(entry);\r
2948                                                                         m_arListArray.push_back(m_arStatusArray.size()-1);\r
2949                                                                         AddEntry(entry, langID, GetItemCount());\r
2950                                                                 }\r
2951                                                         }\r
2952                                                 }\r
2953                                         }\r
2954                                         for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)\r
2955                                         {\r
2956                                                 int nListboxEntries = GetItemCount();\r
2957                                                 for (int i=0; i<nListboxEntries; ++i)\r
2958                                                 {\r
2959                                                         if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)\r
2960                                                         {\r
2961                                                                 RemoveListEntry(i);\r
2962                                                                 break;\r
2963                                                         }\r
2964                                                 }\r
2965                                         }\r
2966                                         SetRedraw(TRUE);\r
2967                                 }\r
2968 #endif\r
2969                                 break;\r
2970                         case IDSVNLC_IGNOREMASK:\r
2971                                 {\r
2972                                         CString common;\r
2973                                         CString ext=filepath->GetFileExtension();\r
2974                                         CTGitPathList ignorelist;\r
2975                                         FillListOfSelectedItemPaths(ignorelist, true);\r
2976                                         SetRedraw(FALSE);\r
2977 \r
2978                                         CAppUtils::IgnoreFile(ignorelist,true);\r
2979                                         common=ignorelist.GetCommonRoot().GetGitPathString();\r
2980 \r
2981                                         for (int i=0; i< GetItemCount(); ++i)\r
2982                                         {\r
2983                                                 CTGitPath *path=(CTGitPath*)GetItemData(i);\r
2984                                                 if(!( path->m_Action & CTGitPath::LOGACTIONS_UNVER))\r
2985                                                         continue;\r
2986                                                 if( path->GetGitPathString().Left(common.GetLength()) == common )\r
2987                                                 {\r
2988                                                         if (path->GetFileExtension()==ext)\r
2989                                                         {\r
2990                                                                 RemoveListEntry(i);\r
2991                                                                 i--; // remove index i at item, new one will replace. \r
2992                                                         }\r
2993                                                 }\r
2994                                         }\r
2995                                         \r
2996                                         SetRedraw(TRUE);\r
2997                                 }\r
2998 #if 0\r
2999                                         std::set<CTSVNPath> parentlist;\r
3000                                         for (int i=0; i<ignorelist.GetCount(); ++i)\r
3001                                         {\r
3002                                                 parentlist.insert(ignorelist[i].GetContainingDirectory());\r
3003                                         }\r
3004                                         std::set<CTSVNPath>::iterator it;\r
3005                                         std::vector<CString> toremove;\r
3006                                         \r
3007                                         for (it = parentlist.begin(); it != parentlist.end(); ++it)\r
3008                                         {\r
3009                                                 CTSVNPath parentFolder = (*it).GetDirectory();\r
3010                                                 SVNProperties props(parentFolder, SVNRev::REV_WC, false);\r
3011                                                 CStringA value;\r
3012                                                 for (int i=0; i<props.GetCount(); i++)\r
3013                                                 {\r
3014                                                         CString propname(props.GetItemName(i).c_str());\r
3015                                                         if (propname.CompareNoCase(_T("git:ignore"))==0)\r
3016                                                         {\r
3017                                                                 stdstring stemp;\r
3018                                                                 // treat values as normal text even if they're not\r
3019                                                                 value = (char *)props.GetItemValue(i).c_str();\r
3020                                                         }\r
3021                                                 }\r
3022                                                 if (value.IsEmpty())\r
3023                                                         value = name;\r
3024                                                 else\r
3025                                                 {\r
3026                                                         value = value.Trim("\n\r");\r
3027                                                         value += "\n";\r
3028                                                         value += name;\r
3029                                                         value.Remove('\r');\r
3030                                                 }\r
3031                                                 if (!props.Add(_T("git:ignore"), (LPCSTR)value))\r
3032                                                 {\r
3033                                                         CString temp;\r
3034                                                         temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
3035                                                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
3036                                                 }\r
3037                                                 else\r
3038                                                 {\r
3039                                                         CTSVNPath basepath;\r
3040                                                         int nListboxEntries = GetItemCount();\r
3041                                                         for (int i=0; i<nListboxEntries; ++i)\r
3042                                                         {\r
3043                                                                 FileEntry * entry = GetListEntry(i);\r
3044                                                                 ASSERT(entry != NULL);\r
3045                                                                 if (entry == NULL)\r
3046                                                                         continue;\r
3047                                                                 if (basepath.IsEmpty())\r
3048                                                                         basepath = entry->basepath;\r
3049                                                                 // since we ignored files with a mask (e.g. *.exe)\r
3050                                                                 // we have to find find all files in the same\r
3051                                                                 // folder (IsAncestorOf() returns TRUE for _all_ children,\r
3052                                                                 // not just the immediate ones) which match the\r
3053                                                                 // mask and remove them from the list too.\r
3054                                                                 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))\r
3055                                                                 {\r
3056                                                                         CString f = entry->path.GetSVNPathString();\r
3057                                                                         if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)\r
3058                                                                         {\r
3059                                                                                 if (CStringUtils::WildCardMatch(name, f))\r
3060                                                                                 {\r
3061                                                                                         if (GetCheck(i))\r
3062                                                                                                 m_nSelected--;\r
3063                                                                                         m_nTotal--;\r
3064                                                                                         toremove.push_back(f);\r
3065                                                                                 }\r
3066                                                                         }\r
3067                                                                 }\r
3068                                                         }\r
3069                                                         if (!m_bIgnoreRemoveOnly)\r
3070                                                         {\r
3071                                                                 SVNStatus status;\r
3072                                                                 git_wc_status2_t * s;\r
3073                                                                 CTSVNPath gitPath;\r
3074                                                                 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);\r
3075                                                                 if (s!=0)\r
3076                                                                 {\r
3077                                                                         // first check if the folder isn't already present in the list\r
3078                                                                         bool bFound = false;\r
3079                                                                         for (int i=0; i<nListboxEntries; ++i)\r
3080                                                                         {\r
3081                                                                                 FileEntry * entry = GetListEntry(i);\r
3082                                                                                 if (entry->path.IsEquivalentTo(gitPath))\r
3083                                                                                 {\r
3084                                                                                         bFound = true;\r
3085                                                                                         break;\r
3086                                                                                 }\r
3087                                                                         }\r
3088                                                                         if (!bFound)\r
3089                                                                         {\r
3090                                                                                 FileEntry * entry = new FileEntry();\r
3091                                                                                 entry->path = gitPath;\r
3092                                                                                 entry->basepath = basepath;\r
3093                                                                                 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);\r
3094                                                                                 entry->textstatus = s->text_status;\r
3095                                                                                 entry->propstatus = s->prop_status;\r
3096                                                                                 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);\r
3097                                                                                 entry->remotetextstatus = s->repos_text_status;\r
3098                                                                                 entry->remotepropstatus = s->repos_prop_status;\r
3099                                                                                 entry->inunversionedfolder = false;\r
3100                                                                                 entry->checked = true;\r
3101                                                                                 entry->inexternal = false;\r
3102                                                                                 entry->direct = false;\r
3103                                                                                 entry->isfolder = true;\r
3104                                                                                 entry->last_commit_date = 0;\r
3105                                                                                 entry->last_commit_rev = 0;\r
3106                                                                                 entry->remoterev = 0;\r
3107                                                                                 if (s->entry)\r
3108                                                                                 {\r
3109                                                                                         if (s->entry->url)\r
3110                                                                                         {\r
3111                                                                                                 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));\r
3112                                                                                         }\r
3113                                                                                 }\r
3114                                                                                 if (s->entry && s->entry->present_props)\r
3115                                                                                 {\r
3116                                                                                         entry->present_props = s->entry->present_props;\r
3117                                                                                 }\r
3118                                                                                 m_arStatusArray.push_back(entry);\r
3119                                                                                 m_arListArray.push_back(m_arStatusArray.size()-1);\r
3120                                                                                 AddEntry(entry, langID, GetItemCount());\r
3121                                                                         }\r
3122                                                                 }\r
3123                                                         }\r
3124                                                 }\r
3125                                         }\r
3126                                         for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)\r
3127                                         {\r
3128                                                 int nListboxEntries = GetItemCount();\r
3129                                                 for (int i=0; i<nListboxEntries; ++i)\r
3130                                                 {\r
3131                                                         if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)\r
3132                                                         {\r
3133                                                                 RemoveListEntry(i);\r
3134                                                                 break;\r
3135                                                         }\r
3136                                                 }\r
3137                                         }\r
3138                                         SetRedraw(TRUE);\r
3139                                 }\r
3140 #endif\r
3141                                 break;\r
3142                         \r
3143 #if 0\r
3144                         case IDSVNLC_COPY:\r
3145                                 CopySelectedEntriesToClipboard(0);\r
3146                                 break;\r
3147                         case IDSVNLC_COPYEXT:\r
3148                                 CopySelectedEntriesToClipboard((DWORD)-1);\r
3149                                 break;\r
3150                         case IDSVNLC_PROPERTIES:\r
3151                                 {\r
3152                                         CTSVNPathList targetList;\r
3153                                         FillListOfSelectedItemPaths(targetList);\r
3154                                         CEditPropertiesDlg dlg;\r
3155                                         dlg.SetPathList(targetList);\r
3156                                         dlg.DoModal();\r
3157                                         if (dlg.HasChanged())\r
3158                                         {\r
3159                                                 // since the user might have changed/removed/added\r
3160                                                 // properties recursively, we don't really know\r
3161                                                 // which items have changed their status.\r
3162                                                 // So tell the parent to do a refresh.\r
3163                                                 CWnd* pParent = GetParent();\r
3164                                                 if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3165                                                 {\r
3166                                                         pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3167                                                 }\r
3168                                         }\r
3169                                 }\r
3170                                 break;\r
3171                         case IDSVNLC_COMMIT:\r
3172                                 {\r
3173                                         CTSVNPathList targetList;\r
3174                                         FillListOfSelectedItemPaths(targetList);\r
3175                                         CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);\r
3176                                         VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));\r
3177                                         CString commandline = CPathUtils::GetAppDirectory();\r
3178                                         commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");\r
3179                                         commandline += tempFile.GetWinPathString();\r
3180                                         commandline += _T("\"");\r
3181                                         commandline += _T(" /deletepathfile");\r
3182                                         CAppUtils::LaunchApplication(commandline, NULL, false);\r
3183                                 }\r
3184                                 break;\r
3185                         case IDSVNLC_REVERT:\r
3186                                 {\r
3187                                         // If at least one item is not in the status "added"\r
3188                                         // we ask for a confirmation\r
3189                                         BOOL bConfirm = FALSE;\r
3190                                         POSITION pos = GetFirstSelectedItemPosition();\r
3191                                         int index;\r
3192                                         while ((index = GetNextSelectedItem(pos)) >= 0)\r
3193                                         {\r
3194                                                 FileEntry * fentry = GetListEntry(index);\r
3195                                                 if (fentry->textstatus != git_wc_status_added)\r
3196                                                 {\r
3197                                                         bConfirm = TRUE;\r
3198                                                         break;\r
3199                                                 }\r
3200                                         }       \r
3201 \r
3202                                         CString str;\r
3203                                         str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());\r
3204 \r
3205                                         if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)\r
3206                                         {\r
3207                                                 CTSVNPathList targetList;\r
3208                                                 FillListOfSelectedItemPaths(targetList);\r
3209 \r
3210                                                 // make sure that the list is reverse sorted, so that\r
3211                                                 // children are removed before any parents\r
3212                                                 targetList.SortByPathname(true);\r
3213 \r
3214                                                 SVN git;\r
3215 \r
3216                                                 // put all reverted files in the trashbin, except the ones with 'added'\r
3217                                                 // status because they are not restored by the revert.\r
3218                                                 CTSVNPathList delList;\r
3219                                                 POSITION pos = GetFirstSelectedItemPosition();\r
3220                                                 int index;\r
3221                                                 while ((index = GetNextSelectedItem(pos)) >= 0)\r
3222                                                 {\r
3223                                                         FileEntry * entry = GetListEntry(index);\r
3224                                                         if (entry->status != git_wc_status_added)\r
3225                                                                 delList.AddPath(entry->GetPath());\r
3226                                                 }\r
3227                                                 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
3228                                                         delList.DeleteAllFiles(true);\r
3229 \r
3230                                                 if (!git.Revert(targetList, CStringArray(), FALSE))\r
3231                                                 {\r
3232                                                         CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3233                                                 }\r
3234                                                 else\r
3235                                                 {\r
3236                                                         // since the entries got reverted we need to remove\r
3237                                                         // them from the list too, if no remote changes are shown,\r
3238                                                         // if the unmodified files are not shown\r
3239                                                         // and if the item is not part of a changelist\r
3240                                                         POSITION pos;\r
3241                                                         SetRedraw(FALSE);\r
3242                                                         while ((pos = GetFirstSelectedItemPosition())!=0)\r
3243                                                         {\r
3244                                                                 int index;\r
3245                                                                 index = GetNextSelectedItem(pos);\r
3246                                                                 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];\r
3247                                                                 if ( fentry->IsFolder() )\r
3248                                                                 {\r
3249                                                                         // refresh!\r
3250                                                                         CWnd* pParent = GetParent();\r
3251                                                                         if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3252                                                                         {\r
3253                                                                                 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3254                                                                         }\r
3255                                                                         break;\r
3256                                                                 }\r
3257 \r
3258                                                                 BOOL bAdded = (fentry->textstatus == git_wc_status_added);\r
3259                                                                 fentry->status = git_wc_status_normal;\r
3260                                                                 fentry->propstatus = git_wc_status_normal;\r
3261                                                                 fentry->textstatus = git_wc_status_normal;\r
3262                                                                 fentry->copied = false;\r
3263                                                                 fentry->isConflicted = false;\r
3264                                                                 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))\r
3265                                                                 {\r
3266                                                                         if ( bAdded )\r
3267                                                                         {\r
3268                                                                                 // reverting added items makes them unversioned, not 'normal'\r
3269                                                                                 if (fentry->IsFolder())\r
3270                                                                                         fentry->propstatus = git_wc_status_none;\r
3271                                                                                 else\r
3272                                                                                         fentry->propstatus = git_wc_status_unversioned;\r
3273                                                                                 fentry->status = git_wc_status_unversioned;\r
3274                                                                                 fentry->textstatus = git_wc_status_unversioned;\r
3275                                                                                 SetItemState(index, 0, LVIS_SELECTED);\r
3276                                                                                 SetEntryCheck(fentry, index, false);\r
3277                                                                         }\r
3278                                                                         else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))\r
3279                                                                         {\r
3280                                                                                 SetItemState(index, 0, LVIS_SELECTED);\r
3281                                                                         }\r
3282                                                                         else\r
3283                                                                         {\r
3284                                                                                 m_nTotal--;\r
3285                                                                                 if (GetCheck(index))\r
3286                                                                                         m_nSelected--;\r
3287                                                                                 RemoveListEntry(index);\r
3288                                                                                 Invalidate();\r
3289                                                                         }\r
3290                                                                 }\r
3291                                                                 else\r
3292                                                                 {\r
3293                                                                         SetItemState(index, 0, LVIS_SELECTED);\r
3294                                                                 }\r
3295                                                         }\r
3296                                                         SetRedraw(TRUE);\r
3297                                                         SaveColumnWidths();\r
3298                                                         Show(m_dwShow, 0, m_bShowFolders);\r
3299                                                         NotifyCheck();\r
3300                                                 }\r
3301                                         }\r
3302                                 }\r
3303                                 break;\r
3304                         case IDSVNLC_COMPARE:\r
3305                                 {\r
3306                                         POSITION pos = GetFirstSelectedItemPosition();\r
3307                                         while ( pos )\r
3308                                         {\r
3309                                                 int index = GetNextSelectedItem(pos);\r
3310                                                 StartDiff(index);\r
3311                                         }\r
3312                                 }\r
3313                                 break;\r
3314                         case IDSVNLC_COMPAREWC:\r
3315                                 {\r
3316                                         POSITION pos = GetFirstSelectedItemPosition();\r
3317                                         while ( pos )\r
3318                                         {\r
3319                                                 int index = GetNextSelectedItem(pos);\r
3320                                                 FileEntry * entry = GetListEntry(index);\r
3321                                                 ASSERT(entry != NULL);\r
3322                                                 if (entry == NULL)\r
3323                                                         continue;\r
3324                                                 SVNDiff diff(NULL, m_hWnd, true);\r
3325                                                 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
3326                                                 git_revnum_t baseRev = entry->Revision;\r
3327                                                 diff.DiffFileAgainstBase(\r
3328                                                         entry->path, baseRev, entry->textstatus, entry->propstatus);\r
3329                                         }\r
3330                                 }\r
3331                                 break;\r
3332                         case IDSVNLC_GNUDIFF1:\r
3333                                 {\r
3334                                         SVNDiff diff(NULL, this->m_hWnd, true);\r
3335 \r
3336                                         if (entry->remotestatus <= git_wc_status_normal)\r
3337                                                 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);\r
3338                                         else\r
3339                                                 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);\r
3340                                 }\r
3341                                 break;\r
3342                         case IDSVNLC_UPDATE:\r
3343                                 {\r
3344                                         CTSVNPathList targetList;\r
3345                                         FillListOfSelectedItemPaths(targetList);\r
3346                                         bool bAllExist = true;\r
3347                                         for (int i=0; i<targetList.GetCount(); ++i)\r
3348                                         {\r
3349                                                 if (!targetList[i].Exists())\r
3350                                                 {\r
3351                                                         bAllExist = false;\r
3352                                                         break;\r
3353                                                 }\r
3354                                         }\r
3355                                         if (bAllExist)\r
3356                                         {\r
3357                                                 CSVNProgressDlg dlg;\r
3358                                                 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);\r
3359                                                 dlg.SetPathList(targetList);\r
3360                                                 dlg.SetRevision(SVNRev::REV_HEAD);\r
3361                                                 dlg.DoModal();\r
3362                                         }\r
3363                                         else\r
3364                                         {\r
3365                                                 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();\r
3366                                                 targetList.WriteToFile(sTempFile, false);\r
3367                                                 CString sCmd;\r
3368                                                 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),\r
3369                                                         (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);\r
3370 \r
3371                                                 CAppUtils::LaunchApplication(sCmd, NULL, false);\r
3372                                         }\r
3373                                 }\r
3374                                 break;\r
3375                         case IDSVNLC_OPEN:\r
3376                                 {\r
3377                                         int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);\r
3378                                         if (ret <= HINSTANCE_ERROR)\r
3379                                         {\r
3380                                                 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
3381                                                 cmd += filepath.GetWinPathString();\r
3382                                                 CAppUtils::LaunchApplication(cmd, NULL, false);\r
3383                                         }\r
3384                                 }\r
3385                                 break;\r
3386                         case IDSVNLC_OPENWITH:\r
3387                                 {\r
3388                                         CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
3389                                         cmd += filepath.GetWinPathString() + _T(" ");\r
3390                                         CAppUtils::LaunchApplication(cmd, NULL, false);\r
3391                                 }\r
3392                                 break;\r
3393                         case IDSVNLC_EXPLORE:\r
3394                                 {\r
3395                                         ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);\r
3396                                 }\r
3397                                 break;\r
3398                         case IDSVNLC_REMOVE:\r
3399                                 {\r
3400                                         SVN git;\r
3401                                         CTSVNPathList itemsToRemove;\r
3402                                         FillListOfSelectedItemPaths(itemsToRemove);\r
3403 \r
3404                                         // We must sort items before removing, so that files are always removed\r
3405                                         // *before* their parents\r
3406                                         itemsToRemove.SortByPathname(true);\r
3407 \r
3408                                         bool bSuccess = false;\r
3409                                         if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))\r
3410                                         {\r
3411                                                 bSuccess = true;\r
3412                                         }\r
3413                                         else\r
3414                                         {\r
3415                                                 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||\r
3416                                                         (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))\r
3417                                                 {\r
3418                                                         CString msg, yes, no, yestoall;\r
3419                                                         msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());\r
3420                                                         yes.LoadString(IDS_MSGBOX_YES);\r
3421                                                         no.LoadString(IDS_MSGBOX_NO);\r
3422                                                         yestoall.LoadString(IDS_PROC_YESTOALL);\r
3423                                                         UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);\r
3424                                                         if ((ret == 1)||(ret==3))\r
3425                                                         {\r
3426                                                                 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))\r
3427                                                                 {\r
3428                                                                         CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3429                                                                 }\r
3430                                                                 else\r
3431                                                                         bSuccess = true;\r
3432                                                         }\r
3433                                                 }\r
3434                                                 else\r
3435                                                         CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3436                                         }\r
3437                                         if (bSuccess)\r
3438                                         {\r
3439                                                 // The remove went ok, but we now need to run through the selected items again\r
3440                                                 // and update their status\r
3441                                                 POSITION pos = GetFirstSelectedItemPosition();\r
3442                                                 int index;\r
3443                                                 std::vector<int> entriesToRemove;\r
3444                                                 while ((index = GetNextSelectedItem(pos)) >= 0)\r
3445                                                 {\r
3446                                                         FileEntry * e = GetListEntry(index);\r
3447                                                         if (!bShift &&\r
3448                                                                 ((e->textstatus == git_wc_status_unversioned)||\r
3449                                                                 (e->textstatus == git_wc_status_none)||\r
3450                                                                 (e->textstatus == git_wc_status_ignored)))\r
3451                                                         {\r
3452                                                                 if (GetCheck(index))\r
3453                                                                         m_nSelected--;\r
3454                                                                 m_nTotal--;\r
3455                                                                 entriesToRemove.push_back(index);\r
3456                                                         }\r
3457                                                         else\r
3458                                                         {\r
3459                                                                 e->textstatus = git_wc_status_deleted;\r
3460                                                                 e->status = git_wc_status_deleted;\r
3461                                                                 SetEntryCheck(e,index,true);\r
3462                                                         }\r
3463                                                 }\r
3464                                                 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)\r
3465                                                 {\r
3466                                                         RemoveListEntry(*it);\r
3467                                                 }\r
3468                                         }\r
3469                                         SaveColumnWidths();\r
3470                                         Show(m_dwShow, 0, m_bShowFolders);\r
3471                                         NotifyCheck();\r
3472                                 }\r
3473                                 break;\r
3474                         case IDSVNLC_DELETE:\r
3475                                 {\r
3476                                         CTSVNPathList pathlist;\r
3477                                         FillListOfSelectedItemPaths(pathlist);\r
3478                                         pathlist.RemoveChildren();\r
3479                                         CString filelist;\r
3480                                         for (INT_PTR i=0; i<pathlist.GetCount(); ++i)\r
3481                                         {\r
3482                                                 filelist += pathlist[i].GetWinPathString();\r
3483                                                 filelist += _T("|");\r
3484                                         }\r
3485                                         filelist += _T("|");\r
3486                                         int len = filelist.GetLength();\r
3487                                         TCHAR * buf = new TCHAR[len+2];\r
3488                                         _tcscpy_s(buf, len+2, filelist);\r
3489                                         for (int i=0; i<len; ++i)\r
3490                                                 if (buf[i] == '|')\r
3491                                                         buf[i] = 0;\r
3492                                         SHFILEOPSTRUCT fileop;\r
3493                                         fileop.hwnd = this->m_hWnd;\r
3494                                         fileop.wFunc = FO_DELETE;\r
3495                                         fileop.pFrom = buf;\r
3496                                         fileop.pTo = NULL;\r
3497                                         fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);\r
3498                                         fileop.lpszProgressTitle = _T("deleting file");\r
3499                                         int result = SHFileOperation(&fileop);\r
3500                                         delete [] buf;\r
3501 \r
3502                                         if ( (result==0) && (!fileop.fAnyOperationsAborted) )\r
3503                                         {\r
3504                                                 SetRedraw(FALSE);\r
3505                                                 POSITION pos = NULL;\r
3506                                                 CTSVNPathList deletedlist;      // to store list of deleted folders\r
3507                                                 while ((pos = GetFirstSelectedItemPosition()) != 0)\r
3508                                                 {\r
3509                                                         int index = GetNextSelectedItem(pos);\r
3510                                                         if (GetCheck(index))\r
3511                                                                 m_nSelected--;\r
3512                                                         m_nTotal--;\r
3513                                                         FileEntry * fentry = GetListEntry(index);\r
3514                                                         if ((fentry)&&(fentry->isfolder))\r
3515                                                                 deletedlist.AddPath(fentry->path);\r
3516                                                         RemoveListEntry(index);\r
3517                                                 }\r
3518                                                 // now go through the list of deleted folders\r
3519                                                 // and remove all their children from the list too!\r
3520                                                 int nListboxEntries = GetItemCount();\r
3521                                                 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)\r
3522                                                 {\r
3523                                                         CTSVNPath folderpath = deletedlist[folderindex];\r
3524                                                         for (int i=0; i<nListboxEntries; ++i)\r
3525                                                         {\r
3526                                                                 FileEntry * entry = GetListEntry(i);\r
3527                                                                 if (folderpath.IsAncestorOf(entry->path))\r
3528                                                                 {\r
3529                                                                         RemoveListEntry(i--);\r
3530                                                                         nListboxEntries--;\r
3531                                                                 }\r
3532                                                         }\r
3533                                                 }\r
3534                                                 SetRedraw(TRUE);\r
3535                                         }\r
3536                                 }\r
3537                                 break;\r
3538                         case IDSVNLC_IGNOREMASK:\r
3539                                 {\r
3540                                         CString name = _T("*")+filepath.GetFileExtension();\r
3541                                         CTSVNPathList ignorelist;\r
3542                                         FillListOfSelectedItemPaths(ignorelist, true);\r
3543                                         std::set<CTSVNPath> parentlist;\r
3544                                         for (int i=0; i<ignorelist.GetCount(); ++i)\r
3545                                         {\r
3546                                                 parentlist.insert(ignorelist[i].GetContainingDirectory());\r
3547                                         }\r
3548                                         std::set<CTSVNPath>::iterator it;\r
3549                                         std::vector<CString> toremove;\r
3550                                         SetRedraw(FALSE);\r
3551                                         for (it = parentlist.begin(); it != parentlist.end(); ++it)\r
3552                                         {\r
3553                                                 CTSVNPath parentFolder = (*it).GetDirectory();\r
3554                                                 SVNProperties props(parentFolder, SVNRev::REV_WC, false);\r
3555                                                 CStringA value;\r
3556                                                 for (int i=0; i<props.GetCount(); i++)\r
3557                                                 {\r
3558                                                         CString propname(props.GetItemName(i).c_str());\r
3559                                                         if (propname.CompareNoCase(_T("git:ignore"))==0)\r
3560                                                         {\r
3561                                                                 stdstring stemp;\r
3562                                                                 // treat values as normal text even if they're not\r
3563                                                                 value = (char *)props.GetItemValue(i).c_str();\r
3564                                                         }\r
3565                                                 }\r
3566                                                 if (value.IsEmpty())\r
3567                                                         value = name;\r
3568                                                 else\r
3569                                                 {\r
3570                                                         value = value.Trim("\n\r");\r
3571                                                         value += "\n";\r
3572                                                         value += name;\r
3573                                                         value.Remove('\r');\r
3574                                                 }\r
3575                                                 if (!props.Add(_T("git:ignore"), (LPCSTR)value))\r
3576                                                 {\r
3577                                                         CString temp;\r
3578                                                         temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
3579                                                         CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
3580                                                 }\r
3581                                                 else\r
3582                                                 {\r
3583                                                         CTSVNPath basepath;\r
3584                                                         int nListboxEntries = GetItemCount();\r
3585                                                         for (int i=0; i<nListboxEntries; ++i)\r
3586                                                         {\r
3587                                                                 FileEntry * entry = GetListEntry(i);\r
3588                                                                 ASSERT(entry != NULL);\r
3589                                                                 if (entry == NULL)\r
3590                                                                         continue;\r
3591                                                                 if (basepath.IsEmpty())\r
3592                                                                         basepath = entry->basepath;\r
3593                                                                 // since we ignored files with a mask (e.g. *.exe)\r
3594                                                                 // we have to find find all files in the same\r
3595                                                                 // folder (IsAncestorOf() returns TRUE for _all_ children,\r
3596                                                                 // not just the immediate ones) which match the\r
3597                                                                 // mask and remove them from the list too.\r
3598                                                                 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))\r
3599                                                                 {\r
3600                                                                         CString f = entry->path.GetSVNPathString();\r
3601                                                                         if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)\r
3602                                                                         {\r
3603                                                                                 if (CStringUtils::WildCardMatch(name, f))\r
3604                                                                                 {\r
3605                                                                                         if (GetCheck(i))\r
3606                                                                                                 m_nSelected--;\r
3607                                                                                         m_nTotal--;\r
3608                                                                                         toremove.push_back(f);\r
3609                                                                                 }\r
3610                                                                         }\r
3611                                                                 }\r
3612                                                         }\r
3613                                                         if (!m_bIgnoreRemoveOnly)\r
3614                                                         {\r
3615                                                                 SVNStatus status;\r
3616                                                                 git_wc_status2_t * s;\r
3617                                                                 CTSVNPath gitPath;\r
3618                                                                 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);\r
3619                                                                 if (s!=0)\r
3620                                                                 {\r
3621                                                                         // first check if the folder isn't already present in the list\r
3622                                                                         bool bFound = false;\r
3623                                                                         for (int i=0; i<nListboxEntries; ++i)\r
3624                                                                         {\r
3625                                                                                 FileEntry * entry = GetListEntry(i);\r
3626                                                                                 if (entry->path.IsEquivalentTo(gitPath))\r
3627                                                                                 {\r
3628                                                                                         bFound = true;\r
3629                                                                                         break;\r
3630                                                                                 }\r
3631                                                                         }\r
3632                                                                         if (!bFound)\r
3633                                                                         {\r
3634                                                                                 FileEntry * entry = new FileEntry();\r
3635                                                                                 entry->path = gitPath;\r
3636                                                                                 entry->basepath = basepath;\r
3637                                                                                 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);\r
3638                                                                                 entry->textstatus = s->text_status;\r
3639                                                                                 entry->propstatus = s->prop_status;\r
3640                                                                                 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);\r
3641                                                                                 entry->remotetextstatus = s->repos_text_status;\r
3642                                                                                 entry->remotepropstatus = s->repos_prop_status;\r
3643                                                                                 entry->inunversionedfolder = false;\r
3644                                                                                 entry->checked = true;\r
3645                                                                                 entry->inexternal = false;\r
3646                                                                                 entry->direct = false;\r
3647                                                                                 entry->isfolder = true;\r
3648                                                                                 entry->last_commit_date = 0;\r
3649                                                                                 entry->last_commit_rev = 0;\r
3650                                                                                 entry->remoterev = 0;\r
3651                                                                                 if (s->entry)\r
3652                                                                                 {\r
3653                                                                                         if (s->entry->url)\r
3654                                                                                         {\r
3655                                                                                                 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));\r
3656                                                                                         }\r
3657                                                                                 }\r
3658                                                                                 if (s->entry && s->entry->present_props)\r
3659                                                                                 {\r
3660                                                                                         entry->present_props = s->entry->present_props;\r
3661                                                                                 }\r
3662                                                                                 m_arStatusArray.push_back(entry);\r
3663                                                                                 m_arListArray.push_back(m_arStatusArray.size()-1);\r
3664                                                                                 AddEntry(entry, langID, GetItemCount());\r
3665                                                                         }\r
3666                                                                 }\r
3667                                                         }\r
3668                                                 }\r
3669                                         }\r
3670                                         for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)\r
3671                                         {\r
3672                                                 int nListboxEntries = GetItemCount();\r
3673                                                 for (int i=0; i<nListboxEntries; ++i)\r
3674                                                 {\r
3675                                                         if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)\r
3676                                                         {\r
3677                                                                 RemoveListEntry(i);\r
3678                                                                 break;\r
3679                                                         }\r
3680                                                 }\r
3681                                         }\r
3682                                         SetRedraw(TRUE);\r
3683                                 }\r
3684                                 break;\r
3685                         case IDSVNLC_EDITCONFLICT:\r
3686                                 SVNDiff::StartConflictEditor(filepath);\r
3687                                 break;\r
3688                         \r
3689                         case IDSVNLC_ADD:\r
3690                                 {\r
3691                                         SVN git;\r
3692                                         CTSVNPathList itemsToAdd;\r
3693                                         FillListOfSelectedItemPaths(itemsToAdd);\r
3694 \r
3695                                         // We must sort items before adding, so that folders are always added\r
3696                                         // *before* any of their children\r
3697                                         itemsToAdd.SortByPathname();\r
3698 \r
3699                                         ProjectProperties props;\r
3700                                         props.ReadPropsPathList(itemsToAdd);\r
3701                                         if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))\r
3702                                         {\r
3703                                                 // The add went ok, but we now need to run through the selected items again\r
3704                                                 // and update their status\r
3705                                                 POSITION pos = GetFirstSelectedItemPosition();\r
3706                                                 int index;\r
3707                                                 while ((index = GetNextSelectedItem(pos)) >= 0)\r
3708                                                 {\r
3709                                                         FileEntry * e = GetListEntry(index);\r
3710                                                         e->textstatus = git_wc_status_added;\r
3711                                                         e->propstatus = git_wc_status_none;\r
3712                                                         e->status = git_wc_status_added;\r
3713                                                         SetEntryCheck(e,index,true);\r
3714                                                 }\r
3715                                         }\r
3716                                         else\r
3717                                         {\r
3718                                                 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3719                                         }\r
3720                                         SaveColumnWidths();\r
3721                                         Show(m_dwShow, 0, m_bShowFolders);\r
3722                                         NotifyCheck();\r
3723                                 }\r
3724                                 break;\r
3725                         case IDSVNLC_ADD_RECURSIVE:\r
3726                                 {\r
3727                                         CTSVNPathList itemsToAdd;\r
3728                                         FillListOfSelectedItemPaths(itemsToAdd);\r
3729 \r
3730                                         CAddDlg dlg;\r
3731                                         dlg.m_pathList = itemsToAdd;\r
3732                                         if (dlg.DoModal() == IDOK)\r
3733                                         {\r
3734                                                 if (dlg.m_pathList.GetCount() == 0)\r
3735                                                         break;\r
3736                                                 CSVNProgressDlg progDlg;\r
3737                                                 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);\r
3738                                                 progDlg.SetPathList(dlg.m_pathList);\r
3739                                                 ProjectProperties props;\r
3740                                                 props.ReadPropsPathList(dlg.m_pathList);\r
3741                                                 progDlg.SetProjectProperties(props);\r
3742                                                 progDlg.SetItemCount(dlg.m_pathList.GetCount());\r
3743                                                 progDlg.DoModal();\r
3744 \r
3745                                                 // refresh!\r
3746                                                 CWnd* pParent = GetParent();\r
3747                                                 if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3748                                                 {\r
3749                                                         pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3750                                                 }\r
3751                                         }\r
3752                                 }\r
3753                                 break;\r
3754                         case IDSVNLC_LOCK:\r
3755                                 {\r
3756                                         CTSVNPathList itemsToLock;\r
3757                                         FillListOfSelectedItemPaths(itemsToLock);\r
3758                                         CInputDlg inpDlg;\r
3759                                         inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);\r
3760                                         CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);\r
3761                                         inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);\r
3762                                         inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);\r
3763                                         ProjectProperties props;\r
3764                                         props.ReadPropsPathList(itemsToLock);\r
3765                                         props.nMinLogSize = 0;          // the lock message is optional, so no minimum!\r
3766                                         inpDlg.m_pProjectProperties = &props;\r
3767                                         if (inpDlg.DoModal()==IDOK)\r
3768                                         {\r
3769                                                 CSVNProgressDlg progDlg;\r
3770                                                 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);\r
3771                                                 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);\r
3772                                                 progDlg.SetPathList(itemsToLock);\r
3773                                                 progDlg.SetCommitMessage(inpDlg.m_sInputText);\r
3774                                                 progDlg.DoModal();\r
3775                                                 // refresh!\r
3776                                                 CWnd* pParent = GetParent();\r
3777                                                 if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3778                                                 {\r
3779                                                         pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3780                                                 }\r
3781                                         }\r
3782                                 }\r
3783                                 break;\r
3784                         case IDSVNLC_UNLOCKFORCE:\r
3785                                 bForce = true;\r
3786                         case IDSVNLC_UNLOCK:\r
3787                                 {\r
3788                                         CTSVNPathList itemsToUnlock;\r
3789                                         FillListOfSelectedItemPaths(itemsToUnlock);\r
3790                                         CSVNProgressDlg progDlg;\r
3791                                         progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);\r
3792                                         progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);\r
3793                                         progDlg.SetPathList(itemsToUnlock);\r
3794                                         progDlg.DoModal();\r
3795                                         // refresh!\r
3796                                         CWnd* pParent = GetParent();\r
3797                                         if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3798                                         {\r
3799                                                 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3800                                         }\r
3801                                 }\r
3802                                 break;\r
3803                         case IDSVNLC_REPAIRMOVE:\r
3804                                 {\r
3805                                         POSITION pos = GetFirstSelectedItemPosition();\r
3806                                         int index = GetNextSelectedItem(pos);\r
3807                                         FileEntry * entry1 = NULL;\r
3808                                         FileEntry * entry2 = NULL;\r
3809                                         if (index >= 0)\r
3810                                         {\r
3811                                                 entry1 = GetListEntry(index);\r
3812                                                 git_wc_status_kind status1 = git_wc_status_none;\r
3813                                                 git_wc_status_kind status2 = git_wc_status_none;\r
3814                                                 if (entry1)\r
3815                                                 {\r
3816                                                         status1 = entry1->status;\r
3817                                                         index = GetNextSelectedItem(pos);\r
3818                                                         if (index >= 0)\r
3819                                                         {\r
3820                                                                 entry2 = GetListEntry(index);\r
3821                                                                 if (entry2)\r
3822                                                                 {\r
3823                                                                         status2 = entry2->status;\r
3824                                                                         if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)\r
3825                                                                         {\r
3826                                                                                 FileEntry * tempentry = entry1;\r
3827                                                                                 entry1 = entry2;\r
3828                                                                                 entry2 = tempentry;\r
3829                                                                         }\r
3830                                                                         // entry1 was renamed to entry2 but outside of Subversion\r
3831                                                                         // fix this by moving entry2 back to entry1 first,\r
3832                                                                         // then do an git-move from entry1 to entry2\r
3833                                                                         if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))\r
3834                                                                         {\r
3835                                                                                 SVN git;\r
3836                                                                                 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))\r
3837                                                                                 {\r
3838                                                                                         CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3839                                                                                 }\r
3840                                                                                 else\r
3841                                                                                 {\r
3842                                                                                         // check the previously unversioned item\r
3843                                                                                         entry1->checked = true;\r
3844                                                                                         // fixing the move was successful. We have to adjust the new status of the\r
3845                                                                                         // files.\r
3846                                                                                         // Since we don't know if the moved/renamed file had local modifications or not,\r
3847                                                                                         // we can't guess the new status. That means we have to refresh...\r
3848                                                                                         CWnd* pParent = GetParent();\r
3849                                                                                         if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3850                                                                                         {\r
3851                                                                                                 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);\r
3852                                                                                         }\r
3853                                                                                 }\r
3854                                                                         }\r
3855                                                                         else\r
3856                                                                         {\r
3857                                                                                 LPVOID lpMsgBuf;\r
3858                                                                                 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | \r
3859                                                                                         FORMAT_MESSAGE_FROM_SYSTEM | \r
3860                                                                                         FORMAT_MESSAGE_IGNORE_INSERTS,\r
3861                                                                                         NULL,\r
3862                                                                                         GetLastError(),\r
3863                                                                                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language\r
3864                                                                                         (LPTSTR) &lpMsgBuf,\r
3865                                                                                         0,\r
3866                                                                                         NULL \r
3867                                                                                         );\r
3868                                                                                 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );\r
3869                                                                                 LocalFree( lpMsgBuf );\r
3870                                                                         }\r
3871                                                                 }\r
3872                                                         }\r
3873                                                 }\r
3874                                         }\r
3875                                 }\r
3876                                 break;\r
3877                         case IDSVNLC_REMOVEFROMCS:\r
3878                                 {\r
3879                                         CTSVNPathList changelistItems;\r
3880                                         FillListOfSelectedItemPaths(changelistItems);\r
3881                                         SVN git;\r
3882                                         SetRedraw(FALSE);\r
3883                                         if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))\r
3884                                         {\r
3885                                                 // The changelists were removed, but we now need to run through the selected items again\r
3886                                                 // and update their changelist\r
3887                                                 POSITION pos = GetFirstSelectedItemPosition();\r
3888                                                 int index;\r
3889                                                 std::vector<int> entriesToRemove;\r
3890                                                 while ((index = GetNextSelectedItem(pos)) >= 0)\r
3891                                                 {\r
3892                                                         FileEntry * e = GetListEntry(index);\r
3893                                                         if (e)\r
3894                                                         {\r
3895                                                                 e->changelist.Empty();\r
3896                                                                 if (e->status == git_wc_status_normal)\r
3897                                                                 {\r
3898                                                                         // remove the entry completely\r
3899                                                                         entriesToRemove.push_back(index);\r
3900                                                                 }\r
3901                                                                 else\r
3902                                                                         SetItemGroup(index, 0);\r
3903                                                         }\r
3904                                                 }\r
3905                                                 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)\r
3906                                                 {\r
3907                                                         RemoveListEntry(*it);\r
3908                                                 }\r
3909                                                 // TODO: Should we go through all entries here and check if we also could\r
3910                                                 // remove the changelist from m_changelists ?\r
3911                                         }\r
3912                                         else\r
3913                                         {\r
3914                                                 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3915                                         }\r
3916                                         SetRedraw(TRUE);\r
3917                                 }\r
3918                                 break;\r
3919                         case IDSVNLC_CREATEIGNORECS:\r
3920                                 CreateChangeList(SVNSLC_IGNORECHANGELIST);\r
3921                                 break;\r
3922                         case IDSVNLC_CREATECS:\r
3923                                 {\r
3924                                         CCreateChangelistDlg dlg;\r
3925                                         if (dlg.DoModal() == IDOK)\r
3926                                         {\r
3927                                                 CreateChangeList(dlg.m_sName);\r
3928                                         }\r
3929                                 }\r
3930                                 break;\r
3931                         default:\r
3932                                 {\r
3933                                         if (cmd < IDSVNLC_MOVETOCS)\r
3934                                                 break;\r
3935                                         CTSVNPathList changelistItems;\r
3936                                         FillListOfSelectedItemPaths(changelistItems);\r
3937 \r
3938                                         // find the changelist name\r
3939                                         CString sChangelist;\r
3940                                         int cmdID = IDSVNLC_MOVETOCS;\r
3941                                         SetRedraw(FALSE);\r
3942                                         for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)\r
3943                                         {\r
3944                                                 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))\r
3945                                                 {\r
3946                                                         if (cmd == cmdID)\r
3947                                                         {\r
3948                                                                 sChangelist = it->first;\r
3949                                                         }\r
3950                                                         cmdID++;\r
3951                                                 }\r
3952                                         }\r
3953                                         if (!sChangelist.IsEmpty())\r
3954                                         {\r
3955                                                 SVN git;\r
3956                                                 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))\r
3957                                                 {\r
3958                                                         // The changelists were moved, but we now need to run through the selected items again\r
3959                                                         // and update their changelist\r
3960                                                         POSITION pos = GetFirstSelectedItemPosition();\r
3961                                                         int index;\r
3962                                                         while ((index = GetNextSelectedItem(pos)) >= 0)\r
3963                                                         {\r
3964                                                                 FileEntry * e = GetListEntry(index);\r
3965                                                                 e->changelist = sChangelist;\r
3966                                                                 if (!e->IsFolder())\r
3967                                                                 {\r
3968                                                                         if (m_changelists.find(e->changelist)!=m_changelists.end())\r
3969                                                                                 SetItemGroup(index, m_changelists[e->changelist]);\r
3970                                                                         else\r
3971                                                                                 SetItemGroup(index, 0);\r
3972                                                                 }\r
3973                                                         }\r
3974                                                 }\r
3975                                                 else\r
3976                                                 {\r
3977                                                         CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
3978                                                 }\r
3979                                         }\r
3980                                         SetRedraw(TRUE);\r
3981                                 }\r
3982                                 break;\r
3983 #endif\r
3984 \r
3985                         } // switch (cmd)\r
3986                         m_bBlock = FALSE;\r
3987                         AfxGetApp()->DoWaitCursor(-1);\r
3988                         GetStatisticsString();\r
3989                         int iItemCountAfterMenuCmd = GetItemCount();\r
3990                         //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)\r
3991                         //{\r
3992                         //      CWnd* pParent = GetParent();\r
3993                         //      if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
3994                         //      {\r
3995                         //              pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);\r
3996                         //      }\r
3997                         //}\r
3998                 } // if (popup.CreatePopupMenu())\r
3999         } // if (selIndex >= 0)\r
4000 \r
4001 }\r
4002 \r
4003 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)\r
4004 {\r
4005         bool XPorLater = false;\r
4006         OSVERSIONINFOEX inf;\r
4007         SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));\r
4008         inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);\r
4009         GetVersionEx((OSVERSIONINFO *)&inf);\r
4010         WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);\r
4011         if (fullver >= 0x0501)\r
4012                 XPorLater = true;\r
4013 \r
4014         CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;\r
4015         if ((point.x == -1) && (point.y == -1))\r
4016         {\r
4017                 CRect rect;\r
4018                 pHeaderCtrl->GetItemRect(0, &rect);\r
4019                 ClientToScreen(&rect);\r
4020                 point = rect.CenterPoint();\r
4021         }\r
4022         Locker lock(m_critSec);\r
4023         CMenu popup;\r
4024         if (popup.CreatePopupMenu())\r
4025         {\r
4026                 int columnCount = m_ColumnManager.GetColumnCount();\r
4027 \r
4028                 CString temp;\r
4029                 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;\r
4030                 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;\r
4031 \r
4032                 // build control menu\r
4033 \r
4034                 if (XPorLater)\r
4035                 {\r
4036                         temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);\r
4037                         popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);\r
4038                 }\r
4039 \r
4040                 if (m_ColumnManager.AnyUnusedProperties())\r
4041                 {\r
4042                         temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);\r
4043                         popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);\r
4044                 }\r
4045 \r
4046                 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);\r
4047                 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);\r
4048                 popup.AppendMenu(MF_SEPARATOR);\r
4049 \r
4050                 // standard columns\r
4051 \r
4052                 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)\r
4053                 {\r
4054                         popup.AppendMenu ( m_ColumnManager.IsVisible(i) \r
4055                                 ? uCheckedFlags \r
4056                                 : uUnCheckedFlags\r
4057                                 , i\r
4058                                 , m_ColumnManager.GetName(i));\r
4059                 }\r
4060 \r
4061                 // user-prop columns:\r
4062                 // find relevant ones and sort 'em\r
4063 \r
4064                 std::map<CString, int> sortedProps;\r
4065                 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)\r
4066                         if (m_ColumnManager.IsRelevant(i))\r
4067                                 sortedProps[m_ColumnManager.GetName(i)] = i;\r
4068 \r
4069                 if (!sortedProps.empty())\r
4070                 {\r
4071                         // add 'em to the menu\r
4072 \r
4073                         popup.AppendMenu(MF_SEPARATOR);\r
4074 \r
4075                         typedef std::map<CString, int>::const_iterator CIT;\r
4076                         for ( CIT iter = sortedProps.begin(), end = sortedProps.end()\r
4077                                 ; iter != end\r
4078                                 ; ++iter)\r
4079                         {\r
4080                                 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second) \r
4081                                         ? uCheckedFlags \r
4082                                         : uUnCheckedFlags\r
4083                                         , iter->second\r
4084                                         , iter->first);\r
4085                         }\r
4086                 }\r
4087 \r
4088                 // show menu & let user pick an entry\r
4089 \r
4090                 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
4091                 if ((cmd >= 1)&&(cmd < columnCount))\r
4092                 {\r
4093                         m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));\r
4094                 } \r
4095                 else if (cmd == columnCount)\r
4096                 {\r
4097                         EnableGroupView(!IsGroupViewEnabled());\r
4098                 } \r
4099                 else if (cmd == columnCount+1)\r
4100                 {\r
4101                         m_ColumnManager.RemoveUnusedProps();\r
4102                 } \r
4103                 else if (cmd == columnCount+2)\r
4104                 {\r
4105                         m_ColumnManager.ResetColumns (m_dwDefaultColumns);\r
4106                 }\r
4107         }\r
4108 }\r
4109 \r
4110 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)\r
4111 {\r
4112 \r
4113         if (pWnd == this)\r
4114         {\r
4115                 OnContextMenuList(pWnd, point);\r
4116         } // if (pWnd == this)\r
4117         else if (pWnd == GetHeaderCtrl())\r
4118         {\r
4119                 OnContextMenuHeader(pWnd, point);\r
4120         }\r
4121 }\r
4122 \r
4123 void CGitStatusListCtrl::CreateChangeList(const CString& name)\r
4124 {\r
4125 #if 0\r
4126         CTGitPathList changelistItems;\r
4127         FillListOfSelectedItemPaths(changelistItems);\r
4128         Git git;\r
4129         if (git.AddToChangeList(changelistItems, name, git_depth_empty))\r
4130         {\r
4131                 TCHAR groupname[1024];\r
4132                 LVGROUP grp = {0};\r
4133                 grp.cbSize = sizeof(LVGROUP);\r
4134                 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;\r
4135                 _tcsncpy_s(groupname, 1024, name, 1023);\r
4136                 grp.pszHeader = groupname;\r
4137                 grp.iGroupId = (int)m_changelists.size();\r
4138                 grp.uAlign = LVGA_HEADER_LEFT;\r
4139                 m_changelists[name] = InsertGroup(-1, &grp);\r
4140 \r
4141                 PrepareGroups(true);\r
4142 \r
4143                 POSITION pos = GetFirstSelectedItemPosition();\r
4144                 int index;\r
4145                 while ((index = GetNextSelectedItem(pos)) >= 0)\r
4146                 {\r
4147                         FileEntry * e = GetListEntry(index);\r
4148                         e->changelist = name;\r
4149                         SetEntryCheck(e, index, FALSE);\r
4150                 }\r
4151 \r
4152                 for (index = 0; index < GetItemCount(); ++index)\r
4153                 {\r
4154                         FileEntry * e = GetListEntry(index);\r
4155                         if (m_changelists.find(e->changelist)!=m_changelists.end())\r
4156                                 SetItemGroup(index, m_changelists[e->changelist]);\r
4157                         else\r
4158                                 SetItemGroup(index, 0);\r
4159                 }\r
4160         }\r
4161         else\r
4162         {\r
4163                 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);\r
4164         }\r
4165 #endif\r
4166 }\r
4167 \r
4168 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)\r
4169 {\r
4170 \r
4171         Locker lock(m_critSec);\r
4172         LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
4173         *pResult = 0;\r
4174         if (m_bBlock)\r
4175                 return;\r
4176 #if 0\r
4177         if (pNMLV->iItem < 0)\r
4178         {\r
4179                 if (!IsGroupViewEnabled())\r
4180                         return;\r
4181                 POINT pt;\r
4182                 DWORD ptW = GetMessagePos();\r
4183                 pt.x = GET_X_LPARAM(ptW);\r
4184                 pt.y = GET_Y_LPARAM(ptW);\r
4185                 ScreenToClient(&pt);\r
4186                 int group = GetGroupFromPoint(&pt);\r
4187                 if (group < 0)\r
4188                         return;\r
4189                 // check/uncheck the whole group depending on the check-state \r
4190                 // of the first item in the group\r
4191                 m_bBlock = true;\r
4192                 bool bCheck = false;\r
4193                 bool bFirst = false;\r
4194                 LVITEM lv;\r
4195                 for (int i=0; i<GetItemCount(); ++i)\r
4196                 {\r
4197                         SecureZeroMemory(&lv, sizeof(LVITEM));\r
4198                         lv.mask = LVIF_GROUPID;\r
4199                         lv.iItem = i;\r
4200                         GetItem(&lv);\r
4201                         if (lv.iGroupId == group)\r
4202                         {\r
4203                                 FileEntry * entry = GetListEntry(i);\r
4204                                 if (!bFirst)\r
4205                                 {\r
4206                                         bCheck = !GetCheck(i);\r
4207                                         bFirst = true;\r
4208                                 }\r
4209                                 if (entry)\r
4210                                 {\r
4211                                         bool bOldCheck = !!GetCheck(i);\r
4212                                         SetEntryCheck(entry, i, bCheck);\r
4213                                         if (bCheck != bOldCheck)\r
4214                                         {\r
4215                                                 if (bCheck)\r
4216                                                         m_nSelected++;\r
4217                                                 else\r
4218                                                         m_nSelected--;\r
4219                                         }\r
4220                                 }\r
4221                         }\r
4222                 }\r
4223                 GetStatisticsString();\r
4224                 m_bBlock = false;\r
4225                 NotifyCheck();\r
4226                 return;\r
4227         }\r
4228 #endif\r
4229 //      FileEntry * entry = GetListEntry(pNMLV->iItem);\r
4230 //      if (entry)\r
4231         {\r
4232 //              if (entry->isConflicted)\r
4233 //              {\r
4234 //                      gitDiff::StartConflictEditor(entry->GetPath());\r
4235 //              }\r
4236 //              else\r
4237                 {\r
4238                         StartDiff(pNMLV->iItem);\r
4239                 }\r
4240         }\r
4241 \r
4242 }\r
4243 \r
4244 void CGitStatusListCtrl::StartDiff(int fileindex)\r
4245 {\r
4246         if(fileindex<0)\r
4247                 return;\r
4248 \r
4249         CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);\r
4250         CTGitPath file2;\r
4251         if(file1.m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
4252         {\r
4253                 file2.SetFromGit(file1.GetGitOldPathString());\r
4254         }else\r
4255         {\r
4256                 file2=file1;\r
4257         }\r
4258 \r
4259         if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)\r
4260         {\r
4261                 if(!g_Git.IsInitRepos())\r
4262                         CGitDiff::Diff(&file1,&file2,\r
4263                                 CString(GIT_REV_ZERO),\r
4264                                         GitRev::GetHead());\r
4265                 else\r
4266                         CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),\r
4267                                 CString(GIT_REV_ZERO));\r
4268         }else\r
4269         {\r
4270                 CGitDiff::Diff(&file1,&file2,\r
4271                                 m_CurrentVersion,\r
4272                                         m_CurrentVersion+_T("~1"));\r
4273         }\r
4274 #if 0\r
4275         if (fileindex < 0)\r
4276                 return;\r
4277         FileEntry * entry = GetListEntry(fileindex);\r
4278         ASSERT(entry != NULL);\r
4279         if (entry == NULL)\r
4280                 return;\r
4281         if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||\r
4282                 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))\r
4283         {\r
4284                 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);\r
4285                 if (ret <= HINSTANCE_ERROR)\r
4286                 {\r
4287                         CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");\r
4288                         cmd += entry->path.GetWinPathString();\r
4289                         CAppUtils::LaunchApplication(cmd, NULL, false);\r
4290                 }\r
4291                 return;\r
4292         }\r
4293 \r
4294         GitDiff diff(NULL, m_hWnd, true);\r
4295         diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
4296         diff.DiffWCFile(\r
4297                 entry->path, entry->textstatus, entry->propstatus,\r
4298                 entry->remotetextstatus, entry->remotepropstatus);\r
4299 #endif\r
4300 }\r
4301 \r
4302 CString CGitStatusListCtrl::GetStatisticsString()\r
4303 {\r
4304 \r
4305         CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;\r
4306         WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
4307         TCHAR buf[MAX_STATUS_STRING_LENGTH];\r
4308         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4309         sNormal = buf;\r
4310         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4311         sAdded = buf;\r
4312         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4313         sDeleted = buf;\r
4314         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4315         sModified = buf;\r
4316         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4317         sConflicted = buf;\r
4318         GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
4319         sUnversioned = buf;\r
4320         CString sToolTip;\r
4321         sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),\r
4322                 (LPCTSTR)sNormal, m_nNormal,\r
4323                 (LPCTSTR)sUnversioned, m_nUnversioned,\r
4324                 (LPCTSTR)sModified, m_nModified,\r
4325                 (LPCTSTR)sAdded, m_nAdded,\r
4326                 (LPCTSTR)sDeleted, m_nDeleted,\r
4327                 (LPCTSTR)sConflicted, m_nConflicted\r
4328                 );\r
4329         CString sStats;\r
4330         sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());\r
4331         if (m_pStatLabel)\r
4332         {\r
4333                 m_pStatLabel->SetWindowText(sStats);\r
4334         }\r
4335 \r
4336         if (m_pSelectButton)\r
4337         {\r
4338                 if (m_nSelected == 0)\r
4339                         m_pSelectButton->SetCheck(BST_UNCHECKED);\r
4340                 else if (m_nSelected != GetItemCount())\r
4341                         m_pSelectButton->SetCheck(BST_INDETERMINATE);\r
4342                 else\r
4343                         m_pSelectButton->SetCheck(BST_CHECKED);\r
4344         }\r
4345 \r
4346         if (m_pConfirmButton)\r
4347         {\r
4348                 m_pConfirmButton->EnableWindow(m_nSelected>0);\r
4349         }\r
4350 \r
4351         return sToolTip;\r
4352 \r
4353 \r
4354 }\r
4355 \r
4356 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)\r
4357 {\r
4358         if (!bStrict)\r
4359         {\r
4360                 // not strict means that the selected folder has priority\r
4361                 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())\r
4362                         return m_StatusFileList.GetCommonDirectory().GetWinPath();\r
4363         }\r
4364 \r
4365         CTGitPath commonBaseDirectory;\r
4366         int nListItems = GetItemCount();\r
4367         for (int i=0; i<nListItems; ++i)\r
4368         {\r
4369                 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);\r
4370                 ASSERT(p);\r
4371                 if(p==NULL)\r
4372                         continue;\r
4373                 baseDirectory = p->GetDirectory();\r
4374 \r
4375                 if(commonBaseDirectory.IsEmpty())\r
4376                 {\r
4377                         commonBaseDirectory = baseDirectory;\r
4378                 }\r
4379                 else\r
4380                 {\r
4381                         if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())\r
4382                         {\r
4383                                 if (baseDirectory.IsAncestorOf(commonBaseDirectory))\r
4384                                         commonBaseDirectory = baseDirectory;\r
4385                         }\r
4386                 }\r
4387         }\r
4388         return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();\r
4389 }\r
4390 \r
4391 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)\r
4392 {\r
4393         CTGitPath commonBaseURL;\r
4394 #if 0\r
4395         \r
4396         if (!bStrict)\r
4397         {\r
4398                 // not strict means that the selected folder has priority\r
4399                 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())\r
4400                         return m_StatusUrlList.GetCommonDirectory();\r
4401         }\r
4402 \r
4403         int nListItems = GetItemCount();\r
4404         for (int i=0; i<nListItems; ++i)\r
4405         {\r
4406                 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());\r
4407                 if (baseURL.IsEmpty())\r
4408                         continue;                       // item has no url\r
4409                 if(commonBaseURL.IsEmpty())\r
4410                 {\r
4411                         commonBaseURL = baseURL;\r
4412                 }\r
4413                 else\r
4414                 {\r
4415                         if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())\r
4416                         {\r
4417                                 if (baseURL.IsAncestorOf(commonBaseURL))\r
4418                                         commonBaseURL = baseURL;\r
4419                         }\r
4420                 }\r
4421         }\r
4422         \r
4423 #endif\r
4424         return commonBaseURL;\r
4425 }\r
4426 \r
4427 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)\r
4428 {\r
4429         CWaitCursor waitCursor;\r
4430         // block here so the LVN_ITEMCHANGED messages\r
4431         // get ignored\r
4432         m_bBlock = TRUE;\r
4433         SetRedraw(FALSE);\r
4434 \r
4435         int nListItems = GetItemCount();\r
4436         if (bSelect)\r
4437                 m_nSelected = nListItems;\r
4438         else\r
4439                 m_nSelected = 0;\r
4440 \r
4441         for (int i=0; i<nListItems; ++i)\r
4442         {\r
4443                 //FileEntry * entry = GetListEntry(i);\r
4444                 //ASSERT(entry != NULL);\r
4445                 CTGitPath *path = (CTGitPath *) GetItemData(i);\r
4446                 if (path == NULL)\r
4447                         continue;\r
4448                 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))\r
4449                 SetEntryCheck(path,i,bSelect);\r
4450         }\r
4451 \r
4452         // unblock before redrawing\r
4453         m_bBlock = FALSE;\r
4454         SetRedraw(TRUE);\r
4455         GetStatisticsString();\r
4456         NotifyCheck();\r
4457 }\r
4458 \r
4459 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)\r
4460 {\r
4461         LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);\r
4462         *pResult = 0;\r
4463         if (m_bBlock)\r
4464                 return;\r
4465 #if 0\r
4466         if (GetListEntry(pGetInfoTip->iItem >= 0))\r
4467                 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())\r
4468                 {\r
4469                         if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)\r
4470                                 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);\r
4471                         else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))\r
4472                                 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);\r
4473                 }\r
4474 #endif\r
4475 }\r
4476 \r
4477 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)\r
4478 {\r
4479         NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );\r
4480 \r
4481         // Take the default processing unless we set this to something else below.\r
4482         *pResult = CDRF_DODEFAULT;\r
4483 \r
4484         // First thing - check the draw stage. If it's the control's prepaint\r
4485         // stage, then tell Windows we want messages for every item.\r
4486 \r
4487         switch (pLVCD->nmcd.dwDrawStage)\r
4488         {\r
4489         case CDDS_PREPAINT:\r
4490                 *pResult = CDRF_NOTIFYITEMDRAW;\r
4491                 break;\r
4492         case CDDS_ITEMPREPAINT:\r
4493                 {\r
4494                         // This is the prepaint stage for an item. Here's where we set the\r
4495                         // item's text color. Our return value will tell Windows to draw the\r
4496                         // item itself, but it will use the new color we set here.\r
4497 \r
4498                         // Tell Windows to paint the control itself.\r
4499                         *pResult = CDRF_DODEFAULT;\r
4500                         if (m_bBlock)\r
4501                                 return;\r
4502 \r
4503                         COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);\r
4504 \r
4505                         if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)\r
4506                         {\r
4507 \r
4508                                 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);\r
4509                                 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);\r
4510                                 if (entry == NULL)\r
4511                                         return;\r
4512 \r
4513                                 // coloring\r
4514                                 // ========\r
4515                                 // black  : unversioned, normal\r
4516                                 // purple : added\r
4517                                 // blue   : modified\r
4518                                 // brown  : missing, deleted, replaced\r
4519                                 // green  : merged (or potential merges)\r
4520                                 // red    : conflicts or sure conflicts\r
4521                                 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)\r
4522                                 {\r
4523                                         crText = RGB(128,128,128);\r
4524 \r
4525                                 }else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)\r
4526                                 {\r
4527                                         crText = m_Colors.GetColor(CColors::Conflict);\r
4528 \r
4529                                 }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)\r
4530                                 {\r
4531                                         crText = m_Colors.GetColor(CColors::Modified);\r
4532 \r
4533                                 }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)\r
4534                                 {\r
4535                                         crText = m_Colors.GetColor(CColors::Added);\r
4536                                 }\r
4537                                 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)\r
4538                                 {\r
4539                                         crText = m_Colors.GetColor(CColors::DeletedNode);\r
4540                                 }\r
4541                                 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
4542                                 {\r
4543                                         crText = m_Colors.GetColor(CColors::RenamedNode);\r
4544                                 }else\r
4545                                 {\r
4546                                         crText = GetSysColor(COLOR_WINDOWTEXT);\r
4547                                 }\r
4548                                 // Store the color back in the NMLVCUSTOMDRAW struct.\r
4549                                 pLVCD->clrText = crText;\r
4550                         }\r
4551                 }\r
4552                 break;\r
4553         }\r
4554 }\r
4555 \r
4556 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
4557 {\r
4558         if (pWnd != this)\r
4559                 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);\r
4560         if (!m_bBlock)\r
4561         {\r
4562                 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));\r
4563                 SetCursor(hCur);\r
4564                 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);\r
4565         }\r
4566         HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));\r
4567         SetCursor(hCur);\r
4568         return TRUE;\r
4569 }\r
4570 \r
4571 void CGitStatusListCtrl::RemoveListEntry(int index)\r
4572 {\r
4573 \r
4574         Locker lock(m_critSec);\r
4575         DeleteItem(index);\r
4576 \r
4577         m_arStatusArray.erase(m_arStatusArray.begin()+index);\r
4578 \r
4579 #if 0\r
4580         delete m_arStatusArray[m_arListArray[index]];\r
4581         m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);\r
4582         m_arListArray.erase(m_arListArray.begin()+index);\r
4583         for (int i=index; i< (int)m_arListArray.size(); ++i)\r
4584         {\r
4585                 m_arListArray[i]--;\r
4586         }\r
4587 #endif\r
4588 }\r
4589 \r
4590 ///< Set a checkbox on an entry in the listbox\r
4591 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync\r
4592 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)\r
4593 {\r
4594         pEntry->m_Checked = bCheck;\r
4595         SetCheck(listboxIndex, bCheck);\r
4596 }\r
4597 \r
4598 #if 0\r
4599 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)\r
4600 {\r
4601 \r
4602         int nListItems = GetItemCount();\r
4603         for (int j=0; j< nListItems ; ++j)\r
4604         {\r
4605                 FileEntry * childEntry = GetListEntry(j);\r
4606                 ASSERT(childEntry != NULL);\r
4607                 if (childEntry == NULL || childEntry == parentEntry)\r
4608                         continue;\r
4609                 if (childEntry->checked != bCheck)\r
4610                 {\r
4611                         if (parentEntry->path.IsAncestorOf(childEntry->path))\r
4612                         {\r
4613                                 SetEntryCheck(childEntry,j,bCheck);\r
4614                                 if(bCheck)\r
4615                                 {\r
4616                                         m_nSelected++;\r
4617                                 }\r
4618                                 else\r
4619                                 {\r
4620                                         m_nSelected--;\r
4621                                 }\r
4622                         }\r
4623                 }\r
4624         }\r
4625 \r
4626 }\r
4627 #endif\r
4628 \r
4629 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)\r
4630 {\r
4631 \r
4632         pathList.Clear();\r
4633         int nListItems = GetItemCount();\r
4634         for (int i=0; i< nListItems; i++)\r
4635         {\r
4636                 CTGitPath * entry = (CTGitPath*)GetItemData(i);\r
4637                 ASSERT(entry != NULL);\r
4638                 if (entry->m_Checked)\r
4639                 {\r
4640                         pathList.AddPath(*entry);\r
4641                 }\r
4642         }\r
4643         pathList.SortByPathname();\r
4644 \r
4645 }\r
4646 \r
4647 \r
4648 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)\r
4649 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)\r
4650 {\r
4651         pathList.Clear();\r
4652 \r
4653         POSITION pos = GetFirstSelectedItemPosition();\r
4654         int index;\r
4655         while ((index = GetNextSelectedItem(pos)) >= 0)\r
4656         {\r
4657                 CTGitPath * entry = (CTGitPath*)GetItemData(index);\r
4658                 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))\r
4659                 //      continue;\r
4660                 pathList.AddPath(*entry);\r
4661         }\r
4662 }\r
4663 \r
4664 UINT CGitStatusListCtrl::OnGetDlgCode()\r
4665 {\r
4666         // we want to process the return key and not have that one\r
4667         // routed to the default pushbutton\r
4668         return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;\r
4669 }\r
4670 \r
4671 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
4672 {\r
4673         *pResult = 0;\r
4674         if (m_bBlock)\r
4675                 return;\r
4676         POSITION pos = GetFirstSelectedItemPosition();\r
4677         while ( pos )\r
4678         {\r
4679                 int index = GetNextSelectedItem(pos);\r
4680                 StartDiff(index);\r
4681         }\r
4682 }\r
4683 \r
4684 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)\r
4685 {\r
4686         // Since we catch all keystrokes (to have the enter key processed here instead\r
4687         // of routed to the default pushbutton) we have to make sure that other\r
4688         // keys like Tab and Esc still do what they're supposed to do\r
4689         // Tab = change focus to next/previous control\r
4690         // Esc = quit the dialog\r
4691         switch (nChar)\r
4692         {\r
4693         case (VK_TAB):\r
4694                 {\r
4695                         ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);\r
4696                         return;\r
4697                 }\r
4698                 break;\r
4699         case (VK_ESCAPE):\r
4700                 {\r
4701                         ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);\r
4702                 }\r
4703                 break;\r
4704         }\r
4705 \r
4706         CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);\r
4707 }\r
4708 \r
4709 void CGitStatusListCtrl::PreSubclassWindow()\r
4710 {\r
4711         CListCtrl::PreSubclassWindow();\r
4712         EnableToolTips(TRUE);\r
4713         m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);\r
4714 }\r
4715 \r
4716 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const\r
4717 {\r
4718         int row, col;\r
4719         RECT cellrect;\r
4720         row = CellRectFromPoint(point, &cellrect, &col );\r
4721 \r
4722         if (row == -1)\r
4723                 return -1;\r
4724 \r
4725 \r
4726         pTI->hwnd = m_hWnd;\r
4727         pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);\r
4728         pTI->lpszText = LPSTR_TEXTCALLBACK;\r
4729 \r
4730         pTI->rect = cellrect;\r
4731 \r
4732         return pTI->uId;\r
4733 }\r
4734 \r
4735 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const\r
4736 {\r
4737         int colnum;\r
4738 \r
4739         // Make sure that the ListView is in LVS_REPORT\r
4740         if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)\r
4741                 return -1;\r
4742 \r
4743         // Get the top and bottom row visible\r
4744         int row = GetTopIndex();\r
4745         int bottom = row + GetCountPerPage();\r
4746         if (bottom > GetItemCount())\r
4747                 bottom = GetItemCount();\r
4748 \r
4749         // Get the number of columns\r
4750         CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);\r
4751         int nColumnCount = pHeader->GetItemCount();\r
4752 \r
4753         // Loop through the visible rows\r
4754         for ( ;row <=bottom;row++)\r
4755         {\r
4756                 // Get bounding rect of item and check whether point falls in it.\r
4757                 CRect rect;\r
4758                 GetItemRect(row, &rect, LVIR_BOUNDS);\r
4759                 if (rect.PtInRect(point))\r
4760                 {\r
4761                         // Now find the column\r
4762                         for (colnum = 0; colnum < nColumnCount; colnum++)\r
4763                         {\r
4764                                 int colwidth = GetColumnWidth(colnum);\r
4765                                 if (point.x >= rect.left && point.x <= (rect.left + colwidth))\r
4766                                 {\r
4767                                         RECT rectClient;\r
4768                                         GetClientRect(&rectClient);\r
4769                                         if (col)\r
4770                                                 *col = colnum;\r
4771                                         rect.right = rect.left + colwidth;\r
4772 \r
4773                                         // Make sure that the right extent does not exceed\r
4774                                         // the client area\r
4775                                         if (rect.right > rectClient.right)\r
4776                                                 rect.right = rectClient.right;\r
4777                                         *cellrect = rect;\r
4778                                         return row;\r
4779                                 }\r
4780                                 rect.left += colwidth;\r
4781                         }\r
4782                 }\r
4783         }\r
4784         return -1;\r
4785 }\r
4786 \r
4787 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)\r
4788 {\r
4789 #if 0\r
4790         TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;\r
4791         CString strTipText;\r
4792         UINT_PTR nID = pNMHDR->idFrom;\r
4793 \r
4794         if (nID == 0)\r
4795                 return FALSE;\r
4796 \r
4797         UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;\r
4798         UINT_PTR col = (nID-1) & 0x3ff;\r
4799 \r
4800         if (col == 0)\r
4801                 return FALSE;   // no custom tooltip for the path, we use the infotip there!\r
4802 \r
4803         // get the internal column from the visible columns\r
4804         int internalcol = 0;\r
4805         UINT_PTR currentcol = 0;\r
4806     for (;    (currentcol != col) \r
4807            && (internalcol < m_ColumnManager.GetColumnCount()-1)\r
4808          ; ++internalcol)\r
4809         {\r
4810         if (m_ColumnManager.IsVisible (internalcol))\r
4811                         currentcol++;\r
4812         }\r
4813 \r
4814         AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();\r
4815         CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;\r
4816         pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);\r
4817 \r
4818         *pResult = 0;\r
4819         if ((internalcol == 2)||(internalcol == 4))\r
4820         {\r
4821                 FileEntry *fentry = GetListEntry(row);\r
4822                 if (fentry)\r
4823                 {\r
4824                         if (fentry->copied)\r
4825                         {\r
4826                                 CString url;\r
4827                                 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);\r
4828                                 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);\r
4829                                 return TRUE;\r
4830                         }\r
4831                         if (fentry->switched)\r
4832                         {\r
4833                                 CString url;\r
4834                                 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));\r
4835                                 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);\r
4836                                 return TRUE;\r
4837                         }\r
4838                         if (fentry->keeplocal)\r
4839                         {\r
4840                                 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);\r
4841                                 return TRUE;\r
4842                         }\r
4843                 }\r
4844         }\r
4845 #endif\r
4846         return FALSE;\r
4847 }\r
4848 \r
4849 void CGitStatusListCtrl::OnPaint()\r
4850 {\r
4851         Default();\r
4852         if ((m_bBusy)||(m_bEmpty))\r
4853         {\r
4854                 CString str;\r
4855                 if (m_bBusy)\r
4856                 {\r
4857                         if (m_sBusy.IsEmpty())\r
4858                                 str.LoadString(IDS_STATUSLIST_BUSYMSG);\r
4859                         else\r
4860                                 str = m_sBusy;\r
4861                 }\r
4862                 else\r
4863                 {\r
4864                         if (m_sEmpty.IsEmpty())\r
4865                                 str.LoadString(IDS_STATUSLIST_EMPTYMSG);\r
4866                         else\r
4867                                 str = m_sEmpty;\r
4868                 }\r
4869                 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);\r
4870                 COLORREF clrTextBk;\r
4871                 if (IsWindowEnabled())\r
4872                         clrTextBk = ::GetSysColor(COLOR_WINDOW);\r
4873                 else\r
4874                         clrTextBk = ::GetSysColor(COLOR_3DFACE);\r
4875 \r
4876                 CRect rc;\r
4877                 GetClientRect(&rc);\r
4878                 CHeaderCtrl* pHC;\r
4879                 pHC = GetHeaderCtrl();\r
4880                 if (pHC != NULL)\r
4881                 {\r
4882                         CRect rcH;\r
4883                         pHC->GetItemRect(0, &rcH);\r
4884                         rc.top += rcH.bottom;\r
4885                 }\r
4886                 CDC* pDC = GetDC();\r
4887                 {\r
4888                         CMyMemDC memDC(pDC, &rc);\r
4889 \r
4890                         memDC.SetTextColor(clrText);\r
4891                         memDC.SetBkColor(clrTextBk);\r
4892                         memDC.FillSolidRect(rc, clrTextBk);\r
4893                         rc.top += 10;\r
4894                         CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);\r
4895                         memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |\r
4896                                 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);\r
4897                         memDC.SelectObject(oldfont);\r
4898                 }\r
4899                 ReleaseDC(pDC);\r
4900         }\r
4901 }\r
4902 \r
4903 // prevent users from extending our hidden (size 0) columns\r
4904 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)\r
4905 {\r
4906         LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
4907         *pResult = 0;\r
4908         if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))\r
4909                 return;\r
4910 \r
4911     if (m_ColumnManager.IsVisible (phdr->iItem))\r
4912         {\r
4913                 return;\r
4914         }\r
4915         *pResult = 1;\r
4916 }\r
4917 \r
4918 // prevent any function from extending our hidden (size 0) columns\r
4919 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)\r
4920 {\r
4921         LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
4922         *pResult = 0;\r
4923     if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))\r
4924         {\r
4925                 Default();\r
4926                 return;\r
4927         }\r
4928 \r
4929     // visible columns may be modified \r
4930 \r
4931     if (m_ColumnManager.IsVisible (phdr->iItem))\r
4932         {\r
4933                 Default();\r
4934                 return;\r
4935         }\r
4936 \r
4937     // columns already marked as "invisible" internally may be (re-)sized to 0\r
4938 \r
4939     if (   (phdr->pitem != NULL) \r
4940         && (phdr->pitem->mask == HDI_WIDTH)\r
4941         && (phdr->pitem->cxy == 0))\r
4942         {\r
4943                 Default();\r
4944                 return;\r
4945         }\r
4946 \r
4947         if (   (phdr->pitem != NULL) \r
4948                 && (phdr->pitem->mask != HDI_WIDTH))\r
4949         {\r
4950                 Default();\r
4951                 return;\r
4952         }\r
4953 \r
4954     *pResult = 1;\r
4955 }\r
4956 \r
4957 void CGitStatusListCtrl::OnDestroy()\r
4958 {\r
4959         SaveColumnWidths(true);\r
4960         CListCtrl::OnDestroy();\r
4961 }\r
4962 \r
4963 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)\r
4964 {\r
4965 #if 0\r
4966         Locker lock(m_critSec);\r
4967         CDropFiles dropFiles; // class for creating DROPFILES struct\r
4968 \r
4969         int index;\r
4970         POSITION pos = GetFirstSelectedItemPosition();\r
4971         while ( (index = GetNextSelectedItem(pos)) >= 0 )\r
4972         {\r
4973                 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];\r
4974                 CTGitPath path = fentry->GetPath();\r
4975                 dropFiles.AddFile( path.GetWinPathString() );\r
4976         }\r
4977 \r
4978         if ( dropFiles.GetCount()>0 )\r
4979         {\r
4980                 m_bOwnDrag = true;\r
4981                 dropFiles.CreateStructure();\r
4982                 m_bOwnDrag = false;\r
4983         }\r
4984 #endif\r
4985         *pResult = 0;\r
4986 }\r
4987 \r
4988 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)\r
4989 {\r
4990         int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
4991         for (int col = 0; col <= maxcol; col++)\r
4992         if (m_ColumnManager.IsVisible (col))\r
4993             m_ColumnManager.ColumnResized (col);\r
4994 \r
4995         if (bSaveToRegistry)\r
4996         m_ColumnManager.WriteSettings();\r
4997 }\r
4998 \r
4999 bool CGitStatusListCtrl::EnableFileDrop()\r
5000 {\r
5001         m_bFileDropsEnabled = true;\r
5002         return true;\r
5003 }\r
5004 \r
5005 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)\r
5006 {\r
5007 #if 0\r
5008         for (size_t i=0; i < m_arStatusArray.size(); i++)\r
5009         {\r
5010                 FileEntry * entry = m_arStatusArray[i];\r
5011                 if (entry->GetPath().IsEquivalentTo(path))\r
5012                         return true;\r
5013         }\r
5014 #endif\r
5015         return false;\r
5016 }\r
5017 \r
5018 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)\r
5019 {\r
5020 #if 0\r
5021         int itemCount = GetItemCount();\r
5022         for (int i=0; i < itemCount; i++)\r
5023         {\r
5024                 FileEntry * entry = GetListEntry(i);\r
5025                 if (entry->GetPath().IsEquivalentTo(path))\r
5026                         return true;\r
5027         }\r
5028 #endif\r
5029         return false;\r
5030 }\r
5031 \r
5032 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)\r
5033 {\r
5034         if (pMsg->message == WM_KEYDOWN)\r
5035         {\r
5036                 switch (pMsg->wParam)\r
5037                 {\r
5038                 case 'A':\r
5039                         {\r
5040                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)\r
5041                                 {\r
5042                                         // select all entries\r
5043                                         for (int i=0; i<GetItemCount(); ++i)\r
5044                                         {\r
5045                                                 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);\r
5046                                         }\r
5047                                         return TRUE;\r
5048                                 }\r
5049                         }\r
5050                         break;\r
5051                 case 'C':\r
5052                 case VK_INSERT:\r
5053                         {\r
5054                                 if (GetAsyncKeyState(VK_CONTROL)&0x8000)\r
5055                                 {\r
5056                                         // copy all selected paths to the clipboard\r
5057                                         if (GetAsyncKeyState(VK_SHIFT)&0x8000)\r
5058                                                 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);\r
5059                                         else\r
5060                                                 CopySelectedEntriesToClipboard(0);\r
5061                                         return TRUE;\r
5062                                 }\r
5063                         }\r
5064                         break;\r
5065                 }\r
5066         }\r
5067 \r
5068         return CListCtrl::PreTranslateMessage(pMsg);\r
5069 }\r
5070 \r
5071 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)\r
5072 {\r
5073 #if 0\r
5074         static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));\r
5075         static HINSTANCE hResourceHandle(AfxGetResourceHandle());\r
5076         WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
5077 \r
5078         CString sClipboard;\r
5079         CString temp;\r
5080         TCHAR buf[100];\r
5081         if (GetSelectedCount() == 0)\r
5082                 return false;\r
5083         // first add the column titles as the first line\r
5084         temp.LoadString(IDS_STATUSLIST_COLFILE);\r
5085         sClipboard = temp;\r
5086 \r
5087     DWORD selection = 0;\r
5088     for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)\r
5089         if (   ((dwCols == -1) && m_ColumnManager.IsVisible (i))\r
5090             || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))\r
5091         {\r
5092             sClipboard += _T("\t") + m_ColumnManager.GetName(i);\r
5093 \r
5094             if (i < 32)\r
5095                 selection += 1 << i;\r
5096         }\r
5097 \r
5098         sClipboard += _T("\r\n");\r
5099 \r
5100         POSITION pos = GetFirstSelectedItemPosition();\r
5101         int index;\r
5102         while ((index = GetNextSelectedItem(pos)) >= 0)\r
5103         {\r
5104                 FileEntry * entry = GetListEntry(index);\r
5105                 sClipboard += entry->GetDisplayName();\r
5106                 if (selection & SVNSLC_COLFILENAME)\r
5107                 {\r
5108                         sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();\r
5109                 }\r
5110                 if (selection & SVNSLC_COLEXT)\r
5111                 {\r
5112                         sClipboard += _T("\t")+entry->path.GetFileExtension();\r
5113                 }\r
5114                 if (selection & SVNSLC_COLSTATUS)\r
5115                 {\r
5116                         if (entry->isNested)\r
5117                         {\r
5118                                 temp.LoadString(IDS_STATUSLIST_NESTED);\r
5119                         }\r
5120                         else\r
5121                         {\r
5122                                 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5123                                 if ((entry->copied)&&(_tcslen(buf)>1))\r
5124                                         _tcscat_s(buf, 100, _T(" (+)"));\r
5125                                 if ((entry->switched)&&(_tcslen(buf)>1))\r
5126                                         _tcscat_s(buf, 100, _T(" (s)"));\r
5127                                 if ((entry->status == entry->propstatus)&&\r
5128                                         (entry->status != git_wc_status_normal)&&\r
5129                                         (entry->status != git_wc_status_unversioned)&&\r
5130                                         (!GitStatus::IsImportant(entry->textstatus)))\r
5131                                         _tcscat_s(buf, 100, ponly);\r
5132                                 temp = buf;\r
5133                         }\r
5134                         sClipboard += _T("\t")+temp;\r
5135                 }\r
5136                 if (selection & SVNSLC_COLTEXTSTATUS)\r
5137                 {\r
5138                         if (entry->isNested)\r
5139                         {\r
5140                                 temp.LoadString(IDS_STATUSLIST_NESTED);\r
5141                         }\r
5142                         else\r
5143                         {\r
5144                                 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5145                                 if ((entry->copied)&&(_tcslen(buf)>1))\r
5146                                         _tcscat_s(buf, 100, _T(" (+)"));\r
5147                                 if ((entry->switched)&&(_tcslen(buf)>1))\r
5148                                         _tcscat_s(buf, 100, _T(" (s)"));\r
5149                                 temp = buf;\r
5150                         }\r
5151                         sClipboard += _T("\t")+temp;\r
5152                 }\r
5153                 if (selection & SVNSLC_COLREMOTESTATUS)\r
5154                 {\r
5155                         if (entry->isNested)\r
5156                         {\r
5157                                 temp.LoadString(IDS_STATUSLIST_NESTED);\r
5158                         }\r
5159                         else\r
5160                         {\r
5161                                 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5162                                 if ((entry->copied)&&(_tcslen(buf)>1))\r
5163                                         _tcscat_s(buf, 100, _T(" (+)"));\r
5164                                 if ((entry->switched)&&(_tcslen(buf)>1))\r
5165                                         _tcscat_s(buf, 100, _T(" (s)"));\r
5166                                 if ((entry->remotestatus == entry->remotepropstatus)&&\r
5167                                         (entry->remotestatus != git_wc_status_none)&&\r
5168                                         (entry->remotestatus != git_wc_status_normal)&&\r
5169                                         (entry->remotestatus != git_wc_status_unversioned)&&\r
5170                                         (!SVNStatus::IsImportant(entry->remotetextstatus)))\r
5171                                         _tcscat_s(buf, 100, ponly);\r
5172                                 temp = buf;\r
5173                         }\r
5174                         sClipboard += _T("\t")+temp;\r
5175                 }\r
5176                 if (selection & GitSLC_COLPROPSTATUS)\r
5177                 {\r
5178                         if (entry->isNested)\r
5179                         {\r
5180                                 temp.Empty();\r
5181                         }\r
5182                         else\r
5183                         {\r
5184                                 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5185                                 if ((entry->copied)&&(_tcslen(buf)>1))\r
5186                                         _tcscat_s(buf, 100, _T(" (+)"));\r
5187                                 if ((entry->switched)&&(_tcslen(buf)>1))\r
5188                                         _tcscat_s(buf, 100, _T(" (s)"));\r
5189                                 temp = buf;\r
5190                         }\r
5191                         sClipboard += _T("\t")+temp;\r
5192                 }\r
5193                 if (selection & SVNSLC_COLREMOTETEXT)\r
5194                 {\r
5195                         if (entry->isNested)\r
5196                         {\r
5197                                 temp.Empty();\r
5198                         }\r
5199                         else\r
5200                         {\r
5201                                 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5202                                 temp = buf;\r
5203                         }\r
5204                         sClipboard += _T("\t")+temp;\r
5205                 }\r
5206                 if (selection & SVNSLC_COLREMOTEPROP)\r
5207                 {\r
5208                         // SVNSLC_COLREMOTEPROP\r
5209                         if (entry->isNested)\r
5210                         {\r
5211                                 temp.Empty();\r
5212                         }\r
5213                         else\r
5214                         {\r
5215                                 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);\r
5216                                 temp = buf;\r
5217                         }\r
5218                         sClipboard += _T("\t")+temp;\r
5219                 }\r
5220                 if (selection & SVNSLC_COLURL)\r
5221                         sClipboard += _T("\t")+entry->url;\r
5222                 if (selection & SVNSLC_COLLOCK)\r
5223                 {\r
5224                         if (!m_HeadRev.IsHead())\r
5225                         {\r
5226                                 // we have contacted the repository\r
5227 \r
5228                                 // decision-matrix\r
5229                                 // wc           repository              text\r
5230                                 // ""           ""                              ""\r
5231                                 // ""           UID1                    owner\r
5232                                 // UID1         UID1                    owner\r
5233                                 // UID1         ""                              lock has been broken\r
5234                                 // UID1         UID2                    lock has been stolen\r
5235                                 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))\r
5236                                 {\r
5237                                         if (entry->lock_owner.IsEmpty())\r
5238                                                 temp = entry->lock_remoteowner;\r
5239                                         else\r
5240                                                 temp = entry->lock_owner;\r
5241                                 }\r
5242                                 else if (entry->lock_remotetoken.IsEmpty())\r
5243                                 {\r
5244                                         // broken lock\r
5245                                         temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);\r
5246                                 }\r
5247                                 else\r
5248                                 {\r
5249                                         // stolen lock\r
5250                                         temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);\r
5251                                 }\r
5252                         }\r
5253                         else\r
5254                                 temp = entry->lock_owner;\r
5255                         sClipboard += _T("\t")+temp;\r
5256                 }\r
5257                 if (selection & SVNSLC_COLLOCKCOMMENT)\r
5258                         sClipboard += _T("\t")+entry->lock_comment;\r
5259                 if (selection & SVNSLC_COLAUTHOR)\r
5260                         sClipboard += _T("\t")+entry->last_commit_author;\r
5261                 if (selection & SVNSLC_COLREVISION)\r
5262                 {\r
5263                         temp.Format(_T("%ld"), entry->last_commit_rev);\r
5264                         if (entry->last_commit_rev == 0)\r
5265                                 temp.Empty();\r
5266                         sClipboard += _T("\t")+temp;\r
5267                 }\r
5268                 if (selection & SVNSLC_COLREMOTEREVISION)\r
5269                 {\r
5270                         temp.Format(_T("%ld"), entry->remoterev);\r
5271                         if (entry->remoterev == 0)\r
5272                                 temp.Empty();\r
5273                         sClipboard += _T("\t")+temp;\r
5274                 }\r
5275                 if (selection & SVNSLC_COLDATE)\r
5276                 {\r
5277                         TCHAR datebuf[SVN_DATE_BUFFER];\r
5278                         apr_time_t date = entry->last_commit_date;\r
5279                         SVN::formatDate(datebuf, date, true);\r
5280                         if (date)\r
5281                                 temp = datebuf;\r
5282                         else\r
5283                                 temp.Empty();\r
5284                         sClipboard += _T("\t")+temp;\r
5285                 }\r
5286                 if (selection & SVNSLC_COLCOPYFROM)\r
5287                 {\r
5288                         if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)\r
5289                                 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());\r
5290                         else\r
5291                                 temp = entry->copyfrom_url;\r
5292                         sClipboard += _T("\t")+temp;\r
5293                 }\r
5294 \r
5295         for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()\r
5296             ; i < count\r
5297             ; ++i)\r
5298         {\r
5299             if ((dwCols == -1) && m_ColumnManager.IsVisible (i))\r
5300             {\r
5301                 CString value \r
5302                     = entry->present_props[m_ColumnManager.GetName(i)];\r
5303                 sClipboard += _T("\t") + value;\r
5304             }\r
5305         }\r
5306 \r
5307                 sClipboard += _T("\r\n");\r
5308         }\r
5309 \r
5310         return CStringUtils::WriteAsciiStringToClipboard(sClipboard);\r
5311 #endif\r
5312         return TRUE;\r
5313 \r
5314 }\r
5315 \r
5316 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()\r
5317 {\r
5318 #if 0\r
5319         std::set<CString> changelists;\r
5320         POSITION pos = GetFirstSelectedItemPosition();\r
5321         int index;\r
5322         while ((index = GetNextSelectedItem(pos)) >= 0)\r
5323         {\r
5324                 FileEntry * entry = GetListEntry(index);\r
5325                 if (!entry->changelist.IsEmpty())\r
5326                         changelists.insert(entry->changelist);\r
5327         }\r
5328         return changelists.size();\r
5329 #endif \r
5330         return 0;\r
5331 }\r
5332 \r
5333 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)\r
5334 {\r
5335 \r
5336         bool bHasGroups=false;\r
5337         if ( this->m_UnRevFileList.GetCount()>0 || \r
5338                 this->m_IgnoreFileList.GetCount()>0 || bForce)\r
5339         {\r
5340                 bHasGroups = true;\r
5341         }\r
5342 \r
5343         RemoveAllGroups();\r
5344         EnableGroupView(bHasGroups);\r
5345         \r
5346         TCHAR groupname[1024];\r
5347         int groupindex = 0;\r
5348 \r
5349         if(bHasGroups);\r
5350         {\r
5351                 LVGROUP grp = {0};\r
5352                 grp.cbSize = sizeof(LVGROUP);\r
5353                 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;\r
5354                 CString sUnassignedName(_T("Modified File"));\r
5355                 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);\r
5356                 grp.pszHeader = groupname;\r
5357                 grp.iGroupId = groupindex;\r
5358                 grp.uAlign = LVGA_HEADER_LEFT;\r
5359                 InsertGroup(groupindex++, &grp);\r
5360 \r
5361                 //if(m_UnRevFileList.GetCount()>0)\r
5362                 {\r
5363                         _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);\r
5364                         grp.pszHeader = groupname;\r
5365                         grp.iGroupId = groupindex;\r
5366                         grp.uAlign = LVGA_HEADER_LEFT;\r
5367                         InsertGroup(groupindex++, &grp);\r
5368                 }\r
5369 \r
5370                 //if(m_IgnoreFileList.GetCount()>0)\r
5371                 {\r
5372                         _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);\r
5373                         grp.pszHeader = groupname;\r
5374                         grp.iGroupId = groupindex;\r
5375                         grp.uAlign = LVGA_HEADER_LEFT;\r
5376                         InsertGroup(groupindex++, &grp);\r
5377                 }\r
5378 \r
5379         }\r
5380 \r
5381 #if 0\r
5382         m_bHasIgnoreGroup = false;\r
5383 \r
5384         // now add the items which don't belong to a group\r
5385         LVGROUP grp = {0};\r
5386         grp.cbSize = sizeof(LVGROUP);\r
5387         grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;\r
5388         CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));\r
5389         _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);\r
5390         grp.pszHeader = groupname;\r
5391         grp.iGroupId = groupindex;\r
5392         grp.uAlign = LVGA_HEADER_LEFT;\r
5393         InsertGroup(groupindex++, &grp);\r
5394 \r
5395         for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)\r
5396         {\r
5397                 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)\r
5398                 {\r
5399                         LVGROUP grp = {0};\r
5400                         grp.cbSize = sizeof(LVGROUP);\r
5401                         grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;\r
5402                         _tcsncpy_s(groupname, 1024, it->first, 1023);\r
5403                         grp.pszHeader = groupname;\r
5404                         grp.iGroupId = groupindex;\r
5405                         grp.uAlign = LVGA_HEADER_LEFT;\r
5406                         it->second = InsertGroup(groupindex++, &grp);\r
5407                 }\r
5408                 else\r
5409                         m_bHasIgnoreGroup = true;\r
5410         }\r
5411 \r
5412         if (m_bHasIgnoreGroup)\r
5413         {\r
5414                 // and now add the group 'ignore-on-commit'\r
5415                 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);\r
5416                 if (it != m_changelists.end())\r
5417                 {\r
5418                         grp.cbSize = sizeof(LVGROUP);\r
5419                         grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;\r
5420                         _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);\r
5421                         grp.pszHeader = groupname;\r
5422                         grp.iGroupId = groupindex;\r
5423                         grp.uAlign = LVGA_HEADER_LEFT;\r
5424                         it->second = InsertGroup(groupindex, &grp);\r
5425                 }\r
5426         }\r
5427 #endif\r
5428         return bHasGroups;\r
5429 }\r
5430 \r
5431 void CGitStatusListCtrl::NotifyCheck()\r
5432 {\r
5433         CWnd* pParent = GetParent();\r
5434         if (NULL != pParent && NULL != pParent->GetSafeHwnd())\r
5435         {\r
5436                 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);\r
5437         }\r
5438 }\r
5439 \r
5440 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)\r
5441 {\r
5442         BYTE_VECTOR out;\r
5443         this->m_bBusy=TRUE;\r
5444         m_CurrentVersion=hash;\r
5445 \r
5446         if(hash == GIT_REV_ZERO)\r
5447         {\r
5448                 int count = 0;\r
5449                 if(list == NULL)\r
5450                         count = 1;\r
5451                 else\r
5452                         count = list->GetCount();\r
5453 \r
5454                 for(int i=0;i<count;i++)\r
5455                 {       \r
5456                         BYTE_VECTOR cmdout;\r
5457                         cmdout.clear();\r
5458                         CString cmd;\r
5459                         if(!g_Git.IsInitRepos())\r
5460                         {\r
5461                                 if(list == NULL)\r
5462                                         cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M -z"));\r
5463                                 else\r
5464                                         cmd.Format(_T("git.exe diff-index  --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());\r
5465         \r
5466                                 if(g_Git.Run(cmd,&cmdout))\r
5467                                 {\r
5468                                         cmdout.clear();\r
5469                                         CString strout;\r
5470                                         if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&strout,CP_UTF8))\r
5471                                         {\r
5472                                                 CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);\r
5473                                                 return -1;\r
5474                                         }\r
5475                                         if(strout.IsEmpty())\r
5476                                                 break; //this is initial repositoyr, there are no any history\r
5477 \r
5478                                         CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);\r
5479                                         return -1;\r
5480 \r
5481                                 }\r
5482                                 \r
5483                                 if(list == NULL)\r
5484                                         cmd=(_T("git.exe diff-index --cached --raw HEAD --numstat -C -M -z"));\r
5485                                 else\r
5486                                         cmd.Format(_T("git.exe diff-index  --cached --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());\r
5487 \r
5488                                 g_Git.Run(cmd,&cmdout);\r
5489                                 //out+=cmdout;\r
5490                                 out.append(cmdout,0);\r
5491                         }\r
5492                         else // Init Repository\r
5493                         {\r
5494                                 if(list == NULL)\r
5495                                         cmd=_T("git.exe ls-files -s -t -z");\r
5496                                 else\r
5497                                         cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());\r
5498 \r
5499                                 g_Git.Run(cmd,&cmdout);\r
5500                                 //out+=cmdout;\r
5501                                 out.append(cmdout,0);\r
5502                         }\r
5503                 }\r
5504 \r
5505                 if(g_Git.IsInitRepos())\r
5506                 {\r
5507                         m_StatusFileList.ParserFromLsFile(out);\r
5508                         for(int i=0;i<m_StatusFileList.GetCount();i++)\r
5509                                 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;\r
5510                 }\r
5511                 else\r
5512                         this->m_StatusFileList.ParserFromLog(out);\r
5513 \r
5514                 \r
5515         }else\r
5516         {\r
5517                 int count = 0;\r
5518                 if(list == NULL)\r
5519                         count = 1;\r
5520                 else\r
5521                         count = list->GetCount();\r
5522 \r
5523                 for(int i=0;i<count;i++)\r
5524                 {       \r
5525                         BYTE_VECTOR cmdout;\r
5526                         CString cmd;\r
5527                         if(list == NULL)\r
5528                                 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);\r
5529                         else\r
5530                                 cmd.Format(_T("git.exe diff-tree --raw  --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());\r
5531 \r
5532                         g_Git.Run(cmd,&cmdout);\r
5533 \r
5534                         out.append(cmdout);\r
5535                 }\r
5536                 this->m_StatusFileList.ParserFromLog(out);\r
5537 \r
5538         }\r
5539         for(int i=0;i<m_StatusFileList.GetCount();i++)\r
5540         {\r
5541                 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];\r
5542                 gitpatch->m_Checked = TRUE;\r
5543                 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);\r
5544         }\r
5545         this->m_bBusy=FALSE;\r
5546         return 0;\r
5547 }\r
5548 \r
5549 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)\r
5550 {\r
5551         m_arStatusArray.clear();\r
5552         for(int i=0;i<list.GetCount();i++)\r
5553         {\r
5554                 CTGitPath * gitpath=(CTGitPath*)&list[i];\r
5555                 \r
5556                 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)\r
5557                         continue;\r
5558 \r
5559                 gitpath->m_Checked = TRUE;\r
5560                 m_arStatusArray.push_back((CTGitPath*)&list[i]);\r
5561         }\r
5562         return 0;\r
5563 }\r
5564 \r
5565 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)\r
5566 {\r
5567         this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);\r
5568         for(int i=0;i<m_UnRevFileList.GetCount();i++)\r
5569         {\r
5570                 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];\r
5571                 gitpatch->m_Checked = FALSE;\r
5572                 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);\r
5573         }\r
5574         return 0;\r
5575 }\r
5576 \r
5577 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)\r
5578 {\r
5579         this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);\r
5580         for(int i=0;i<m_IgnoreFileList.GetCount();i++)\r
5581         {\r
5582                 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];\r
5583                 gitpatch->m_Checked = FALSE;\r
5584                 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);\r
5585         }\r
5586         return 0;\r
5587 }\r
5588 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)\r
5589 {\r
5590         if(mask&CGitStatusListCtrl::FILELIST_MODIFY)\r
5591         {\r
5592                 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))\r
5593                 {\r
5594                         UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);\r
5595                         m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;\r
5596                 }\r
5597         }\r
5598         if(mask&CGitStatusListCtrl::FILELIST_UNVER)\r
5599         {\r
5600                 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))\r
5601                 {\r
5602                         UpdateUnRevFileList(List);\r
5603                         m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;\r
5604                 }\r
5605         }\r
5606         return 0;\r
5607 }\r
5608 \r
5609 void CGitStatusListCtrl::Clear()\r
5610 {\r
5611         m_FileLoaded=0;\r
5612         this->DeleteAllItems();\r
5613         this->m_arListArray.clear();\r
5614         this->m_arStatusArray.clear();\r
5615         this->m_changelists.clear();\r
5616 }\r
5617 //////////////////////////////////////////////////////////////////////////\r
5618 #if 0\r
5619 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)\r
5620 {\r
5621         if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)\r
5622         {\r
5623                 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);\r
5624                 if(hDrop != NULL)\r
5625                 {\r
5626                         TCHAR szFileName[MAX_PATH];\r
5627 \r
5628                         UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);\r
5629 \r
5630                         POINT clientpoint;\r
5631                         clientpoint.x = pt.x;\r
5632                         clientpoint.y = pt.y;\r
5633                         ScreenToClient(m_hTargetWnd, &clientpoint);\r
5634                         if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))\r
5635                         {\r
5636                                 CTSVNPathList changelistItems;\r
5637                                 for(UINT i = 0; i < cFiles; ++i)\r
5638                                 {\r
5639                                         DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));\r
5640                                         changelistItems.AddPath(CTSVNPath(szFileName));\r
5641                                 }\r
5642                                 // find the changelist name\r
5643                                 CString sChangelist;\r
5644                                 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);\r
5645                                 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)\r
5646                                         if (it->second == nGroup)\r
5647                                                 sChangelist = it->first;\r
5648                                 if (!sChangelist.IsEmpty())\r
5649                                 {\r
5650                                         SVN git;\r
5651                                         if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))\r
5652                                         {\r
5653                                                 for (int l=0; l<changelistItems.GetCount(); ++l)\r
5654                                                 {\r
5655                                                         int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);\r
5656                                                         if (index >= 0)\r
5657                                                         {\r
5658                                                                 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);\r
5659                                                                 if (e)\r
5660                                                                 {\r
5661                                                                         e->changelist = sChangelist;\r
5662                                                                         if (!e->IsFolder())\r
5663                                                                         {\r
5664                                                                                 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())\r
5665                                                                                         m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);\r
5666                                                                                 else\r
5667                                                                                         m_pSVNStatusListCtrl->SetItemGroup(index, 0);\r
5668                                                                         }\r
5669                                                                 }\r
5670                                                         }\r
5671                                                         else\r
5672                                                         {\r
5673                                                                 HWND hParentWnd = GetParent(m_hTargetWnd);\r
5674                                                                 if (hParentWnd != NULL)\r
5675                                                                         ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());\r
5676                                                         }\r
5677                                                 }\r
5678                                         }\r
5679                                         else\r
5680                                         {\r
5681                                                 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
5682                                         }\r
5683                                 }\r
5684                                 else\r
5685                                 {\r
5686                                         SVN git;\r
5687                                         if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))\r
5688                                         {\r
5689                                                 for (int l=0; l<changelistItems.GetCount(); ++l)\r
5690                                                 {\r
5691                                                         int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);\r
5692                                                         if (index >= 0)\r
5693                                                         {\r
5694                                                                 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);\r
5695                                                                 if (e)\r
5696                                                                 {\r
5697                                                                         e->changelist = sChangelist;\r
5698                                                                         m_pSVNStatusListCtrl->SetItemGroup(index, 0);\r
5699                                                                 }\r
5700                                                         }\r
5701                                                         else\r
5702                                                         {\r
5703                                                                 HWND hParentWnd = GetParent(m_hTargetWnd);\r
5704                                                                 if (hParentWnd != NULL)\r
5705                                                                         ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());\r
5706                                                         }\r
5707                                                 }\r
5708                                         }\r
5709                                         else\r
5710                                         {\r
5711                                                 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
5712                                         }\r
5713                                 }\r
5714                         }\r
5715                         else\r
5716                         {\r
5717                                 for(UINT i = 0; i < cFiles; ++i)\r
5718                                 {\r
5719                                         DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));\r
5720                                         HWND hParentWnd = GetParent(m_hTargetWnd);\r
5721                                         if (hParentWnd != NULL)\r
5722                                                 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);\r
5723                                 }\r
5724                         }\r
5725                 }\r
5726                 GlobalUnlock(medium.hGlobal);\r
5727         }\r
5728         return true; //let base free the medium\r
5729 }\r
5730 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)\r
5731 {\r
5732         CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);\r
5733         *pdwEffect = DROPEFFECT_COPY;\r
5734         if (m_pSVNStatusListCtrl)\r
5735         {\r
5736                 POINT clientpoint;\r
5737                 clientpoint.x = pt.x;\r
5738                 clientpoint.y = pt.y;\r
5739                 ScreenToClient(m_hTargetWnd, &clientpoint);\r
5740                 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))\r
5741                 {\r
5742                         *pdwEffect = DROPEFFECT_MOVE;\r
5743                 }\r
5744                 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))\r
5745                 {\r
5746                         *pdwEffect = DROPEFFECT_NONE;\r
5747                 }\r
5748         }\r
5749         return S_OK;\r
5750 }f\r
5751 \r
5752 #endif