src/TortoiseProc/GitLogListBase.cpp

   1 // GitLogList.cpp : implementation file\r
   2 //\r
   3 /*\r
   4         Description: qgit revision list view\r
   5 \r
   6         Author: Marco Costalba (C) 2005-2007\r
   7 \r
   8         Copyright: See COPYING file that comes with this distribution\r
   9 \r
  10 */\r
  11 #include "stdafx.h"\r
  12 #include "GitLogListBase.h"\r
  13 #include "GitRev.h"\r
  14 //#include "VssStyle.h"\r
  15 #include "IconMenu.h"\r
  16 // CGitLogListBase\r
  17 #include "cursor.h"\r
  18 #include "InputDlg.h"\r
  19 #include "PropDlg.h"\r
  20 #include "SVNProgressDlg.h"\r
  21 #include "ProgressDlg.h"\r
  22 //#include "RepositoryBrowser.h"\r
  23 //#include "CopyDlg.h"\r
  24 //#include "StatGraphDlg.h"\r
  25 #include "Logdlg.h"\r
  26 #include "MessageBox.h"\r
  27 #include "Registry.h"\r
  28 #include "AppUtils.h"\r
  29 #include "PathUtils.h"\r
  30 #include "StringUtils.h"\r
  31 #include "UnicodeUtils.h"\r
  32 #include "TempFile.h"\r
  33 //#include "GitInfo.h"\r
  34 //#include "GitDiff.h"\r
  35 #include "IconMenu.h"\r
  36 //#include "RevisionRangeDlg.h"\r
  37 //#include "BrowseFolder.h"\r
  38 //#include "BlameDlg.h"\r
  39 //#include "Blame.h"\r
  40 //#include "GitHelpers.h"\r
  41 #include "GitStatus.h"\r
  42 //#include "LogDlgHelper.h"\r
  43 //#include "CachedLogInfo.h"\r
  44 //#include "RepositoryInfo.h"\r
  45 //#include "EditPropertiesDlg.h"\r
  46 #include "FileDiffDlg.h"\r
  47 #include "..\\TortoiseShell\\Resource.h"\r
  48 \r
  49 \r
  50 IMPLEMENT_DYNAMIC(CGitLogListBase, CHintListCtrl)\r
  51 \r
  52 CGitLogListBase::CGitLogListBase():CHintListCtrl()\r
  53         ,m_regMaxBugIDColWidth(_T("Software\\TortoiseGit\\MaxBugIDColWidth"), 200)\r
  54         ,m_nSearchIndex(0)\r
  55         ,m_bNoDispUpdates(FALSE)\r
  56         , m_bThreadRunning(FALSE)\r
  57         , m_bStrictStopped(false)\r
  58         , m_pStoreSelection(NULL)\r
  59         , m_nSelectedFilter(LOGFILTER_ALL)\r
  60 {\r
  61         // use the default GUI font, create a copy of it and\r
  62         // change the copy to BOLD (leave the rest of the font\r
  63         // the same)\r
  64         HFONT hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);\r
  65         LOGFONT lf = {0};\r
  66         GetObject(hFont, sizeof(LOGFONT), &lf);\r
  67         lf.lfWeight = FW_BOLD;\r
  68         m_boldFont = CreateFontIndirect(&lf);\r
  69         \r
  70         m_bShowBugtraqColumn=0;\r
  71 \r
  72         m_IsIDReplaceAction=FALSE;\r
  73 \r
  74         m_wcRev.m_CommitHash=GIT_REV_ZERO;\r
  75         m_wcRev.m_Subject=_T("Working Copy");\r
  76 \r
  77         m_hModifiedIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONMODIFIED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
  78         m_hReplacedIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONREPLACED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
  79         m_hAddedIcon    =  (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONADDED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
  80         m_hDeletedIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_ACTIONDELETED), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);\r
  81 \r
  82         m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
  83 \r
  84         g_Git.GetMapHashToFriendName(m_HashMap);\r
  85         m_CurrentBranch=g_Git.GetCurrentBranch();\r
  86         this->m_HeadHash=g_Git.GetHash(CString(_T("HEAD"))).Left(40);\r
  87 \r
  88         m_From=CTime(1970,1,2,0,0,0);\r
  89         m_To=CTime::GetCurrentTime();\r
  90     m_ShowMask = 0;\r
  91         m_LoadingThread = NULL;\r
  92 \r
  93         m_bExitThread=FALSE;\r
  94         m_IsOldFirst = FALSE;\r
  95         m_IsRebaseReplaceGraph = FALSE;\r
  96 \r
  97 \r
  98         for(int i=0;i<Lanes::COLORS_NUM;i++)\r
  99         {\r
 100                 m_LineColors[i] = m_Colors.GetColor((CColors::Colors)(CColors::BranchLine1+i));\r
 101         }\r
 102         // get short/long datetime setting from registry\r
 103         DWORD RegUseShortDateFormat = CRegDWORD(_T("Software\\TortoiseGit\\LogDateFormat"), TRUE);\r
 104         if ( RegUseShortDateFormat )\r
 105         {\r
 106                 m_DateFormat = DATE_SHORTDATE;\r
 107         }\r
 108         else\r
 109         {\r
 110                 m_DateFormat = DATE_LONGDATE;\r
 111         }\r
 112         // get relative time display setting from registry\r
 113         DWORD regRelativeTimes = CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE);\r
 114         m_bRelativeTimes = (regRelativeTimes != 0);\r
 115         m_ContextMenuMask = 0xFFFFFFFFFFFFFFFF;\r
 116 \r
 117         m_ContextMenuMask &= ~GetContextMenuBit(ID_REBASE_PICK);\r
 118         m_ContextMenuMask &= ~GetContextMenuBit(ID_REBASE_SQUASH);\r
 119         m_ContextMenuMask &= ~GetContextMenuBit(ID_REBASE_EDIT);\r
 120         m_ContextMenuMask &= ~GetContextMenuBit(ID_REBASE_SKIP);\r
 121 }\r
 122 \r
 123 CGitLogListBase::~CGitLogListBase()\r
 124 {\r
 125         InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
 126 \r
 127         DestroyIcon(m_hModifiedIcon);\r
 128         DestroyIcon(m_hReplacedIcon);\r
 129         DestroyIcon(m_hAddedIcon);\r
 130         DestroyIcon(m_hDeletedIcon);\r
 131         m_logEntries.ClearAll();\r
 132 \r
 133         if (m_boldFont)\r
 134                 DeleteObject(m_boldFont);\r
 135 \r
 136         if ( m_pStoreSelection )\r
 137         {\r
 138                 delete m_pStoreSelection;\r
 139                 m_pStoreSelection = NULL;\r
 140         }\r
 141 \r
 142         if(this->m_bThreadRunning)\r
 143         {\r
 144                 m_bExitThread=true;\r
 145                 WaitForSingleObject(m_LoadingThread->m_hThread,1000);\r
 146                 TerminateThread();\r
 147         }\r
 148 }\r
 149 \r
 150 \r
 151 BEGIN_MESSAGE_MAP(CGitLogListBase, CHintListCtrl)\r
 152         ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdrawLoglist)\r
 153         ON_NOTIFY_REFLECT(LVN_GETDISPINFO, OnLvnGetdispinfoLoglist)\r
 154         ON_WM_CONTEXTMENU()\r
 155         ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclkLoglist)\r
 156         ON_NOTIFY_REFLECT(LVN_ODFINDITEM,OnLvnOdfinditemLoglist)\r
 157         ON_WM_CREATE()\r
 158         ON_WM_DESTROY()\r
 159         ON_MESSAGE(MSG_LOADED,OnLoad)\r
 160 END_MESSAGE_MAP()\r
 161 \r
 162 int CGitLogListBase:: OnCreate(LPCREATESTRUCT lpCreateStruct)\r
 163 {\r
 164         PreSubclassWindow();\r
 165         return CHintListCtrl::OnCreate(lpCreateStruct);\r
 166 }\r
 167 \r
 168 void CGitLogListBase::PreSubclassWindow()\r
 169 {\r
 170         SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES);\r
 171         // load the icons for the action columns\r
 172         m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);\r
 173         CHintListCtrl::PreSubclassWindow();\r
 174 }\r
 175 \r
 176 void CGitLogListBase::InsertGitColumn()\r
 177 {\r
 178         CString temp;\r
 179 \r
 180         int c = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
 181         \r
 182         while (c>=0)\r
 183                 DeleteColumn(c--);\r
 184         temp.LoadString(IDS_LOG_GRAPH);\r
 185 \r
 186         if(m_IsRebaseReplaceGraph)\r
 187         {\r
 188                 temp=_T("Rebase");\r
 189         }\r
 190         else\r
 191         {\r
 192                 temp.LoadString(IDS_LOG_GRAPH);\r
 193         }\r
 194         InsertColumn(this->LOGLIST_GRAPH, temp);\r
 195         \r
 196 #if 0   \r
 197         // make the revision column right aligned\r
 198         LVCOLUMN Column;\r
 199         Column.mask = LVCF_FMT;\r
 200         Column.fmt = LVCFMT_RIGHT;\r
 201         SetColumn(0, &Column); \r
 202 #endif  \r
 203 //      CString log;\r
 204 //      g_Git.GetLog(log);\r
 205 \r
 206         if(m_IsIDReplaceAction)\r
 207         {\r
 208                 temp.LoadString(IDS_LOG_ID);\r
 209                 InsertColumn(this->LOGLIST_ACTION, temp);\r
 210         }\r
 211         else\r
 212         {\r
 213                 temp.LoadString(IDS_LOG_ACTIONS);\r
 214                 InsertColumn(this->LOGLIST_ACTION, temp);\r
 215         }\r
 216         temp.LoadString(IDS_LOG_MESSAGE);\r
 217         InsertColumn(this->LOGLIST_MESSAGE, temp);\r
 218         \r
 219         temp.LoadString(IDS_LOG_AUTHOR);\r
 220         InsertColumn(this->LOGLIST_AUTHOR, temp);\r
 221         \r
 222         temp.LoadString(IDS_LOG_DATE);\r
 223         InsertColumn(this->LOGLIST_DATE, temp);\r
 224         \r
 225 \r
 226         if (m_bShowBugtraqColumn)\r
 227         {\r
 228 //              temp = m_ProjectProperties.sLabel;\r
 229                 if (temp.IsEmpty())\r
 230                         temp.LoadString(IDS_LOG_BUGIDS);\r
 231                 InsertColumn(this->LOGLIST_BUG, temp);\r
 232 \r
 233         }\r
 234         \r
 235         SetRedraw(false);\r
 236         ResizeAllListCtrlCols();\r
 237         SetRedraw(true);\r
 238 \r
 239 }\r
 240 \r
 241 /**\r
 242  * Resizes all columns in a list control to values in registry.\r
 243  */\r
 244 void CGitLogListBase::ResizeAllListCtrlCols()\r
 245 {\r
 246         // column max and min widths to allow\r
 247         static const int nMinimumWidth = 10;\r
 248         static const int nMaximumWidth = 1000;\r
 249         CHeaderCtrl* pHdrCtrl = (CHeaderCtrl*)(GetDlgItem(0));\r
 250         if (pHdrCtrl)\r
 251         {\r
 252                 int numcols = pHdrCtrl->GetItemCount();\r
 253                 for (int col = 0; col < numcols; col++)\r
 254                 {\r
 255                         // get width for this col last time from registry\r
 256                         CString regentry;\r
 257                         regentry.Format( _T("Software\\TortoiseGit\\log\\ColWidth%d"), col);\r
 258                         CRegDWORD regwidth(regentry, 0);\r
 259                         int cx = regwidth;\r
 260                         if ( cx == 0 )\r
 261                         {\r
 262                                 // no saved value, setup sensible defaults\r
 263                                 if (col == this->LOGLIST_MESSAGE)\r
 264                                 {\r
 265                                         cx = LOGLIST_MESSAGE_MIN;\r
 266                                 }\r
 267                                 else\r
 268                                 {\r
 269                                         cx = ICONITEMBORDER+16*4;\r
 270                                 }\r
 271                         }\r
 272                         if (cx < nMinimumWidth)\r
 273                         {\r
 274                                 cx = nMinimumWidth;\r
 275                         } else if (cx > nMaximumWidth)\r
 276                         {\r
 277                                 cx = nMaximumWidth;\r
 278                         }\r
 279 \r
 280                         SetColumnWidth(col, cx);\r
 281                 }\r
 282         }\r
 283 \r
 284 }\r
 285 \r
 286 \r
 287 BOOL CGitLogListBase::GetShortName(CString ref, CString &shortname,CString prefix)\r
 288 {\r
 289         TRACE(_T("%s %s\r\n"),ref,prefix);\r
 290         if(ref.Left(prefix.GetLength()) ==  prefix)\r
 291         {\r
 292                 shortname = ref.Right(ref.GetLength()-prefix.GetLength());\r
 293                 if(shortname.Right(3)==_T("^{}"))\r
 294                         shortname=shortname.Left(shortname.GetLength()-3);\r
 295                 return TRUE;\r
 296         }\r
 297         return FALSE;\r
 298 }\r
 299 void CGitLogListBase::FillBackGround(HDC hdc, int Index,CRect &rect)\r
 300 {       \r
 301 //      HBRUSH brush;\r
 302         LVITEM   rItem;\r
 303         SecureZeroMemory(&rItem, sizeof(LVITEM));\r
 304         rItem.mask  = LVIF_STATE;\r
 305         rItem.iItem = Index;\r
 306         rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;\r
 307         GetItem(&rItem);\r
 308 \r
 309         GitRev* pLogEntry = (GitRev*)m_arShownList.GetAt(Index);\r
 310 \r
 311         if (m_Theme.IsAppThemed() && m_bVista)\r
 312         {\r
 313                 m_Theme.Open(m_hWnd, L"Explorer");\r
 314                 int state = LISS_NORMAL;\r
 315                 if (rItem.state & LVIS_SELECTED)\r
 316                 {\r
 317                         if (::GetFocus() == m_hWnd)\r
 318                                 state |= LISS_SELECTED;\r
 319                         else\r
 320                                 state |= LISS_SELECTEDNOTFOCUS;\r
 321                 }\r
 322                 else\r
 323                 {\r
 324 #if 0\r
 325                         if (pLogEntry->bCopiedSelf)\r
 326                         {\r
 327                                 // unfortunately, the pLVCD->nmcd.uItemState does not contain valid\r
 328                                 // information at this drawing stage. But we can check the whether the\r
 329                                 // previous stage changed the background color of the item\r
 330                                 if (pLVCD->clrTextBk == GetSysColor(COLOR_MENU))\r
 331                                 {\r
 332                                         HBRUSH brush;\r
 333                                         brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));\r
 334                                         if (brush)\r
 335                                         {\r
 336                                                 ::FillRect(pLVCD->nmcd.hdc, &rect, brush);\r
 337                                                 ::DeleteObject(brush);\r
 338                                         }\r
 339                                 }\r
 340                         }\r
 341 #endif\r
 342                 }\r
 343 \r
 344                 if (m_Theme.IsBackgroundPartiallyTransparent(LVP_LISTDETAIL, state))\r
 345                         m_Theme.DrawParentBackground(m_hWnd, hdc, &rect);\r
 346 \r
 347                         m_Theme.DrawBackground(hdc, LVP_LISTDETAIL, state, &rect, NULL);\r
 348         }\r
 349         else\r
 350         {\r
 351                 HBRUSH brush;\r
 352                 if (rItem.state & LVIS_SELECTED)\r
 353                 {\r
 354                         if (::GetFocus() == m_hWnd)\r
 355                                 brush = ::CreateSolidBrush(::GetSysColor(COLOR_HIGHLIGHT));\r
 356                         else\r
 357                                 brush = ::CreateSolidBrush(::GetSysColor(COLOR_BTNFACE));\r
 358                 }\r
 359                 else\r
 360                 {\r
 361                         //if (pLogEntry->bCopiedSelf)\r
 362                         //      brush = ::CreateSolidBrush(::GetSysColor(COLOR_MENU));\r
 363                         //else\r
 364                         if(pLogEntry->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH)\r
 365                                 brush = ::CreateSolidBrush(RGB(156,156,156));\r
 366                         else if(pLogEntry->m_Action&CTGitPath::LOGACTIONS_REBASE_EDIT)\r
 367                                 brush = ::CreateSolidBrush(RGB(200,200,128));\r
 368                         else \r
 369                                 brush = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOW));\r
 370                 }\r
 371                 if (brush == NULL)\r
 372                         return;\r
 373 \r
 374                 ::FillRect(hdc, &rect, brush);\r
 375                 ::DeleteObject(brush);\r
 376                 \r
 377         }\r
 378 }\r
 379 \r
 380 void CGitLogListBase::DrawTagBranch(HDC hdc,CRect &rect,INT_PTR index)\r
 381 {\r
 382         GitRev* data = (GitRev*)m_arShownList.GetAt(index);\r
 383         CRect rt=rect;\r
 384         LVITEM   rItem;\r
 385         SecureZeroMemory(&rItem, sizeof(LVITEM));\r
 386         rItem.mask  = LVIF_STATE;\r
 387         rItem.iItem = index;\r
 388         rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;\r
 389         GetItem(&rItem);\r
 390 \r
 391         for(unsigned int i=0;i<m_HashMap[data->m_CommitHash].size();i++)\r
 392         {\r
 393                 CString str;\r
 394                 str=m_HashMap[data->m_CommitHash][i];\r
 395                 \r
 396                 CString shortname;\r
 397                 HBRUSH brush=0;\r
 398                 shortname=_T("");\r
 399                 if(GetShortName(str,shortname,_T("refs/heads/")))\r
 400                 {\r
 401                         if( shortname == m_CurrentBranch )\r
 402                                 brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::CurrentBranch));\r
 403                         else\r
 404                                 brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::LocalBranch));\r
 405 \r
 406                 }else if(GetShortName(str,shortname,_T("refs/remotes/")))\r
 407                 {\r
 408                         brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::RemoteBranch));\r
 409                 }\r
 410                 else if(GetShortName(str,shortname,_T("refs/tags/")))\r
 411                 {\r
 412                         brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Tag));\r
 413                 }\r
 414                 else if(GetShortName(str,shortname,_T("refs/stash")))\r
 415                 {\r
 416                         brush = ::CreateSolidBrush(m_Colors.GetColor(CColors::Stash));\r
 417                         shortname=_T("stash");\r
 418                 }\r
 419                 \r
 420 \r
 421                 if(!shortname.IsEmpty())\r
 422                 {\r
 423                         SIZE size;\r
 424                         memset(&size,0,sizeof(SIZE));\r
 425                         GetTextExtentPoint32(hdc, shortname,shortname.GetLength(),&size);\r
 426                 \r
 427                         rt.SetRect(rt.left,rt.top,rt.left+size.cx,rt.bottom);\r
 428                         rt.right+=4;\r
 429                         ::FillRect(hdc, &rt, brush);\r
 430                         if (rItem.state & LVIS_SELECTED)\r
 431                         {\r
 432                                 COLORREF   clrOld   = ::SetTextColor(hdc,::GetSysColor(COLOR_HIGHLIGHTTEXT));   \r
 433                                 ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER);\r
 434                                 ::SetTextColor(hdc,clrOld);   \r
 435                         }else\r
 436                         {\r
 437                                 ::DrawText(hdc,shortname,shortname.GetLength(),&rt,DT_CENTER);\r
 438                         }\r
 439 \r
 440                         \r
 441                         ::MoveToEx(hdc,rt.left,rt.top,NULL);\r
 442                         ::LineTo(hdc,rt.right,rt.top);\r
 443                         ::LineTo(hdc,rt.right,rt.bottom);\r
 444                         ::LineTo(hdc,rt.left,rt.bottom);\r
 445                         ::LineTo(hdc,rt.left,rt.top);\r
 446                                 \r
 447                         rt.left=rt.right+3;\r
 448                 }\r
 449                 if(brush)\r
 450                         ::DeleteObject(brush);\r
 451         }               \r
 452         rt.right=rect.right;\r
 453 \r
 454         if (rItem.state & LVIS_SELECTED)\r
 455         {\r
 456                 COLORREF   clrOld   = ::SetTextColor(hdc,::GetSysColor(COLOR_HIGHLIGHTTEXT));   \r
 457                 ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT);\r
 458                 ::SetTextColor(hdc,clrOld);   \r
 459         }else\r
 460         {\r
 461                 ::DrawText(hdc,data->m_Subject,data->m_Subject.GetLength(),&rt,DT_LEFT);\r
 462         }\r
 463         \r
 464 }\r
 465 \r
 466 void CGitLogListBase::paintGraphLane(HDC hdc, int laneHeight,int type, int x1, int x2,\r
 467                                       const COLORREF& col,int top\r
 468                                                                           )  \r
 469 {\r
 470         int h = laneHeight / 2;\r
 471         int m = (x1 + x2) / 2;\r
 472         int r = (x2 - x1) / 3;\r
 473         int d =  2 * r;\r
 474 \r
 475         #define P_CENTER m , h+top\r
 476         #define P_0      x2, h+top\r
 477         #define P_90     m , 0+top\r
 478         #define P_180    x1, h+top\r
 479         #define P_270    m , 2 * h+top\r
 480         #define R_CENTER m - r, h - r+top, m - r+d, h - r+top+d\r
 481 \r
 482         //static QPen myPen(Qt::black, 2); // fast path here\r
 483         CPen pen;\r
 484         pen.CreatePen(PS_SOLID,2,col);\r
 485         //myPen.setColor(col);\r
 486         HPEN oldpen=(HPEN)::SelectObject(hdc,(HPEN)pen);\r
 487 \r
 488         //p->setPen(myPen);\r
 489 \r
 490         // vertical line\r
 491         switch (type) {\r
 492         case Lanes::ACTIVE:\r
 493         case Lanes::NOT_ACTIVE:\r
 494         case Lanes::MERGE_FORK:\r
 495         case Lanes::MERGE_FORK_R:\r
 496         case Lanes::MERGE_FORK_L:\r
 497         case Lanes::JOIN:\r
 498         case Lanes::JOIN_R:\r
 499         case Lanes::JOIN_L:\r
 500                 DrawLine(hdc,P_90,P_270);\r
 501                 //p->drawLine(P_90, P_270);\r
 502                 break;\r
 503         case Lanes::HEAD:\r
 504         case Lanes::HEAD_R:\r
 505         case Lanes::HEAD_L:\r
 506         case Lanes::BRANCH:\r
 507                 DrawLine(hdc,P_CENTER,P_270);\r
 508                 //p->drawLine(P_CENTER, P_270);\r
 509                 break;\r
 510         case Lanes::TAIL:\r
 511         case Lanes::TAIL_R:\r
 512         case Lanes::TAIL_L:\r
 513         case Lanes::INITIAL:\r
 514         case Lanes::BOUNDARY:\r
 515         case Lanes::BOUNDARY_C:\r
 516         case Lanes::BOUNDARY_R:\r
 517         case Lanes::BOUNDARY_L:\r
 518                 DrawLine(hdc,P_90, P_CENTER);\r
 519                 //p->drawLine(P_90, P_CENTER);\r
 520                 break;\r
 521         default:\r
 522                 break;\r
 523         }\r
 524 \r
 525         // horizontal line\r
 526         switch (type) {\r
 527         case Lanes::MERGE_FORK:\r
 528         case Lanes::JOIN:\r
 529         case Lanes::HEAD:\r
 530         case Lanes::TAIL:\r
 531         case Lanes::CROSS:\r
 532         case Lanes::CROSS_EMPTY:\r
 533         case Lanes::BOUNDARY_C:\r
 534                 DrawLine(hdc,P_180,P_0);\r
 535                 //p->drawLine(P_180, P_0);\r
 536                 break;\r
 537         case Lanes::MERGE_FORK_R:\r
 538         case Lanes::JOIN_R:\r
 539         case Lanes::HEAD_R:\r
 540         case Lanes::TAIL_R:\r
 541         case Lanes::BOUNDARY_R:\r
 542                 DrawLine(hdc,P_180,P_CENTER);\r
 543                 //p->drawLine(P_180, P_CENTER);\r
 544                 break;\r
 545         case Lanes::MERGE_FORK_L:\r
 546         case Lanes::JOIN_L:\r
 547         case Lanes::HEAD_L:\r
 548         case Lanes::TAIL_L:\r
 549         case Lanes::BOUNDARY_L:\r
 550                 DrawLine(hdc,P_CENTER,P_0);\r
 551                 //p->drawLine(P_CENTER, P_0);\r
 552                 break;\r
 553         default:\r
 554                 break;\r
 555         }\r
 556 \r
 557         CBrush brush;\r
 558         brush.CreateSolidBrush(col);\r
 559         HBRUSH oldbrush=(HBRUSH)::SelectObject(hdc,(HBRUSH)brush);\r
 560         // center symbol, e.g. rect or ellipse\r
 561         switch (type) {\r
 562         case Lanes::ACTIVE:\r
 563         case Lanes::INITIAL:\r
 564         case Lanes::BRANCH:\r
 565 \r
 566                 //p->setPen(Qt::NoPen);\r
 567                 //p->setBrush(col);\r
 568                 ::Ellipse(hdc, R_CENTER);\r
 569                 //p->drawEllipse(R_CENTER);\r
 570                 break;\r
 571         case Lanes::MERGE_FORK:\r
 572         case Lanes::MERGE_FORK_R:\r
 573         case Lanes::MERGE_FORK_L:\r
 574                 //p->setPen(Qt::NoPen);\r
 575                 //p->setBrush(col);\r
 576                 //p->drawRect(R_CENTER);\r
 577                 Rectangle(hdc,R_CENTER);\r
 578                 break;\r
 579         case Lanes::UNAPPLIED:\r
 580                 // Red minus sign\r
 581                 //p->setPen(Qt::NoPen);\r
 582                 //p->setBrush(Qt::red);\r
 583                 //p->drawRect(m - r, h - 1, d, 2);\r
 584                 ::Rectangle(hdc,m-r,h-1,d,2);\r
 585                 break;\r
 586         case Lanes::APPLIED:\r
 587                 // Green plus sign\r
 588                 //p->setPen(Qt::NoPen);\r
 589                 //p->setBrush(DARK_GREEN);\r
 590                 //p->drawRect(m - r, h - 1, d, 2);\r
 591                 //p->drawRect(m - 1, h - r, 2, d);\r
 592                 ::Rectangle(hdc,m-r,h-1,d,2);\r
 593                 ::Rectangle(hdc,m-1,h-r,2,d);\r
 594                 break;\r
 595         case Lanes::BOUNDARY:\r
 596                 //p->setBrush(back);\r
 597                 //p->drawEllipse(R_CENTER);\r
 598                 ::Ellipse(hdc, R_CENTER);\r
 599                 break;\r
 600         case Lanes::BOUNDARY_C:\r
 601         case Lanes::BOUNDARY_R:\r
 602         case Lanes::BOUNDARY_L:\r
 603                 //p->setBrush(back);\r
 604                 //p->drawRect(R_CENTER);\r
 605                 ::Rectangle(hdc,R_CENTER);\r
 606                 break;\r
 607         default:\r
 608                 break;\r
 609         }\r
 610 \r
 611         ::SelectObject(hdc,oldpen);\r
 612         ::SelectObject(hdc,oldbrush);\r
 613         #undef P_CENTER\r
 614         #undef P_0\r
 615         #undef P_90\r
 616         #undef P_180\r
 617         #undef P_270\r
 618         #undef R_CENTER\r
 619 }\r
 620 \r
 621 void CGitLogListBase::DrawGraph(HDC hdc,CRect &rect,INT_PTR index)\r
 622 {\r
 623         //todo unfinished\r
 624 //      return;\r
 625         GitRev* data = (GitRev*)m_arShownList.GetAt(index);\r
 626         CRect rt=rect;\r
 627         LVITEM   rItem;\r
 628         SecureZeroMemory(&rItem, sizeof(LVITEM));\r
 629         rItem.mask  = LVIF_STATE;\r
 630         rItem.iItem = index;\r
 631         rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;\r
 632         GetItem(&rItem);\r
 633 \r
 634         \r
 635 //      p->translate(QPoint(opt.rect.left(), opt.rect.top()));\r
 636 \r
 637 \r
 638 \r
 639         if (data->m_Lanes.size() == 0)\r
 640                 m_logEntries.setLane(data->m_CommitHash);\r
 641 \r
 642         std::vector<int>& lanes=data->m_Lanes;\r
 643         UINT laneNum = lanes.size();\r
 644         UINT mergeLane = 0;\r
 645         for (UINT i = 0; i < laneNum; i++)\r
 646                 if (Lanes::isMerge(lanes[i])) {\r
 647                         mergeLane = i;\r
 648                         break;\r
 649                 }\r
 650 \r
 651         int x1 = 0, x2 = 0;\r
 652         int maxWidth = rect.Width();\r
 653         int lw = 3 * rect.Height() / 4; //laneWidth() \r
 654         for (UINT i = 0; i < laneNum && x2 < maxWidth; i++) {\r
 655 \r
 656                 x1 = x2;\r
 657                 x2 += lw;\r
 658 \r
 659                 int ln = lanes[i];\r
 660                 if (ln == Lanes::EMPTY)\r
 661                         continue;\r
 662 \r
 663                 UINT col = (  Lanes:: isHead(ln) ||Lanes:: isTail(ln) || Lanes::isJoin(ln)\r
 664                             || ln ==Lanes:: CROSS_EMPTY) ? mergeLane : i;\r
 665 \r
 666                 if (ln == Lanes::CROSS) {\r
 667                         paintGraphLane(hdc, rect.Height(),Lanes::NOT_ACTIVE, x1, x2, m_LineColors[col % Lanes::COLORS_NUM],rect.top);\r
 668                         paintGraphLane(hdc, rect.Height(),Lanes::CROSS, x1, x2, m_LineColors[mergeLane % Lanes::COLORS_NUM],rect.top);\r
 669                 } else\r
 670                         paintGraphLane(hdc, rect.Height(),ln, x1, x2, m_LineColors[col % Lanes::COLORS_NUM],rect.top);\r
 671         }\r
 672 \r
 673         TRACE(_T("index %d %d\r\n"),index,data->m_Lanes.size());\r
 674 }\r
 675 \r
 676 void CGitLogListBase::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
 677 {\r
 678 \r
 679         NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );\r
 680         // Take the default processing unless we set this to something else below.\r
 681         *pResult = CDRF_DODEFAULT;\r
 682 \r
 683         if (m_bNoDispUpdates)\r
 684                 return;\r
 685 \r
 686 \r
 687 \r
 688         switch (pLVCD->nmcd.dwDrawStage)\r
 689         {\r
 690         case CDDS_PREPAINT:\r
 691                 {\r
 692                         *pResult = CDRF_NOTIFYITEMDRAW;\r
 693                         return;\r
 694                 }\r
 695                 break;\r
 696         case CDDS_ITEMPREPAINT:\r
 697                 {\r
 698                         // This is the prepaint stage for an item. Here's where we set the\r
 699                         // item's text color. \r
 700                         \r
 701                         // Tell Windows to send draw notifications for each subitem.\r
 702                         *pResult = CDRF_NOTIFYSUBITEMDRAW;\r
 703 \r
 704                         COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);\r
 705 \r
 706                         if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
 707                         {\r
 708                                 GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);\r
 709                                 if (data)\r
 710                                 {\r
 711 #if 0\r
 712                                         if (data->bCopiedSelf)\r
 713                                         {\r
 714                                                 // only change the background color if the item is not 'hot' (on vista with m_Themes enabled)\r
 715                                                 if (!m_Theme.IsAppm_Themed() || !m_bVista || ((pLVCD->nmcd.uItemState & CDIS_HOT)==0))\r
 716                                                         pLVCD->clrTextBk = GetSysColor(COLOR_MENU);\r
 717                                         }\r
 718 \r
 719                                         if (data->bCopies)\r
 720                                                 crText = m_Colors.GetColor(CColors::Modified);\r
 721 #endif\r
 722                                         if (data->m_Action& (CTGitPath::LOGACTIONS_REBASE_DONE| CTGitPath::LOGACTIONS_REBASE_SKIP) ) \r
 723                                                 crText = RGB(128,128,128);\r
 724 \r
 725                                         if(data->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH)\r
 726                                                 pLVCD->clrTextBk = RGB(156,156,156);\r
 727                                         else if(data->m_Action&CTGitPath::LOGACTIONS_REBASE_EDIT)\r
 728                                                 pLVCD->clrTextBk  = RGB(200,200,128);\r
 729                                         else \r
 730                                                 pLVCD->clrTextBk  = ::GetSysColor(COLOR_WINDOW);\r
 731 \r
 732                                         if(data->m_Action&CTGitPath::LOGACTIONS_REBASE_CURRENT)\r
 733                                         {\r
 734                                                 SelectObject(pLVCD->nmcd.hdc, m_boldFont);\r
 735                                                 *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;\r
 736                                         }\r
 737 \r
 738                                         if(data->m_CommitHash == m_HeadHash)\r
 739                                         {\r
 740                                                 SelectObject(pLVCD->nmcd.hdc, m_boldFont);\r
 741                                                 *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;\r
 742                                         }\r
 743 \r
 744 //                                      if ((data->childStackDepth)||(m_mergedRevs.find(data->Rev) != m_mergedRevs.end()))\r
 745 //                                              crText = GetSysColor(COLOR_GRAYTEXT);\r
 746 //                                      if (data->Rev == m_wcRev)\r
 747 //                                      {\r
 748 //                                              SelectObject(pLVCD->nmcd.hdc, m_boldFont);\r
 749                                                 // We changed the font, so we're returning CDRF_NEWFONT. This\r
 750                                                 // tells the control to recalculate the extent of the text.\r
 751 //                                              *pResult = CDRF_NOTIFYSUBITEMDRAW | CDRF_NEWFONT;\r
 752 //                                      }\r
 753                                 }\r
 754                         }\r
 755                         if (m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
 756                         {\r
 757                                 if (m_bStrictStopped)\r
 758                                         crText = GetSysColor(COLOR_GRAYTEXT);\r
 759                         }\r
 760                         // Store the color back in the NMLVCUSTOMDRAW struct.\r
 761                         pLVCD->clrText = crText;\r
 762                         return;\r
 763                 }\r
 764                 break;\r
 765         case CDDS_ITEMPREPAINT|CDDS_ITEM|CDDS_SUBITEM:\r
 766                 {\r
 767                         if ((m_bStrictStopped)&&(m_arShownList.GetCount() == (INT_PTR)pLVCD->nmcd.dwItemSpec))\r
 768                         {\r
 769                                 pLVCD->nmcd.uItemState &= ~(CDIS_SELECTED|CDIS_FOCUS);\r
 770                         }\r
 771 \r
 772                         if (pLVCD->iSubItem == LOGLIST_GRAPH)\r
 773                         {\r
 774                                 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec && (!this->m_IsRebaseReplaceGraph) )\r
 775                                 {\r
 776                                         CRect rect;\r
 777                                         GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);\r
 778                                         \r
 779                                         FillBackGround(pLVCD->nmcd.hdc, (INT_PTR)pLVCD->nmcd.dwItemSpec,rect);\r
 780                                         DrawGraph(pLVCD->nmcd.hdc,rect,pLVCD->nmcd.dwItemSpec);\r
 781 \r
 782                                         *pResult = CDRF_SKIPDEFAULT;\r
 783                                         return;\r
 784                                 \r
 785                                 }\r
 786                         }\r
 787 \r
 788                         if (pLVCD->iSubItem == LOGLIST_MESSAGE)\r
 789                         {\r
 790                                 if (m_arShownList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
 791                                 {\r
 792                                         GitRev* data = (GitRev*)m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec);\r
 793                                         //if(!data->m_IsFull)\r
 794                                         //{\r
 795                                                 //if(data->SafeFetchFullInfo(&g_Git))\r
 796                                                 //      this->Invalidate();\r
 797                                                 //TRACE(_T("Update ... %d\r\n"),pLVCD->nmcd.dwItemSpec);\r
 798                                         //}\r
 799 \r
 800                                         if(m_HashMap[data->m_CommitHash].size()!=0)\r
 801                                         {\r
 802                                                 CRect rect;\r
 803 \r
 804                                                 GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);\r
 805                                         \r
 806                                                 FillBackGround(pLVCD->nmcd.hdc, (INT_PTR)pLVCD->nmcd.dwItemSpec,rect);\r
 807                                                 DrawTagBranch(pLVCD->nmcd.hdc,rect,pLVCD->nmcd.dwItemSpec);\r
 808 \r
 809                                                 *pResult = CDRF_SKIPDEFAULT;\r
 810                                                 return;\r
 811 \r
 812                                         }\r
 813                                 }\r
 814                         }\r
 815                         \r
 816                         if (pLVCD->iSubItem == 1)\r
 817                         {\r
 818                                 if(this->m_IsIDReplaceAction)\r
 819                                 {\r
 820                                         *pResult = CDRF_DODEFAULT;\r
 821                                         return;\r
 822                                 }\r
 823                                 *pResult = CDRF_DODEFAULT;\r
 824 \r
 825                                 if (m_arShownList.GetCount() <= (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
 826                                         return;\r
 827 \r
 828                                 int             nIcons = 0;\r
 829                                 int             iconwidth = ::GetSystemMetrics(SM_CXSMICON);\r
 830                                 int             iconheight = ::GetSystemMetrics(SM_CYSMICON);\r
 831 \r
 832                                 GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(pLVCD->nmcd.dwItemSpec));\r
 833                                 CRect rect;\r
 834                                 GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_BOUNDS, rect);\r
 835                                 // Get the selected state of the\r
 836                                 // item being drawn.                                                    \r
 837 \r
 838                                 // Fill the background\r
 839                                 FillBackGround(pLVCD->nmcd.hdc, (INT_PTR)pLVCD->nmcd.dwItemSpec,rect);\r
 840                                 \r
 841                                 // Draw the icon(s) into the compatible DC\r
 842                                 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)\r
 843                                         ::DrawIconEx(pLVCD->nmcd.hdc, rect.left + ICONITEMBORDER, rect.top, m_hModifiedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);\r
 844                                 nIcons++;\r
 845 \r
 846                                 if (pLogEntry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY) )\r
 847                                         ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hAddedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);\r
 848                                 nIcons++;\r
 849 \r
 850                                 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_DELETED)\r
 851                                         ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hDeletedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);\r
 852                                 nIcons++;\r
 853 \r
 854                                 if (pLogEntry->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
 855                                         ::DrawIconEx(pLVCD->nmcd.hdc, rect.left+nIcons*iconwidth + ICONITEMBORDER, rect.top, m_hReplacedIcon, iconwidth, iconheight, 0, NULL, DI_NORMAL);\r
 856                                 nIcons++;\r
 857                                 *pResult = CDRF_SKIPDEFAULT;\r
 858                                 return;\r
 859                         }\r
 860                 }\r
 861                 break;\r
 862         }\r
 863         *pResult = CDRF_DODEFAULT;\r
 864 \r
 865 }\r
 866 \r
 867 // CGitLogListBase message handlers\r
 868 \r
 869 void CGitLogListBase::OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
 870 {\r
 871         NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);\r
 872 \r
 873         // Create a pointer to the item\r
 874         LV_ITEM* pItem = &(pDispInfo)->item;\r
 875 \r
 876         // Do the list need text information?\r
 877         if (!(pItem->mask & LVIF_TEXT))\r
 878                 return;\r
 879 \r
 880         // By default, clear text buffer.\r
 881         lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
 882 \r
 883         bool bOutOfRange = pItem->iItem >= ShownCountWithStopped();\r
 884         \r
 885         *pResult = 0;\r
 886         if (m_bNoDispUpdates || bOutOfRange)\r
 887                 return;\r
 888 \r
 889         // Which item number?\r
 890         int itemid = pItem->iItem;\r
 891         GitRev * pLogEntry = NULL;\r
 892         if (itemid < m_arShownList.GetCount())\r
 893                 pLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(pItem->iItem));\r
 894 \r
 895         CString temp;\r
 896         if(m_IsOldFirst)\r
 897         {\r
 898                 temp.Format(_T("%d"),pItem->iItem+1);\r
 899 \r
 900         }else\r
 901         {\r
 902                 temp.Format(_T("%d"),m_arShownList.GetCount()-pItem->iItem);\r
 903         }\r
 904             \r
 905         // Which column?\r
 906         switch (pItem->iSubItem)\r
 907         {\r
 908         case this->LOGLIST_GRAPH:       //Graphic\r
 909                 if (pLogEntry)\r
 910                 {\r
 911                         if(this->m_IsRebaseReplaceGraph)\r
 912                         {\r
 913                                 CTGitPath path;\r
 914                                 path.m_Action=pLogEntry->m_Action&CTGitPath::LOGACTIONS_REBASE_MODE_MASK;\r
 915 \r
 916                                 lstrcpyn(pItem->pszText,path.GetActionName(), pItem->cchTextMax);\r
 917                         }\r
 918                 }\r
 919                 break;\r
 920         case this->LOGLIST_ACTION: //action -- no text in the column\r
 921                 if(this->m_IsIDReplaceAction)\r
 922                         lstrcpyn(pItem->pszText, temp, pItem->cchTextMax);\r
 923                 break;\r
 924         case this->LOGLIST_MESSAGE: //Message\r
 925                 if (pLogEntry)\r
 926                         lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_Subject, pItem->cchTextMax);\r
 927                 break;\r
 928         case this->LOGLIST_AUTHOR: //Author\r
 929                 if (pLogEntry)\r
 930                         lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorName, pItem->cchTextMax);\r
 931                 break;\r
 932         case this->LOGLIST_DATE: //Date\r
 933                 if (pLogEntry)\r
 934                         lstrcpyn(pItem->pszText,\r
 935                                 CAppUtils::FormatDateAndTime( pLogEntry->m_AuthorDate, m_DateFormat, true, m_bRelativeTimes ), \r
 936                                 pItem->cchTextMax);\r
 937                 break;\r
 938                 \r
 939         case 5:\r
 940 \r
 941                 break;\r
 942         default:\r
 943                 ASSERT(false);\r
 944         }\r
 945 }\r
 946 \r
 947 void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)\r
 948 {\r
 949 \r
 950         int selIndex = GetSelectionMark();\r
 951         if (selIndex < 0)\r
 952                 return; // nothing selected, nothing to do with a context menu\r
 953 \r
 954         // if the user selected the info text telling about not all revisions shown due to\r
 955         // the "stop on copy/rename" option, we also don't show the context menu\r
 956         if ((m_bStrictStopped)&&(selIndex == m_arShownList.GetCount()))\r
 957                 return;\r
 958 \r
 959         // if the context menu is invoked through the keyboard, we have to use\r
 960         // a calculated position on where to anchor the menu on\r
 961         if ((point.x == -1) && (point.y == -1))\r
 962         {\r
 963                 CRect rect;\r
 964                 GetItemRect(selIndex, &rect, LVIR_LABEL);\r
 965                 ClientToScreen(&rect);\r
 966                 point = rect.CenterPoint();\r
 967         }\r
 968         m_nSearchIndex = selIndex;\r
 969         m_bCancelled = FALSE;\r
 970 \r
 971         // calculate some information the context menu commands can use\r
 972 //      CString pathURL = GetURLFromPath(m_path);\r
 973 \r
 974         POSITION pos = GetFirstSelectedItemPosition();\r
 975         int indexNext = GetNextSelectedItem(pos);\r
 976         if (indexNext < 0)\r
 977                 return;\r
 978 \r
 979         GitRev* pSelLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(indexNext));\r
 980 #if 0\r
 981         GitRev revSelected = pSelLogEntry->Rev;\r
 982         GitRev revPrevious = git_revnum_t(revSelected)-1;\r
 983         if ((pSelLogEntry->pArChangedPaths)&&(pSelLogEntry->pArChangedPaths->GetCount() <= 2))\r
 984         {\r
 985                 for (int i=0; i<pSelLogEntry->pArChangedPaths->GetCount(); ++i)\r
 986                 {\r
 987                         LogChangedPath * changedpath = (LogChangedPath *)pSelLogEntry->pArChangedPaths->GetAt(i);\r
 988                         if (changedpath->lCopyFromRev)\r
 989                                 revPrevious = changedpath->lCopyFromRev;\r
 990                 }\r
 991         }\r
 992         GitRev revSelected2;\r
 993         if (pos)\r
 994         {\r
 995                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(GetNextSelectedItem(pos)));\r
 996                 revSelected2 = pLogEntry->Rev;\r
 997         }\r
 998         bool bAllFromTheSameAuthor = true;\r
 999         CString firstAuthor;\r
1000         CLogDataVector selEntries;\r
1001         GitRev revLowest, revHighest;\r
1002         GitRevRangeArray revisionRanges;\r
1003         {\r
1004                 POSITION pos = GetFirstSelectedItemPosition();\r
1005                 PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(GetNextSelectedItem(pos)));\r
1006                 revisionRanges.AddRevision(pLogEntry->Rev);\r
1007                 selEntries.push_back(pLogEntry);\r
1008                 firstAuthor = pLogEntry->sAuthor;\r
1009                 revLowest = pLogEntry->Rev;\r
1010                 revHighest = pLogEntry->Rev;\r
1011                 while (pos)\r
1012                 {\r
1013                         pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(GetNextSelectedItem(pos)));\r
1014                         revisionRanges.AddRevision(pLogEntry->Rev);\r
1015                         selEntries.push_back(pLogEntry);\r
1016                         if (firstAuthor.Compare(pLogEntry->sAuthor))\r
1017                                 bAllFromTheSameAuthor = false;\r
1018                         revLowest = (git_revnum_t(pLogEntry->Rev) > git_revnum_t(revLowest) ? revLowest : pLogEntry->Rev);\r
1019                         revHighest = (git_revnum_t(pLogEntry->Rev) < git_revnum_t(revHighest) ? revHighest : pLogEntry->Rev);\r
1020                 }\r
1021         }\r
1022 \r
1023 #endif\r
1024 \r
1025         int FirstSelect=-1, LastSelect=-1;\r
1026         pos = GetFirstSelectedItemPosition();\r
1027         FirstSelect = GetNextSelectedItem(pos);\r
1028         while(pos)\r
1029         {\r
1030                 LastSelect = GetNextSelectedItem(pos);\r
1031         }\r
1032         //entry is selected, now show the popup menu\r
1033         CIconMenu popup;\r
1034         if (popup.CreatePopupMenu())\r
1035         {\r
1036 \r
1037                 if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_PICK))\r
1038                         popup.AppendMenuIcon(ID_REBASE_PICK,  IDS_REBASE_SKIP,   IDI_PICK);\r
1039 \r
1040                 if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SQUASH))\r
1041                         popup.AppendMenuIcon(ID_REBASE_SQUASH,IDS_REBASE_SQUASH, IDI_SQUASH);\r
1042 \r
1043                 if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_EDIT))\r
1044                         popup.AppendMenuIcon(ID_REBASE_EDIT,  IDS_REBASE_EDIT,   IDI_EDIT);\r
1045 \r
1046                 if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SKIP))\r
1047                         popup.AppendMenuIcon(ID_REBASE_SKIP,  IDS_REBASE_SKIP,   IDI_SKIP);\r
1048                 \r
1049                 if(m_ContextMenuMask&(GetContextMenuBit(ID_REBASE_SKIP)|GetContextMenuBit(ID_REBASE_EDIT)|\r
1050                               GetContextMenuBit(ID_REBASE_SQUASH)|GetContextMenuBit(ID_REBASE_PICK)))\r
1051                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
1052 \r
1053                 if (GetSelectedCount() == 1)\r
1054                 {\r
1055                         {\r
1056                                 if (m_hasWC)\r
1057                                 {\r
1058                                         if(m_ContextMenuMask&GetContextMenuBit(ID_COMPARE))\r
1059                                                 popup.AppendMenuIcon(ID_COMPARE, IDS_LOG_POPUP_COMPARE, IDI_DIFF);\r
1060                                         // TODO:\r
1061                                         // TortoiseMerge could be improved to take a /blame switch\r
1062                                         // and then not 'cat' the files from a unified diff but\r
1063                                         // blame then.\r
1064                                         // But until that's implemented, the context menu entry for\r
1065                                         // this feature is commented out.\r
1066                                         //popup.AppendMenu(ID_BLAMECOMPARE, IDS_LOG_POPUP_BLAMECOMPARE, IDI_BLAME);\r
1067                                 }\r
1068                                 if(m_ContextMenuMask&GetContextMenuBit(ID_GNUDIFF1))\r
1069                                         popup.AppendMenuIcon(ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF);\r
1070 \r
1071                                 if(m_ContextMenuMask&GetContextMenuBit(ID_COMPAREWITHPREVIOUS))\r
1072                                         popup.AppendMenuIcon(ID_COMPAREWITHPREVIOUS, IDS_LOG_POPUP_COMPAREWITHPREVIOUS, IDI_DIFF);\r
1073                                 //popup.AppendMenuIcon(ID_BLAMEWITHPREVIOUS, IDS_LOG_POPUP_BLAMEWITHPREVIOUS, IDI_BLAME);\r
1074                                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
1075                         }\r
1076 \r
1077 //                      if (!m_ProjectProperties.sWebViewerRev.IsEmpty())\r
1078 //                      {\r
1079 //                              popup.AppendMenuIcon(ID_VIEWREV, IDS_LOG_POPUP_VIEWREV);\r
1080 //                      }\r
1081 //                      if (!m_ProjectProperties.sWebViewerPathRev.IsEmpty())\r
1082 //                      {\r
1083 //                              popup.AppendMenuIcon(ID_VIEWPATHREV, IDS_LOG_POPUP_VIEWPATHREV);\r
1084 //                      }\r
1085 //                      if ((!m_ProjectProperties.sWebViewerPathRev.IsEmpty())||\r
1086 //                              (!m_ProjectProperties.sWebViewerRev.IsEmpty()))\r
1087 //                      {\r
1088 //                              popup.AppendMenu(MF_SEPARATOR, NULL);\r
1089 //                      }\r
1090 \r
1091                         //if (m_hasWC)\r
1092                         //      popup.AppendMenuIcon(ID_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);\r
1093                         //if (m_hasWC)\r
1094                         //      popup.AppendMenuIcon(ID_REVERTREV, IDS_LOG_POPUP_REVERTREV, IDI_REVERT);\r
1095                         //if (m_hasWC)\r
1096                         //      popup.AppendMenuIcon(ID_MERGEREV, IDS_LOG_POPUP_MERGEREV, IDI_MERGE);\r
1097                         \r
1098                         CString str,format;\r
1099                         format.LoadString(IDS_RESET_TO_THIS_FORMAT);\r
1100                         str.Format(format,g_Git.GetCurrentBranch());\r
1101 \r
1102                         if(m_ContextMenuMask&GetContextMenuBit(ID_RESET))\r
1103                                 popup.AppendMenuIcon(ID_RESET,str,IDI_REVERT);\r
1104 \r
1105                         if(m_ContextMenuMask&GetContextMenuBit(ID_SWITCHTOREV))\r
1106                                 popup.AppendMenuIcon(ID_SWITCHTOREV, IDS_SWITCH_TO_THIS , IDI_SWITCH);\r
1107 \r
1108                         if(m_ContextMenuMask&GetContextMenuBit(ID_CREATE_BRANCH))\r
1109                                 popup.AppendMenuIcon(ID_CREATE_BRANCH, IDS_CREATE_BRANCH_AT_THIS , IDI_COPY);\r
1110 \r
1111                         if(m_ContextMenuMask&GetContextMenuBit(ID_CREATE_TAG))\r
1112                                 popup.AppendMenuIcon(ID_CREATE_TAG,IDS_CREATE_TAG_AT_THIS , IDI_COPY);\r
1113                         \r
1114                         format.LoadString(IDS_REBASE_THIS_FORMAT);\r
1115                         str.Format(format,g_Git.GetCurrentBranch());\r
1116 \r
1117                         if(pSelLogEntry->m_CommitHash != m_HeadHash)\r
1118                                 if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_TO_VERSION))\r
1119                                         popup.AppendMenuIcon(ID_REBASE_TO_VERSION, str , IDI_REBASE);                   \r
1120 \r
1121                         if(m_ContextMenuMask&GetContextMenuBit(ID_EXPORT))\r
1122                                 popup.AppendMenuIcon(ID_EXPORT,IDS_EXPORT_TO_THIS, IDI_EXPORT); \r
1123                         \r
1124 \r
1125                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
1126 \r
1127                 }\r
1128         \r
1129                 if (GetSelectedCount() >= 2)\r
1130                 {\r
1131                         bool bAddSeparator = false;\r
1132                         if (IsSelectionContinuous() || (GetSelectedCount() == 2))\r
1133                         {\r
1134                                 if(m_ContextMenuMask&GetContextMenuBit(ID_COMPARETWO))\r
1135                                         popup.AppendMenuIcon(ID_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);\r
1136                         }\r
1137 \r
1138                         if (GetSelectedCount() == 2)\r
1139                         {\r
1140                                 //popup.AppendMenuIcon(ID_BLAMETWO, IDS_LOG_POPUP_BLAMEREVS, IDI_BLAME);\r
1141                                 if(m_ContextMenuMask&GetContextMenuBit(ID_GNUDIFF2))\r
1142                                         popup.AppendMenuIcon(ID_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);\r
1143                                 bAddSeparator = true;\r
1144                         }\r
1145 \r
1146                         if (m_hasWC)\r
1147                         {\r
1148                                 //popup.AppendMenuIcon(ID_REVERTREV, IDS_LOG_POPUP_REVERTREVS, IDI_REVERT);\r
1149 //                              if (m_hasWC)\r
1150 //                                      popup.AppendMenuIcon(ID_MERGEREV, IDS_LOG_POPUP_MERGEREVS, IDI_MERGE);\r
1151                                 bAddSeparator = true;\r
1152                         }\r
1153                         if (bAddSeparator)\r
1154                                 popup.AppendMenu(MF_SEPARATOR, NULL);\r
1155                 }\r
1156 \r
1157                 if ( GetSelectedCount() >0 )\r
1158                 {\r
1159                         if ( IsSelectionContinuous() && GetSelectedCount() >= 2 )\r
1160                         {\r
1161                                 if(m_ContextMenuMask&GetContextMenuBit(ID_COMBINE_COMMIT))\r
1162                                 {\r
1163                                         CString head;\r
1164                                         int headindex;\r
1165                                         headindex = this->GetHeadIndex();\r
1166                                         if(headindex>=0)\r
1167                                         {\r
1168                                                 head.Format(_T("HEAD~%d"),LastSelect-headindex);\r
1169                                                 CString hash=g_Git.GetHash(head);\r
1170                                                 hash=hash.Left(40);\r
1171                                                 GitRev* pLastEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));\r
1172                                                 if(pLastEntry->m_CommitHash == hash)\r
1173                                                         popup.AppendMenuIcon(ID_COMBINE_COMMIT,IDS_COMBINE_TO_ONE,IDI_COMBINE);\r
1174                                         }\r
1175                                 }\r
1176                         }\r
1177                         if(m_ContextMenuMask&GetContextMenuBit(ID_CHERRY_PICK))\r
1178                                 popup.AppendMenuIcon(ID_CHERRY_PICK, IDS_CHERRY_PICK_VERSION, IDI_EXPORT);\r
1179                         popup.AppendMenu(MF_SEPARATOR, NULL);\r
1180         \r
1181                 }\r
1182 \r
1183                 \r
1184 #if 0\r
1185 //              if ((selEntries.size() > 0)&&(bAllFromTheSameAuthor))\r
1186 //              {\r
1187 //                      popup.AppendMenuIcon(ID_EDITAUTHOR, IDS_LOG_POPUP_EDITAUTHOR);\r
1188 //              }\r
1189 //              if (GetSelectedCount() == 1)\r
1190 //              {\r
1191 //                      popup.AppendMenuIcon(ID_EDITLOG, IDS_LOG_POPUP_EDITLOG);\r
1192 //                      popup.AppendMenuIcon(ID_REVPROPS, IDS_REPOBROWSE_SHOWREVPROP, IDI_PROPERTIES); // "Show Revision Properties"\r
1193 //                      popup.AppendMenu(MF_SEPARATOR, NULL);\r
1194 //              }\r
1195 #endif\r
1196 \r
1197                 \r
1198                 if (GetSelectedCount() == 1)\r
1199                 {\r
1200                         if(m_ContextMenuMask&GetContextMenuBit(ID_COPYHASH))\r
1201                                 popup.AppendMenuIcon(ID_COPYHASH, IDS_COPY_COMMIT_HASH);\r
1202                 }\r
1203                 if (GetSelectedCount() != 0)\r
1204                 {\r
1205                         if(m_ContextMenuMask&GetContextMenuBit(ID_COPYCLIPBOARD))\r
1206                                 popup.AppendMenuIcon(ID_COPYCLIPBOARD, IDS_LOG_POPUP_COPYTOCLIPBOARD);\r
1207                 }\r
1208 \r
1209                 if(m_ContextMenuMask&GetContextMenuBit(ID_FINDENTRY))\r
1210                         popup.AppendMenuIcon(ID_FINDENTRY, IDS_LOG_POPUP_FIND);\r
1211 \r
1212                 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
1213 //              DialogEnableWindow(IDOK, FALSE);\r
1214 //              SetPromptApp(&theApp);\r
1215         \r
1216                 this->ContextMenuAction(cmd, FirstSelect, LastSelect);\r
1217                 \r
1218 //              EnableOKButton();\r
1219         } // if (popup.CreatePopupMenu())\r
1220 \r
1221 }\r
1222 \r
1223 bool CGitLogListBase::IsSelectionContinuous()\r
1224 {\r
1225         if ( GetSelectedCount()==1 )\r
1226         {\r
1227                 // if only one revision is selected, the selection is of course\r
1228                 // continuous\r
1229                 return true;\r
1230         }\r
1231 \r
1232         POSITION pos = GetFirstSelectedItemPosition();\r
1233         bool bContinuous = (m_arShownList.GetCount() == (INT_PTR)m_logEntries.size());\r
1234         if (bContinuous)\r
1235         {\r
1236                 int itemindex = GetNextSelectedItem(pos);\r
1237                 while (pos)\r
1238                 {\r
1239                         int nextindex = GetNextSelectedItem(pos);\r
1240                         if (nextindex - itemindex > 1)\r
1241                         {\r
1242                                 bContinuous = false;\r
1243                                 break;\r
1244                         }\r
1245                         itemindex = nextindex;\r
1246                 }\r
1247         }\r
1248         return bContinuous;\r
1249 }\r
1250 \r
1251 void CGitLogListBase::CopySelectionToClipBoard(bool HashOnly)\r
1252 {\r
1253 \r
1254         CString sClipdata;\r
1255         POSITION pos = GetFirstSelectedItemPosition();\r
1256         if (pos != NULL)\r
1257         {\r
1258                 CString sRev;\r
1259                 sRev.LoadString(IDS_LOG_REVISION);\r
1260                 CString sAuthor;\r
1261                 sAuthor.LoadString(IDS_LOG_AUTHOR);\r
1262                 CString sDate;\r
1263                 sDate.LoadString(IDS_LOG_DATE);\r
1264                 CString sMessage;\r
1265                 sMessage.LoadString(IDS_LOG_MESSAGE);\r
1266                 while (pos)\r
1267                 {\r
1268                         CString sLogCopyText;\r
1269                         CString sPaths;\r
1270                         GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(GetNextSelectedItem(pos)));\r
1271 \r
1272                         if(!HashOnly)\r
1273                         {\r
1274                                 //pLogEntry->m_Files\r
1275                                 //LogChangedPathArray * cpatharray = pLogEntry->pArChangedPaths;\r
1276                         \r
1277                                 for (int cpPathIndex = 0; cpPathIndex<pLogEntry->m_Files.GetCount(); ++cpPathIndex)\r
1278                                 {\r
1279                                         sPaths += ((CTGitPath&)pLogEntry->m_Files[cpPathIndex]).GetActionName() + _T(" : ") + pLogEntry->m_Files[cpPathIndex].GetGitPathString();\r
1280                                         sPaths += _T("\r\n");\r
1281                                 }\r
1282                                 sPaths.Trim();\r
1283                                 sLogCopyText.Format(_T("%s: %s\r\n%s: %s\r\n%s: %s\r\n%s:\r\n%s\r\n----\r\n%s\r\n\r\n"),\r
1284                                         (LPCTSTR)sRev, pLogEntry->m_CommitHash,\r
1285                                         (LPCTSTR)sAuthor, (LPCTSTR)pLogEntry->m_AuthorName,\r
1286                                         (LPCTSTR)sDate, \r
1287                                         (LPCTSTR)CAppUtils::FormatDateAndTime( pLogEntry->m_AuthorDate, m_DateFormat, true, m_bRelativeTimes ),\r
1288                                         (LPCTSTR)sMessage, pLogEntry->m_Subject+_T("\r\n")+pLogEntry->m_Body,\r
1289                                         (LPCTSTR)sPaths);\r
1290                                 sClipdata +=  sLogCopyText;\r
1291                         }else\r
1292                         {\r
1293                                 sClipdata += pLogEntry->m_CommitHash;\r
1294                                 break;\r
1295                         }\r
1296 \r
1297                 }\r
1298                 CStringUtils::WriteAsciiStringToClipboard(sClipdata, GetSafeHwnd());\r
1299         }\r
1300 \r
1301 }\r
1302 \r
1303 void CGitLogListBase::DiffSelectedRevWithPrevious()\r
1304 {\r
1305         if (m_bThreadRunning)\r
1306                 return;\r
1307 \r
1308         int FirstSelect=-1, LastSelect=-1;\r
1309         POSITION pos = GetFirstSelectedItemPosition();\r
1310         FirstSelect = GetNextSelectedItem(pos);\r
1311         while(pos)\r
1312         {\r
1313                 LastSelect = GetNextSelectedItem(pos);\r
1314         }\r
1315 \r
1316         ContextMenuAction(ID_COMPAREWITHPREVIOUS,FirstSelect,LastSelect);\r
1317 \r
1318 #if 0\r
1319         UpdateLogInfoLabel();\r
1320         int selIndex = m_LogList.GetSelectionMark();\r
1321         if (selIndex < 0)\r
1322                 return;\r
1323         int selCount = m_LogList.GetSelectedCount();\r
1324         if (selCount != 1)\r
1325                 return;\r
1326 \r
1327         // Find selected entry in the log list\r
1328         POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
1329         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
1330         long rev1 = pLogEntry->Rev;\r
1331         long rev2 = rev1-1;\r
1332         CTGitPath path = m_path;\r
1333 \r
1334         // See how many files under the relative root were changed in selected revision\r
1335         int nChanged = 0;\r
1336         LogChangedPath * changed = NULL;\r
1337         for (INT_PTR c = 0; c < pLogEntry->pArChangedPaths->GetCount(); ++c)\r
1338         {\r
1339                 LogChangedPath * cpath = pLogEntry->pArChangedPaths->GetAt(c);\r
1340                 if (cpath  &&  cpath -> sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)\r
1341                 {\r
1342                         ++nChanged;\r
1343                         changed = cpath;\r
1344                 }\r
1345         }\r
1346 \r
1347         if (m_path.IsDirectory() && nChanged == 1) \r
1348         {\r
1349                 // We're looking at the log for a directory and only one file under dir was changed in the revision\r
1350                 // Do diff on that file instead of whole directory\r
1351                 path.AppendPathString(changed->sPath.Mid(m_sRelativeRoot.GetLength()));\r
1352         } \r
1353 \r
1354         m_bCancelled = FALSE;\r
1355         DialogEnableWindow(IDOK, FALSE);\r
1356         SetPromptApp(&theApp);\r
1357         theApp.DoWaitCursor(1);\r
1358 \r
1359         if (PromptShown())\r
1360         {\r
1361                 GitDiff diff(this, m_hWnd, true);\r
1362                 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1363                 diff.SetHEADPeg(m_LogRevision);\r
1364                 diff.ShowCompare(path, rev2, path, rev1);\r
1365         }\r
1366         else\r
1367         {\r
1368                 CAppUtils::StartShowCompare(m_hWnd, path, rev2, path, rev1, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
1369         }\r
1370 \r
1371         theApp.DoWaitCursor(-1);\r
1372         EnableOKButton();\r
1373 #endif\r
1374 }\r
1375 \r
1376 void CGitLogListBase::OnLvnOdfinditemLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
1377 {\r
1378         LPNMLVFINDITEM pFindInfo = reinterpret_cast<LPNMLVFINDITEM>(pNMHDR);\r
1379         *pResult = -1;\r
1380         \r
1381         if (pFindInfo->lvfi.flags & LVFI_PARAM)\r
1382                 return; \r
1383         if ((pFindInfo->iStart < 0)||(pFindInfo->iStart >= m_arShownList.GetCount()))\r
1384                 return;\r
1385         if (pFindInfo->lvfi.psz == 0)\r
1386                 return;\r
1387 #if 0\r
1388         CString sCmp = pFindInfo->lvfi.psz;\r
1389         CString sRev;   \r
1390         for (int i=pFindInfo->iStart; i<m_arShownList.GetCount(); ++i)\r
1391         {\r
1392                 GitRev * pLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));\r
1393                 sRev.Format(_T("%ld"), pLogEntry->Rev);\r
1394                 if (pFindInfo->lvfi.flags & LVFI_PARTIAL)\r
1395                 {\r
1396                         if (sCmp.Compare(sRev.Left(sCmp.GetLength()))==0)\r
1397                         {\r
1398                                 *pResult = i;\r
1399                                 return;\r
1400                         }\r
1401                 }\r
1402                 else\r
1403                 {\r
1404                         if (sCmp.Compare(sRev)==0)\r
1405                         {\r
1406                                 *pResult = i;\r
1407                                 return;\r
1408                         }\r
1409                 }\r
1410         }\r
1411         if (pFindInfo->lvfi.flags & LVFI_WRAP)\r
1412         {\r
1413                 for (int i=0; i<pFindInfo->iStart; ++i)\r
1414                 {\r
1415                         PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(i));\r
1416                         sRev.Format(_T("%ld"), pLogEntry->Rev);\r
1417                         if (pFindInfo->lvfi.flags & LVFI_PARTIAL)\r
1418                         {\r
1419                                 if (sCmp.Compare(sRev.Left(sCmp.GetLength()))==0)\r
1420                                 {\r
1421                                         *pResult = i;\r
1422                                         return;\r
1423                                 }\r
1424                         }\r
1425                         else\r
1426                         {\r
1427                                 if (sCmp.Compare(sRev)==0)\r
1428                                 {\r
1429                                         *pResult = i;\r
1430                                         return;\r
1431                                 }\r
1432                         }\r
1433                 }\r
1434         }\r
1435 #endif\r
1436         *pResult = -1;\r
1437 }\r
1438 \r
1439 int CGitLogListBase::FillGitLog(CTGitPath *path,int info,CString *from,CString *to)\r
1440 {\r
1441         ClearText();\r
1442 \r
1443         this->m_logEntries.ClearAll();\r
1444         this->m_logEntries.ParserFromLog(path,-1,info,from,to);\r
1445 \r
1446         //this->m_logEntries.ParserFromLog();\r
1447         SetItemCountEx(this->m_logEntries.size());\r
1448 \r
1449         this->m_arShownList.RemoveAll();\r
1450 \r
1451         for(unsigned int i=0;i<m_logEntries.size();i++)\r
1452         {\r
1453                 if(m_IsOldFirst)\r
1454                 {\r
1455                         m_logEntries[m_logEntries.size()-i-1].m_IsFull=TRUE;\r
1456                         this->m_arShownList.Add(&m_logEntries[m_logEntries.size()-i-1]);\r
1457                 \r
1458                 }else\r
1459                 {\r
1460                         m_logEntries[i].m_IsFull=TRUE;\r
1461                         this->m_arShownList.Add(&m_logEntries[i]);\r
1462                 }\r
1463         }\r
1464 \r
1465     if(path)\r
1466         m_Path=*path;\r
1467         return 0;\r
1468 \r
1469 }\r
1470 \r
1471 int CGitLogListBase::FillGitShortLog()\r
1472 {\r
1473         ClearText();\r
1474 \r
1475         this->m_logEntries.ClearAll();\r
1476 \r
1477         m_LogCache.FetchCacheIndex(g_Git.m_CurrentDir);\r
1478 \r
1479     CTGitPath *path;\r
1480     if(this->m_Path.IsEmpty())\r
1481         path=NULL;\r
1482     else\r
1483         path=&this->m_Path;\r
1484 \r
1485         CString hash;\r
1486         int mask;\r
1487         mask = CGit::LOG_INFO_ONLY_HASH | CGit::LOG_INFO_BOUNDARY;\r
1488 //      if(this->m_bAllBranch)\r
1489         mask |= m_ShowMask;\r
1490 \r
1491         this->m_logEntries.ParserShortLog(path,hash,-1,mask);\r
1492         \r
1493 \r
1494         //this->m_logEntries.ParserFromLog();\r
1495         if(IsInWorkingThread())\r
1496                 PostMessage(LVM_SETITEMCOUNT, (WPARAM) this->m_logEntries.size(),(LPARAM) LVSICF_NOINVALIDATEALL);\r
1497         else\r
1498                 SetItemCountEx(this->m_logEntries.size());\r
1499 \r
1500         this->m_arShownList.RemoveAll();\r
1501 \r
1502         for(unsigned int i=0;i<m_logEntries.size();i++)\r
1503         {\r
1504                 if(this->m_IsOldFirst)\r
1505                 {\r
1506                         this->m_arShownList.Add(&m_logEntries[m_logEntries.size()-1-i]);\r
1507 \r
1508                 }else\r
1509                 {\r
1510                         this->m_arShownList.Add(&m_logEntries[i]);\r
1511                 }\r
1512         }\r
1513         return 0;\r
1514 }\r
1515 \r
1516 BOOL CGitLogListBase::PreTranslateMessage(MSG* pMsg)\r
1517 {\r
1518         // Skip Ctrl-C when copying text out of the log message or search filter\r
1519         BOOL bSkipAccelerator = ( pMsg->message == WM_KEYDOWN && pMsg->wParam=='C' && (GetFocus()==GetDlgItem(IDC_MSGVIEW) || GetFocus()==GetDlgItem(IDC_SEARCHEDIT) ) && GetKeyState(VK_CONTROL)&0x8000 );\r
1520         if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')\r
1521         {\r
1522                 //if (GetFocus()==GetDlgItem(IDC_LOGLIST))\r
1523                 {\r
1524                         if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
1525                         {\r
1526                                 DiffSelectedRevWithPrevious();\r
1527                                 return TRUE;\r
1528                         }\r
1529                 }\r
1530 #if 0\r
1531                 if (GetFocus()==GetDlgItem(IDC_LOGMSG))\r
1532                 {\r
1533                         DiffSelectedFile();\r
1534                         return TRUE;\r
1535                 }\r
1536 #endif\r
1537         }\r
1538 \r
1539 #if 0\r
1540         if (m_hAccel && !bSkipAccelerator)\r
1541         {\r
1542                 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);\r
1543                 if (ret)\r
1544                         return TRUE;\r
1545         }\r
1546         \r
1547 #endif\r
1548         //m_tooltips.RelayEvent(pMsg);\r
1549         return __super::PreTranslateMessage(pMsg);\r
1550 }\r
1551 \r
1552 void CGitLogListBase::OnNMDblclkLoglist(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
1553 {\r
1554         // a double click on an entry in the revision list has happened\r
1555         *pResult = 0;\r
1556 \r
1557         if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
1558                 DiffSelectedRevWithPrevious();\r
1559 }\r
1560 \r
1561 int CGitLogListBase::FetchLogAsync(void * data)\r
1562 {\r
1563         m_ProcData=data;\r
1564         m_bExitThread=FALSE;\r
1565         InterlockedExchange(&m_bThreadRunning, TRUE);\r
1566         InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
1567         m_LoadingThread = AfxBeginThread(LogThreadEntry, this);\r
1568         if (m_LoadingThread ==NULL)\r
1569         {\r
1570                 InterlockedExchange(&m_bThreadRunning, FALSE);\r
1571                 InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
1572                 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
1573                 return -1;\r
1574         }\r
1575         return 0;\r
1576 }\r
1577 \r
1578 //this is the thread function which calls the subversion function\r
1579 UINT CGitLogListBase::LogThreadEntry(LPVOID pVoid)\r
1580 {\r
1581         return ((CGitLogListBase*)pVoid)->LogThread();\r
1582 }\r
1583 \r
1584 void CGitLogListBase::GetTimeRange(CTime &oldest, CTime &latest)\r
1585 {\r
1586         //CTime time;\r
1587         oldest=CTime::GetCurrentTime();\r
1588         latest=CTime(1971,1,2,0,0,0);\r
1589         for(unsigned int i=0;i<m_logEntries.size();i++)\r
1590         {\r
1591                 if(m_logEntries[i].m_AuthorDate.GetTime() < oldest.GetTime())\r
1592                         oldest = m_logEntries[i].m_AuthorDate.GetTime();\r
1593 \r
1594                 if(m_logEntries[i].m_AuthorDate.GetTime() > latest.GetTime())\r
1595                         latest = m_logEntries[i].m_AuthorDate.GetTime();\r
1596 \r
1597         }\r
1598 }\r
1599 \r
1600 //Helper class for FetchFullLogInfo()\r
1601 class CGitCall_FetchFullLogInfo : public CGitCall\r
1602 {\r
1603 public:\r
1604         CGitCall_FetchFullLogInfo(CGitLogListBase* ploglist):m_ploglist(ploglist),m_CollectedCount(0){}\r
1605         virtual bool OnOutputData(const BYTE* data, size_t size)\r
1606         {\r
1607                 if(size==0)\r
1608                         return m_ploglist->m_bExitThread;\r
1609                 //Add received data to byte collector\r
1610                 m_ByteCollector.append(data,size);\r
1611 \r
1612                 //Find loginfo endmarker\r
1613                 static const BYTE dataToFind[]={0,0};\r
1614                 int found=m_ByteCollector.findData(dataToFind,2);\r
1615                 if(found<0)\r
1616                         return m_ploglist->m_bExitThread;//Not found\r
1617                 found+=2;//Position after loginfo end-marker\r
1618 \r
1619                 //Prepare data for OnLogInfo and call it\r
1620                 BYTE_VECTOR logInfo;\r
1621                 logInfo.append(&*m_ByteCollector.begin(),found);\r
1622                 OnLogInfo(logInfo);\r
1623 \r
1624                 //Remove loginfo from bytecollector\r
1625                 m_ByteCollector.erase(m_ByteCollector.begin(),m_ByteCollector.begin()+found);\r
1626 \r
1627                 return m_ploglist->m_bExitThread;\r
1628         }\r
1629         virtual void OnEnd()\r
1630         {\r
1631                 //Rest should be a complete log line.\r
1632                 if(!m_ByteCollector.empty())\r
1633                         OnLogInfo(m_ByteCollector);\r
1634         }\r
1635 \r
1636 \r
1637         void OnLogInfo(BYTE_VECTOR& logInfo)\r
1638         {\r
1639                 GitRev fullRev;\r
1640                 fullRev.ParserFromLog(logInfo);\r
1641                 MAP_HASH_REV::iterator itRev=m_ploglist->m_logEntries.m_HashMap.find(fullRev.m_CommitHash);\r
1642                 if(itRev==m_ploglist->m_logEntries.m_HashMap.end())\r
1643                 {\r
1644                         //Should not occur, only when Git-tree updated in the mean time. (Race condition)\r
1645                         return;//Ignore\r
1646                 }\r
1647                 //Set updating\r
1648                 int rev=itRev->second;\r
1649                 GitRev* revInVector=&m_ploglist->m_logEntries[rev];\r
1650 \r
1651 \r
1652 //              fullRev.m_IsUpdateing=TRUE;\r
1653 //              fullRev.m_IsFull=TRUE;\r
1654 \r
1655 \r
1656                 if(InterlockedExchange(&revInVector->m_IsUpdateing,TRUE))\r
1657                         return;//Cannot update this row now. Ignore.\r
1658                 TCHAR oldmark=revInVector->m_Mark;\r
1659                 GIT_REV_LIST oldlist=revInVector->m_ParentHash;\r
1660 //              CString oldhash=m_CommitHash;\r
1661 \r
1662                 //Parse new rev info\r
1663                 revInVector->ParserFromLog(logInfo);\r
1664 \r
1665                 if(oldmark!=0)\r
1666                         revInVector->m_Mark=oldmark;  //parser full log will cause old mark overwrited. \r
1667                                                                //So we need keep old bound mark.\r
1668                 revInVector->m_ParentHash=oldlist;\r
1669 \r
1670                 //Reset updating\r
1671                 InterlockedExchange(&revInVector->m_IsFull,TRUE);\r
1672                 InterlockedExchange(&revInVector->m_IsUpdateing,FALSE);\r
1673 \r
1674                 //Notify listcontrol and update progress bar\r
1675                 ++m_CollectedCount;\r
1676 \r
1677                 ::PostMessage(m_ploglist->m_hWnd,MSG_LOADED,(WPARAM)rev,0);\r
1678 \r
1679                 DWORD percent=m_CollectedCount*98/m_ploglist->m_logEntries.size() + GITLOG_START+1;\r
1680                 if(percent == GITLOG_END)\r
1681                         percent = GITLOG_END -1;\r
1682                 \r
1683                 ::PostMessage(m_ploglist->GetParent()->m_hWnd,MSG_LOAD_PERCENTAGE,(WPARAM) percent,0);\r
1684         }\r
1685 \r
1686         CGitLogListBase*        m_ploglist;\r
1687         BYTE_VECTOR                     m_ByteCollector;\r
1688         int                                     m_CollectedCount;\r
1689 \r
1690 };\r
1691 \r
1692 void CGitLogListBase::FetchFullLogInfo()\r
1693 {\r
1694         CGitCall_FetchFullLogInfo fetcher(this);\r
1695         int mask=\r
1696                 CGit::LOG_INFO_STAT|\r
1697                 CGit::LOG_INFO_FILESTATE|\r
1698                 CGit::LOG_INFO_DETECT_COPYRENAME|\r
1699                 m_ShowMask;\r
1700         g_Git.GetLog(&fetcher,CString(),NULL,-1,mask);\r
1701 }\r
1702 \r
1703 void CGitLogListBase::FetchFullLogInfoOrig()\r
1704 {\r
1705         unsigned int updated=0;\r
1706         int percent=0;\r
1707         CRect rect;\r
1708         while(1)\r
1709         {\r
1710                 for(unsigned int i=0;i<m_logEntries.size();i++)\r
1711                 {\r
1712                         if(m_LogCache.GetCacheData(m_logEntries[i]))\r
1713                         {\r
1714                                 if(!m_logEntries.FetchFullInfo(i))\r
1715                                 {\r
1716                                         updated++;\r
1717                                 }\r
1718                                 m_LogCache.AddCacheEntry(m_logEntries[i]);\r
1719 \r
1720                         }else\r
1721                         {\r
1722                                 updated++;\r
1723                                 InterlockedExchange(&m_logEntries[i].m_IsUpdateing,FALSE);\r
1724                                 InterlockedExchange(&m_logEntries[i].m_IsFull,TRUE);\r
1725                         }\r
1726                         \r
1727                         ::PostMessage(m_hWnd,MSG_LOADED,(WPARAM)i,0);\r
1728 \r
1729                         if(m_bExitThread)\r
1730                         {\r
1731                                 InterlockedExchange(&m_bThreadRunning, FALSE);\r
1732                                 InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
1733                                 return;\r
1734                         }\r
1735 \r
1736                         percent=updated*98/m_logEntries.size() + GITLOG_START+1;\r
1737                         if(percent == GITLOG_END)\r
1738                                 percent = GITLOG_END -1;\r
1739                         \r
1740                         ::PostMessage(this->GetParent()->m_hWnd,MSG_LOAD_PERCENTAGE,(WPARAM) percent,0);\r
1741 \r
1742                         \r
1743                 }\r
1744                 if(updated==m_logEntries.size())\r
1745                         break;\r
1746         }\r
1747 }\r
1748 \r
1749 UINT CGitLogListBase::LogThread()\r
1750 {\r
1751 \r
1752 //      if(m_ProcCallBack)\r
1753 //              m_ProcCallBack(m_ProcData,GITLOG_START);\r
1754         ::PostMessage(this->GetParent()->m_hWnd,MSG_LOAD_PERCENTAGE,(WPARAM) GITLOG_START,0);\r
1755 \r
1756         InterlockedExchange(&m_bThreadRunning, TRUE);\r
1757         InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
1758 \r
1759     //does the user force the cache to refresh (shift or control key down)?\r
1760     bool refresh =    (GetKeyState (VK_CONTROL) < 0) \r
1761                    || (GetKeyState (VK_SHIFT) < 0);\r
1762 \r
1763         //disable the "Get All" button while we're receiving\r
1764         //log messages.\r
1765 \r
1766         FillGitShortLog();\r
1767         \r
1768         if(this->m_bExitThread)\r
1769         {\r
1770                 InterlockedExchange(&m_bThreadRunning, FALSE);\r
1771                 InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
1772                 return 0;\r
1773         }\r
1774 #if 0\r
1775         RedrawItems(0, m_arShownList.GetCount());\r
1776 //      SetRedraw(false);\r
1777 //      ResizeAllListCtrlCols();\r
1778 //      SetRedraw(true);\r
1779 \r
1780         if ( m_pStoreSelection )\r
1781         {\r
1782                 // Deleting the instance will restore the\r
1783                 // selection of the CLogDlg.\r
1784                 delete m_pStoreSelection;\r
1785                 m_pStoreSelection = NULL;\r
1786         }\r
1787         else\r
1788         {\r
1789                 // If no selection has been set then this must be the first time\r
1790                 // the revisions are shown. Let's preselect the topmost revision.\r
1791                 if ( GetItemCount()>0 )\r
1792                 {\r
1793                         SetSelectionMark(0);\r
1794                         SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);\r
1795                 }\r
1796         }\r
1797 #endif\r
1798         InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
1799 \r
1800 \r
1801         //FetchFullLogInfo();\r
1802         FetchFullLogInfoOrig();\r
1803         //RefreshCursor();\r
1804         // make sure the filter is applied (if any) now, after we refreshed/fetched\r
1805         // the log messages\r
1806 \r
1807         ::PostMessage(this->GetParent()->m_hWnd,MSG_LOAD_PERCENTAGE,(WPARAM) GITLOG_END,0);\r
1808 \r
1809         InterlockedExchange(&m_bThreadRunning, FALSE);\r
1810 \r
1811         return 0;\r
1812 }\r
1813 \r
1814 void CGitLogListBase::Refresh()\r
1815 {       \r
1816         m_bExitThread=TRUE;\r
1817         if(m_LoadingThread!=NULL)\r
1818         {\r
1819                 DWORD ret =::WaitForSingleObject(m_LoadingThread->m_hThread,20000);\r
1820                 if(ret == WAIT_TIMEOUT)\r
1821                         TerminateThread();\r
1822         }\r
1823 \r
1824         this->Clear();\r
1825 \r
1826         //Update branch and Tag info\r
1827         ReloadHashMap();\r
1828         //Assume Thread have exited\r
1829         //if(!m_bThreadRunning)\r
1830         {\r
1831                 this->SetItemCountEx(0);\r
1832                 m_logEntries.clear();\r
1833                 m_bExitThread=FALSE;\r
1834                 InterlockedExchange(&m_bThreadRunning, TRUE);\r
1835                 InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
1836                 if (AfxBeginThread(LogThreadEntry, this)==NULL)\r
1837                 {\r
1838                         InterlockedExchange(&m_bThreadRunning, FALSE);\r
1839                         InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
1840                         CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
1841                 }\r
1842                 m_sFilterText.Empty();\r
1843                 m_From=CTime(1970,1,2,0,0,0);\r
1844                 m_To=CTime::GetCurrentTime();\r
1845         }\r
1846 }\r
1847 bool CGitLogListBase::ValidateRegexp(LPCTSTR regexp_str, tr1::wregex& pat, bool bMatchCase /* = false */)\r
1848 {\r
1849         try\r
1850         {\r
1851                 tr1::regex_constants::syntax_option_type type = tr1::regex_constants::ECMAScript;\r
1852                 if (!bMatchCase)\r
1853                         type |= tr1::regex_constants::icase;\r
1854                 pat = tr1::wregex(regexp_str, type);\r
1855                 return true;\r
1856         }\r
1857         catch (exception) {}\r
1858         return false;\r
1859 }\r
1860 \r
1861 void CGitLogListBase::RecalculateShownList(CPtrArray * pShownlist)\r
1862 {\r
1863 \r
1864         pShownlist->RemoveAll();\r
1865         tr1::wregex pat;//(_T("Remove"), tr1::regex_constants::icase);\r
1866         bool bRegex = false;\r
1867         if (m_bFilterWithRegex)\r
1868                 bRegex = ValidateRegexp(m_sFilterText, pat, false);\r
1869 \r
1870         tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_any;\r
1871         CString sRev;\r
1872         for (DWORD i=0; i<m_logEntries.size(); ++i)\r
1873         {\r
1874                 if ((bRegex)&&(m_bFilterWithRegex))\r
1875                 {\r
1876 #if 0\r
1877                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))\r
1878                         {\r
1879                                 ATLTRACE(_T("bugID = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sBugIDs);\r
1880                                 if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sBugIDs), pat, flags)&&IsEntryInDateRange(i))\r
1881                                 {\r
1882                                         pShownlist->Add(m_logEntries[i]);\r
1883                                         continue;\r
1884                                 }\r
1885                         }\r
1886 #endif\r
1887                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))\r
1888                         {\r
1889                                 ATLTRACE(_T("messge = \"%s\"\n"),m_logEntries[i].m_Subject);\r
1890                                 if (regex_search(wstring((LPCTSTR)m_logEntries[i].m_Subject), pat, flags)&&IsEntryInDateRange(i))\r
1891                                 {\r
1892                                         pShownlist->Add(&m_logEntries[i]);\r
1893                                         continue;\r
1894                                 }\r
1895 \r
1896                                 ATLTRACE(_T("messge = \"%s\"\n"),m_logEntries[i].m_Body);\r
1897                                 if (regex_search(wstring((LPCTSTR)m_logEntries[i].m_Body), pat, flags)&&IsEntryInDateRange(i))\r
1898                                 {\r
1899                                         pShownlist->Add(&m_logEntries[i]);\r
1900                                         continue;\r
1901                                 }\r
1902                         }\r
1903 #if 0\r
1904                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))\r
1905                         {\r
1906                                 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;\r
1907 \r
1908                                 bool bGoing = true;\r
1909                                 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)\r
1910                                 {\r
1911                                         LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1912                                         if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags)&&IsEntryInDateRange(i))\r
1913                                         {\r
1914                                                 pShownlist->Add(m_logEntries[i]);\r
1915                                                 bGoing = false;\r
1916                                                 continue;\r
1917                                         }\r
1918                                         if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags)&&IsEntryInDateRange(i))\r
1919                                         {\r
1920                                                 pShownlist->Add(m_logEntries[i]);\r
1921                                                 bGoing = false;\r
1922                                                 continue;\r
1923                                         }\r
1924                                         if (regex_search(wstring((LPCTSTR)cpath->GetAction()), pat, flags)&&IsEntryInDateRange(i))\r
1925                                         {\r
1926                                                 pShownlist->Add(m_logEntries[i]);\r
1927                                                 bGoing = false;\r
1928                                                 continue;\r
1929                                         }\r
1930                                 }\r
1931                                 if (!bGoing)\r
1932                                         continue;\r
1933                         }\r
1934 #endif\r
1935                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))\r
1936                         {\r
1937                                 if (regex_search(wstring((LPCTSTR)m_logEntries[i].m_AuthorName), pat, flags)&&IsEntryInDateRange(i))\r
1938                                 {\r
1939                                         pShownlist->Add(&m_logEntries[i]);\r
1940                                         continue;\r
1941                                 }\r
1942                         }\r
1943                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))\r
1944                         {\r
1945                                 sRev.Format(_T("%s"), m_logEntries[i].m_CommitHash);\r
1946                                 if (regex_search(wstring((LPCTSTR)sRev), pat, flags)&&IsEntryInDateRange(i))\r
1947                                 {\r
1948                                         pShownlist->Add(&m_logEntries[i]);\r
1949                                         continue;\r
1950                                 }\r
1951                         }\r
1952                 } // if (bRegex)\r
1953                 else\r
1954                 {\r
1955                         CString find = m_sFilterText;\r
1956                         find.MakeLower();\r
1957 #if 0\r
1958                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))\r
1959                         {\r
1960                                 CString sBugIDs = m_logEntries[i]->sBugIDs;\r
1961 \r
1962                                 sBugIDs = sBugIDs.MakeLower();\r
1963                                 if ((sBugIDs.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
1964                                 {\r
1965                                         pShownlist->Add(m_logEntries[i]);\r
1966                                         continue;\r
1967                                 }\r
1968                         }\r
1969 #endif\r
1970                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))\r
1971                         {\r
1972                                 CString msg = m_logEntries[i].m_Subject;\r
1973 \r
1974                                 msg = msg.MakeLower();\r
1975                                 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
1976                                 {\r
1977                                         pShownlist->Add(&m_logEntries[i]);\r
1978                                         continue;\r
1979                                 }\r
1980                                 msg = m_logEntries[i].m_Body;\r
1981 \r
1982                                 msg = msg.MakeLower();\r
1983                                 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
1984                                 {\r
1985                                         pShownlist->Add(&m_logEntries[i]);\r
1986                                         continue;\r
1987                                 }\r
1988                         }\r
1989 #if 0\r
1990                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))\r
1991                         {\r
1992                                 LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;\r
1993 \r
1994                                 bool bGoing = true;\r
1995                                 for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)\r
1996                                 {\r
1997                                         LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
1998                                         CString path = cpath->sCopyFromPath;\r
1999                                         path.MakeLower();\r
2000                                         if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
2001                                         {\r
2002                                                 pShownlist->Add(m_logEntries[i]);\r
2003                                                 bGoing = false;\r
2004                                                 continue;\r
2005                                         }\r
2006                                         path = cpath->sPath;\r
2007                                         path.MakeLower();\r
2008                                         if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
2009                                         {\r
2010                                                 pShownlist->Add(m_logEntries[i]);\r
2011                                                 bGoing = false;\r
2012                                                 continue;\r
2013                                         }\r
2014                                         path = cpath->GetAction();\r
2015                                         path.MakeLower();\r
2016                                         if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
2017                                         {\r
2018                                                 pShownlist->Add(m_logEntries[i]);\r
2019                                                 bGoing = false;\r
2020                                                 continue;\r
2021                                         }\r
2022                                 }\r
2023                         }\r
2024 #endif\r
2025                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))\r
2026                         {\r
2027                                 CString msg = m_logEntries[i].m_AuthorName;\r
2028                                 msg = msg.MakeLower();\r
2029                                 if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
2030                                 {\r
2031                                         pShownlist->Add(&m_logEntries[i]);\r
2032                                         continue;\r
2033                                 }\r
2034                         }\r
2035                         if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))\r
2036                         {\r
2037                                 sRev.Format(_T("%s"), m_logEntries[i].m_CommitHash);\r
2038                                 if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
2039                                 {\r
2040                                         pShownlist->Add(&m_logEntries[i]);\r
2041                                         continue;\r
2042                                 }\r
2043                         }\r
2044                 } // else (from if (bRegex))    \r
2045         } // for (DWORD i=0; i<m_logEntries.size(); ++i) \r
2046 \r
2047 }\r
2048 \r
2049 BOOL CGitLogListBase::IsEntryInDateRange(int i)\r
2050 {\r
2051         __time64_t time = m_logEntries[i].m_AuthorDate.GetTime();\r
2052         if ((time >= m_From.GetTime())&&(time <= m_To.GetTime()))\r
2053                 return TRUE;\r
2054 \r
2055         return FALSE;\r
2056 \r
2057 //      return TRUE;\r
2058 }\r
2059 void CGitLogListBase::StartFilter()\r
2060 {\r
2061         InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
2062         RecalculateShownList(&m_arShownList);\r
2063         InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
2064 \r
2065 \r
2066         DeleteAllItems();\r
2067         SetItemCountEx(ShownCountWithStopped());\r
2068         RedrawItems(0, ShownCountWithStopped());\r
2069         SetRedraw(false);\r
2070         //ResizeAllListCtrlCols();\r
2071         SetRedraw(true);\r
2072         Invalidate();\r
2073 \r
2074 }\r
2075 void CGitLogListBase::RemoveFilter()\r
2076 {\r
2077 \r
2078         InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
2079 \r
2080         m_arShownList.RemoveAll();\r
2081 \r
2082         // reset the time filter too\r
2083 #if 0\r
2084         m_timFrom = (__time64_t(m_tFrom));\r
2085         m_timTo = (__time64_t(m_tTo));\r
2086         m_DateFrom.SetTime(&m_timFrom);\r
2087         m_DateTo.SetTime(&m_timTo);\r
2088         m_DateFrom.SetRange(&m_timFrom, &m_timTo);\r
2089         m_DateTo.SetRange(&m_timFrom, &m_timTo);\r
2090 #endif\r
2091 \r
2092         for (DWORD i=0; i<m_logEntries.size(); ++i)\r
2093         {\r
2094                 if(this->m_IsOldFirst)\r
2095                 {\r
2096                         m_arShownList.Add(&m_logEntries[m_logEntries.size()-i-1]);\r
2097                 }else\r
2098                 {\r
2099                         m_arShownList.Add(&m_logEntries[i]);\r
2100                 }\r
2101         }\r
2102 //      InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
2103         DeleteAllItems();\r
2104         SetItemCountEx(ShownCountWithStopped());\r
2105         RedrawItems(0, ShownCountWithStopped());\r
2106 //      SetRedraw(false);\r
2107 //      ResizeAllListCtrlCols();\r
2108 //      SetRedraw(true);\r
2109 \r
2110         InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
2111 }\r
2112 \r
2113 void CGitLogListBase::Clear()\r
2114 {\r
2115         m_arShownList.RemoveAll();\r
2116         m_logEntries.clear();\r
2117         m_logEntries.m_HashMap.clear();\r
2118         DeleteAllItems();\r
2119         m_logEntries.m_Lns.clear();\r
2120 \r
2121         m_logEntries.m_FirstFreeLane=0;\r
2122         m_logEntries.m_Lns.clear();\r
2123 \r
2124 }\r
2125 \r
2126 void CGitLogListBase::OnDestroy()\r
2127 {\r
2128         // save the column widths to the registry\r
2129         SaveColumnWidths();\r
2130 \r
2131         if(this->m_bThreadRunning)\r
2132         {\r
2133                 this->m_bExitThread=true;\r
2134                 DWORD ret =::WaitForSingleObject(m_LoadingThread->m_hThread,20000);\r
2135                 if(ret == WAIT_TIMEOUT)\r
2136                         TerminateThread();\r
2137         }\r
2138         while(m_LogCache.SaveCache())\r
2139         {\r
2140                 if(CMessageBox::Show(NULL,_T("Cannot Save Log Cache to Disk. To retry click yes. To give up click no."),_T("TortoiseGit"),\r
2141                                                         MB_YESNO) == IDNO)\r
2142                                                         break;\r
2143         }\r
2144         CHintListCtrl::OnDestroy();\r
2145 }\r
2146 \r
2147 LRESULT CGitLogListBase::OnLoad(WPARAM wParam,LPARAM lParam)\r
2148 {\r
2149         CRect rect;\r
2150         int i=(int)wParam;\r
2151         this->GetItemRect(i,&rect,LVIR_BOUNDS);\r
2152         this->InvalidateRect(rect);\r
2153         return 0;\r
2154 }\r
2155 \r
2156 /**\r
2157  * Save column widths to the registry\r
2158  */\r
2159 void CGitLogListBase::SaveColumnWidths()\r
2160 {\r
2161         CHeaderCtrl* pHdrCtrl = (CHeaderCtrl*)(GetDlgItem(0));\r
2162         if (pHdrCtrl)\r
2163         {\r
2164                 int numcols = pHdrCtrl->GetItemCount();\r
2165                 for (int col = 0; col < numcols; col++)\r
2166                 {\r
2167                         int width = GetColumnWidth( col );\r
2168                         CString regentry;\r
2169                         regentry.Format( _T("Software\\TortoiseGit\\log\\ColWidth%d"), col);\r
2170                         CRegDWORD regwidth(regentry, 0);\r
2171                         regwidth = width;       // this writes it to reg\r
2172                 }\r
2173         }\r
2174 }\r
2175 \r
2176 int CGitLogListBase::GetHeadIndex()\r
2177 {\r
2178         if(m_HeadHash.IsEmpty())\r
2179                 return -1;\r
2180 \r
2181         for(int i=0;i<m_arShownList.GetCount();i++)\r
2182         {\r
2183                 GitRev *pRev = (GitRev*)m_arShownList[i];\r
2184                 if(pRev)\r
2185                 {\r
2186                         if(pRev->m_CommitHash == m_HeadHash )\r
2187                                 return i;\r
2188                 }\r
2189         }\r
2190         return -1;\r
2191 }