src/TortoiseProc/GitLogListBase.h

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2014 - TortoiseGit
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 // GitLogList.cpp : implementation file
  20 //
  21 #pragma once
  22
  23 #include "HintListCtrl.h"
  24 #include "Git.h"
  25 #include "ProjectProperties.h"
  26 #include "TGitPath.h"
  27 #include "registry.h"
  28 #include "SplitterControl.h"
  29 #include "Colors.h"
  30 #include "MenuButton.h"
  31 #include "LogDlgHelper.h"
  32 #include "FilterEdit.h"
  33 #include "GitRev.h"
  34 #include "Tooltip.h"
  35 #include "lanes.h"
  36 #include "GitLogCache.h"
  37 #include <regex>
  38 #include "GitStatusListCtrl.h"
  39 #include "FindDlg.h"
  40
  41 // CGitLogList
  42 #define ICONITEMBORDER 5
  43
  44 #define GITLOG_START 0
  45 #define GITLOG_START_ALL 1
  46 #define GITLOG_END   100
  47
  48 #define LOGFILTER_ALL                   0xFFFF
  49 #define LOGFILTER_TOGGLE                0x8000
  50 #define LOGFILTER_MESSAGES              0x0001
  51 #define LOGFILTER_PATHS                 0x0002
  52 #define LOGFILTER_AUTHORS               0x0004
  53 #define LOGFILTER_REVS                  0x0008
  54 #define LOGFILTER_REGEX                 0x0010
  55 #define LOGFILTER_BUGID                 0x0020
  56 #define LOGFILTER_SUBJECT               0x0040
  57 #define LOGFILTER_REFNAME               0x0080
  58 #define LOGFILTER_EMAILS                0x0100
  59
  60 #define LOGLIST_SHOWNOTHING                             0x0000
  61 #define LOGLIST_SHOWLOCALBRANCHES               0x0001
  62 #define LOGLIST_SHOWREMOTEBRANCHES              0x0002
  63 #define LOGLIST_SHOWTAGS                                0x0004
  64 #define LOGLIST_SHOWSTASH                               0x0008
  65 #define LOGLIST_SHOWBISECT                              0x0010
  66 #define LOGLIST_SHOWALLREFS                             0xFFFF
  67
  68 //typedef void CALLBACK_PROCESS(void * data, int progress);
  69 #define MSG_LOADED                              (WM_USER+110)
  70 #define MSG_LOAD_PERCENTAGE             (WM_USER+111)
  71 #define MSG_REFLOG_CHANGED              (WM_USER+112)
  72 #define MSG_FETCHED_DIFF                (WM_USER+113)
  73
  74 class CThreadSafePtrArray: public CPtrArray
  75 {
  76         CComCriticalSection *m_critSec;
  77 public:
  78         CThreadSafePtrArray(CComCriticalSection *section){ m_critSec = section ;}
  79         void * SafeGetAt(INT_PTR i)
  80         {
  81                 if(m_critSec)
  82                         m_critSec->Lock();
  83
  84                 if( i<0 || i>=GetCount())
  85                 {
  86                         if(m_critSec)
  87                                 m_critSec->Unlock();
  88
  89                         return NULL;
  90                 }
  91
  92                 if(m_critSec)
  93                         m_critSec->Unlock();
  94
  95                 return GetAt(i);
  96         }
  97         INT_PTR SafeAdd(void *newElement)
  98         {
  99                 INT_PTR ret;
 100                 if(m_critSec)
 101                         m_critSec->Lock();
 102                 ret = Add(newElement);
 103                 if(m_critSec)
 104                         m_critSec->Unlock();
 105                 return ret;
 106         }
 107
 108         void  SafeRemoveAll()
 109         {
 110                 if(m_critSec)
 111                         m_critSec->Lock();
 112                 RemoveAll();
 113                 if(m_critSec)
 114                         m_critSec->Unlock();
 115         }
 116
 117 };
 118
 119 class CGitLogListBase : public CHintListCtrl
 120 {
 121         DECLARE_DYNAMIC(CGitLogListBase)
 122
 123 public:
 124         CGitLogListBase();
 125         virtual ~CGitLogListBase();
 126         ProjectProperties       m_ProjectProperties;
 127
 128         CFilterData m_Filter;
 129
 130         void UpdateProjectProperties()
 131         {
 132                 m_ProjectProperties.ReadProps();
 133
 134                 if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))
 135                         m_bShowBugtraqColumn = true;
 136                 else
 137                         m_bShowBugtraqColumn = false;
 138         }
 139
 140         void ResetWcRev(bool refresh = false)
 141         {
 142                 m_wcRev.Clear();
 143                 m_wcRev.GetSubject() = CString(MAKEINTRESOURCE(IDS_LOG_WORKINGDIRCHANGES));
 144                 m_wcRev.m_Mark = _T('-');
 145                 m_wcRev.GetBody() = CString(MAKEINTRESOURCE(IDS_LOG_FETCHINGSTATUS));
 146                 m_wcRev.m_CallDiffAsync = DiffAsync;
 147                 InterlockedExchange(&m_wcRev.m_IsDiffFiles, FALSE);
 148                 if (refresh && m_bShowWC)
 149                         m_arShownList[0] = &m_wcRev;
 150         }
 151
 152         volatile LONG           m_bNoDispUpdates;
 153         BOOL m_IsIDReplaceAction;
 154         BOOL m_IsOldFirst;
 155         void hideFromContextMenu(unsigned __int64 hideMask, bool exclusivelyShow);
 156         BOOL m_IsRebaseReplaceGraph;
 157         BOOL m_bNoHightlightHead;
 158
 159         void MeasureItem(LPMEASUREITEMSTRUCT lpMeasureItemStruct);
 160
 161         BOOL m_bStrictStopped;
 162         BOOL m_bShowBugtraqColumn;
 163         BOOL m_bSearchIndex;
 164         BOOL m_bCancelled;
 165         unsigned __int64 m_ContextMenuMask;
 166
 167         bool                            m_hasWC;
 168         bool                            m_bShowWC;
 169         GitRev                          m_wcRev;
 170         volatile LONG           m_bThreadRunning;
 171         CLogCache                       m_LogCache;
 172
 173         CString m_sRange;
 174         // don't forget to bump BLAME_COLUMN_VERSION in GitStatusListCtrlHelpers.cpp if you change columns
 175         enum
 176         {
 177                 LOGLIST_GRAPH,
 178                 LOGLIST_REBASE,
 179                 LOGLIST_ID,
 180                 LOGLIST_HASH,
 181                 LOGLIST_ACTION,
 182                 LOGLIST_MESSAGE,
 183                 LOGLIST_AUTHOR,
 184                 LOGLIST_DATE,
 185                 LOGLIST_EMAIL,
 186                 LOGLIST_COMMIT_NAME,
 187                 LOGLIST_COMMIT_EMAIL,
 188                 LOGLIST_COMMIT_DATE,
 189                 LOGLIST_BUG,
 190                 LOGLIST_MESSAGE_MAX=300,
 191                 LOGLIST_MESSAGE_MIN=200,
 192
 193                 GIT_LOG_GRAPH   =               1<< LOGLIST_GRAPH,
 194                 GIT_LOG_REBASE  =               1<< LOGLIST_REBASE,
 195                 GIT_LOG_ID              =               1<< LOGLIST_ID,
 196                 GIT_LOG_HASH    =               1<< LOGLIST_HASH,
 197                 GIT_LOG_ACTIONS =               1<< LOGLIST_ACTION,
 198                 GIT_LOG_MESSAGE =               1<< LOGLIST_MESSAGE,
 199                 GIT_LOG_AUTHOR  =               1<< LOGLIST_AUTHOR,
 200                 GIT_LOG_DATE    =               1<< LOGLIST_DATE,
 201                 GIT_LOG_EMAIL   =               1<< LOGLIST_EMAIL,
 202                 GIT_LOG_COMMIT_NAME     =       1<< LOGLIST_COMMIT_NAME,
 203                 GIT_LOG_COMMIT_EMAIL=   1<< LOGLIST_COMMIT_EMAIL,
 204                 GIT_LOG_COMMIT_DATE     =       1<< LOGLIST_COMMIT_DATE,
 205                 GIT_LOGLIST_BUG         =       1<< LOGLIST_BUG,
 206         };
 207
 208         enum
 209         {
 210         // needs to start with 1, since 0 is the return value if *nothing* is clicked on in the context menu
 211         ID_COMPARE = 1, // compare revision with WC
 212         ID_SAVEAS,
 213         ID_COMPARETWO, // compare two revisions
 214         ID_COPY,
 215         ID_REVERTREV,
 216         ID_MERGEREV,
 217         ID_GNUDIFF1, // compare with WC, unified
 218         ID_GNUDIFF2, // compare two revisions, unified
 219         ID_FINDENTRY,
 220         ID_OPEN,
 221         ID_BLAME,
 222         ID_REPOBROWSE,
 223         ID_LOG,
 224         ID_EDITNOTE,
 225         ID_DIFF,
 226         ID_OPENWITH,
 227         ID_COPYCLIPBOARD,
 228         ID_COPYHASH,
 229         ID_REVERTTOREV,
 230         ID_BLAMECOMPARE,
 231         ID_BLAMEDIFF,
 232         ID_VIEWREV,
 233         ID_VIEWPATHREV,
 234         ID_EXPORT,
 235         ID_COMPAREWITHPREVIOUS,
 236         ID_BLAMEPREVIOUS,
 237         ID_CHERRY_PICK,
 238         ID_CREATE_BRANCH,
 239         ID_CREATE_TAG,
 240         ID_SWITCHTOREV,
 241         ID_SWITCHBRANCH,
 242         ID_RESET,
 243         ID_REBASE_PICK,
 244         ID_REBASE_EDIT,
 245         ID_REBASE_SQUASH,
 246         ID_REBASE_SKIP,
 247         ID_COMBINE_COMMIT,
 248         ID_STASH_SAVE,
 249         ID_STASH_LIST,
 250         ID_STASH_POP,
 251         ID_REFLOG_STASH_APPLY,
 252         ID_REFLOG_DEL,
 253         ID_REBASE_TO_VERSION,
 254         ID_CREATE_PATCH,
 255         ID_DELETE,
 256         ID_COMMIT,
 257         ID_PUSH,
 258         ID_PULL,
 259         ID_FETCH,
 260         ID_SHOWBRANCHES,
 261         ID_COPYCLIPBOARDMESSAGES,
 262         ID_BISECTSTART,
 263         ID_LOG_VIEWRANGE,
 264         ID_LOG_VIEWRANGE_REACHABLEFROMONLYONE,
 265         ID_MERGE_ABORT,
 266         };
 267         enum
 268         {
 269         ID_COPY_ALL,
 270         ID_COPY_MESSAGE,
 271         ID_COPY_SUBJECT,
 272         ID_COPY_HASH,
 273         };
 274         enum FilterShow
 275         {
 276                 FILTERSHOW_REFS = 1,
 277                 FILTERSHOW_MERGEPOINTS = 2,
 278                 FILTERSHOW_ANYCOMMIT = 4,
 279                 FILTERSHOW_ALL = FILTERSHOW_ANYCOMMIT | FILTERSHOW_REFS | FILTERSHOW_MERGEPOINTS
 280         };
 281         enum : unsigned int
 282         {
 283                 // For Rebase only
 284                 LOGACTIONS_REBASE_CURRENT       = 0x08000000,
 285                 LOGACTIONS_REBASE_PICK          = 0x04000000,
 286                 LOGACTIONS_REBASE_SQUASH        = 0x02000000,
 287                 LOGACTIONS_REBASE_EDIT          = 0x01000000,
 288                 LOGACTIONS_REBASE_DONE          = 0x00800000,
 289                 LOGACTIONS_REBASE_SKIP          = 0x00400000,
 290                 LOGACTIONS_REBASE_MASK          = 0x0FC00000,
 291                 LOGACTIONS_REBASE_MODE_MASK     = 0x07C00000,
 292         };
 293         inline unsigned __int64 GetContextMenuBit(int i){ return ((unsigned __int64 )0x1)<<i ;}
 294         static CString GetRebaseActionName(int action);
 295         void InsertGitColumn();
 296         void ResizeAllListCtrlCols();
 297         void CopySelectionToClipBoard(int toCopy = ID_COPY_ALL);
 298         void DiffSelectedRevWithPrevious();
 299         bool IsSelectionContinuous();
 300         int  BeginFetchLog();
 301         int  FillGitLog(CTGitPath *path, CString *range = NULL, int infomask = CGit::LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE);
 302         int  FillGitLog(std::set<CGitHash>& hashes);
 303         BOOL IsMatchFilter(bool bRegex, GitRev *pRev, std::tr1::wregex &pat);
 304         bool ShouldShowFilter(GitRev *pRev, const std::map<CGitHash, std::set<CGitHash>> &commitChildren);
 305         void ShowGraphColumn(bool bShow);
 306         CString GetTagInfo(GitRev* pLogEntry);
 307
 308         CFindDlg *m_pFindDialog;
 309         static const UINT       m_FindDialogMessage;
 310         void OnFind();
 311
 312         static const UINT       m_ScrollToMessage;
 313         static const UINT       m_RebaseActionMessage;
 314
 315         inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); }
 316         int FetchLogAsync(void * data=NULL);
 317         CThreadSafePtrArray                     m_arShownList;
 318         void Refresh(BOOL IsCleanFilter=TRUE);
 319         void RecalculateShownList(CThreadSafePtrArray * pShownlist);
 320         void Clear();
 321
 322         DWORD                           m_SelectedFilters;
 323         FilterShow                      m_ShowFilter;
 324         bool                            m_bFilterWithRegex;
 325         CLogDataVector          m_logEntries;
 326         void RemoveFilter();
 327         void StartFilter();
 328         bool ValidateRegexp(LPCTSTR regexp_str, std::tr1::wregex& pat, bool bMatchCase = false );
 329         CString                         m_sFilterText;
 330
 331         __time64_t                      m_From;
 332         __time64_t                      m_To;
 333
 334         CTGitPath                       m_Path;
 335         int                                     m_ShowMask;
 336         CGitHash                        m_lastSelectedHash;
 337         int                                     m_ShowRefMask;
 338
 339         void                            GetTimeRange(CTime &oldest,CTime &latest);
 340         virtual void GetParentHashes(GitRev *pRev, GIT_REV_LIST &parentHash);
 341         virtual void ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMenu * menu)=0;
 342         void ReloadHashMap()
 343         {
 344                 m_HashMap.clear();
 345
 346                 if (g_Git.GetMapHashToFriendName(m_HashMap))
 347                         MessageBox(g_Git.GetGitLastErr(_T("Could not get all refs.")), _T("TortoiseGit"), MB_ICONERROR);
 348
 349                 m_CurrentBranch=g_Git.GetCurrentBranch();
 350
 351                 if (g_Git.GetHash(m_HeadHash, _T("HEAD")))
 352                 {
 353                         MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash. Quitting...")), _T("TortoiseGit"), MB_ICONERROR);
 354                         ExitProcess(1);
 355                 }
 356
 357                 m_wcRev.m_ParentHash.clear();
 358                 m_wcRev.m_ParentHash.push_back(m_HeadHash);
 359
 360                 FetchRemoteList();
 361                 FetchTrackingBranchList();
 362         }
 363         void SafeTerminateThread()
 364         {
 365                 if (m_LoadingThread!=NULL && InterlockedExchange(&m_bExitThread, TRUE) == FALSE)
 366                 {
 367                         DWORD ret = WAIT_TIMEOUT;
 368                         for (int i = 0; i < 200 && m_bThreadRunning; ++i)
 369                                 ret =::WaitForSingleObject(m_LoadingThread->m_hThread, 100);
 370                         if (ret == WAIT_TIMEOUT && m_bThreadRunning)
 371                                 ::TerminateThread(m_LoadingThread, 0);
 372                         m_LoadingThread = NULL;
 373                 }
 374         };
 375
 376         bool IsInWorkingThread()
 377         {
 378                 return (AfxGetThread() == m_LoadingThread);
 379         }
 380
 381         void SetRange(const CString& range)
 382         {
 383                 m_sRange = range;
 384         }
 385
 386         CString GetRange() const { return m_sRange; }
 387
 388         bool HasFilterText() const { return !m_sFilterText.IsEmpty() && m_sFilterText != _T("!"); }
 389
 390         int                                     m_nSearchIndex;
 391
 392         volatile LONG           m_bExitThread;
 393         CWinThread*                     m_LoadingThread;
 394         MAP_HASH_NAME           m_HashMap;
 395         std::map<CString, std::pair<CString, CString>>  m_TrackingMap;
 396
 397 public:
 398         CString                         m_ColumnRegKey;
 399         CComCriticalSection     m_critSec_AsyncDiff;
 400
 401 protected:
 402         typedef struct {
 403                 CString name;
 404                 COLORREF color;
 405                 CString simplifiedName;
 406                 bool singleRemote;
 407                 bool hasTracking;
 408                 bool sameName;
 409                 bool annotatedTag;
 410         } REFLABEL;
 411
 412         DECLARE_MESSAGE_MAP()
 413         afx_msg void OnDestroy();
 414         virtual afx_msg void OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 415         virtual afx_msg void OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 416         afx_msg LRESULT OnFindDialogMessage(WPARAM wParam, LPARAM lParam);
 417         afx_msg LRESULT OnScrollToMessage(WPARAM wParam, LPARAM lParam);
 418         afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 419         afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
 420         afx_msg LRESULT OnLoad(WPARAM wParam, LPARAM lParam);
 421         afx_msg void OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult);
 422         afx_msg void OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult);
 423         afx_msg void OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult);
 424         afx_msg void OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult);
 425         void OnNMDblclkLoglist(NMHDR * /*pNMHDR*/, LRESULT *pResult);
 426         afx_msg void OnLvnOdfinditemLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 427         void PreSubclassWindow();
 428         virtual BOOL PreTranslateMessage(MSG* pMsg);
 429         static UINT LogThreadEntry(LPVOID pVoid);
 430         UINT LogThread();
 431         bool IsOnStash(int index);
 432         bool IsStash(const GitRev * pSelLogEntry);
 433         void FetchRemoteList();
 434         void FetchTrackingBranchList();
 435         void FetchLastLogInfo();
 436         void FetchFullLogInfo(CString &from, CString &to);
 437         void FillBackGround(HDC hdc, DWORD_PTR Index, CRect &rect);
 438         void DrawTagBranchMessage(HDC hdc, CRect &rect, INT_PTR index, std::vector<REFLABEL> &refList);
 439         void DrawTagBranch(HDC hdc, CDC &W_Dc, HTHEME hTheme, CRect &rect, CRect &rt, LVITEM &rItem, GitRev* data, std::vector<REFLABEL> &refList);
 440         void DrawGraph(HDC,CRect &rect,INT_PTR index);
 441
 442         void paintGraphLane(HDC hdc,int laneHeight, int type, int x1, int x2,
 443                                                                           const COLORREF& col,const COLORREF& activeColor, int top) ;
 444         void DrawLine(HDC hdc, int x1, int y1, int x2, int y2){::MoveToEx(hdc,x1,y1,NULL);::LineTo(hdc,x2,y2);}
 445         /**
 446         * Save column widths to the registry
 447         */
 448         void SaveColumnWidths();        // save col widths to the registry
 449
 450         BOOL IsEntryInDateRange(int i);
 451
 452         int GetHeadIndex();
 453
 454         std::vector<GitRev*> m_AsynDiffList;
 455         CComCriticalSection m_AsynDiffListLock;
 456         HANDLE  m_AsyncDiffEvent;
 457         volatile LONG m_AsyncThreadExit;
 458         CWinThread*                     m_DiffingThread;
 459
 460         static int DiffAsync(GitRev *rev, void *data)
 461         {
 462                 ULONGLONG offset=((CGitLogListBase*)data)->m_LogCache.GetOffset(rev->m_CommitHash);
 463                 if(!offset)
 464                 {
 465                         ((CGitLogListBase*)data)->m_AsynDiffListLock.Lock();
 466                         ((CGitLogListBase*)data)->m_AsynDiffList.push_back(rev);
 467                         ((CGitLogListBase*)data)->m_AsynDiffListLock.Unlock();
 468                         ::SetEvent(((CGitLogListBase*)data)->m_AsyncDiffEvent);
 469                 }
 470                 else
 471                 {
 472                         if(((CGitLogListBase*)data)->m_LogCache.LoadOneItem(*rev,offset))
 473                         {
 474                                 ((CGitLogListBase*)data)->m_AsynDiffListLock.Lock();
 475                                 ((CGitLogListBase*)data)->m_AsynDiffList.push_back(rev);
 476                                 ((CGitLogListBase*)data)->m_AsynDiffListLock.Unlock();
 477                                 ::SetEvent(((CGitLogListBase*)data)->m_AsyncDiffEvent);
 478                         }
 479                         InterlockedExchange(&rev->m_IsDiffFiles, TRUE);
 480                         if(rev->m_IsDiffFiles && rev->m_IsCommitParsed)
 481                                 InterlockedExchange(&rev->m_IsFull, TRUE);
 482                 }
 483                 return 0;
 484         }
 485
 486         static UINT AsyncThread(LPVOID data)
 487         {
 488                 return ((CGitLogListBase*)data)->AsyncDiffThread();
 489         }
 490
 491         int AsyncDiffThread();
 492         bool m_AsyncThreadExited;
 493
 494         int SafeGetAction(GitRev *rev, int **ptr = nullptr)
 495         {
 496                 try
 497                 {
 498                         int *p = &rev->GetAction(this);
 499                         if (ptr)
 500                                 *ptr = p;
 501                         return *p;
 502                 }
 503                 catch (const char* msg)
 504                 {
 505                         MessageBox(_T("Could not get action of commit ") + rev->m_CommitHash.ToString() + _T(".\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_ICONERROR);
 506                         return 0;
 507                 }
 508         }
 509
 510 public:
 511         void SafeTerminateAsyncDiffThread()
 512         {
 513                 if(m_DiffingThread!=NULL && m_AsyncThreadExit != TRUE)
 514                 {
 515                         m_AsyncThreadExit = TRUE;
 516                         ::SetEvent(m_AsyncDiffEvent);
 517                         DWORD ret = WAIT_TIMEOUT;
 518                         // do not block here, but process messages and ask until the thread ends
 519                         while (ret == WAIT_TIMEOUT && !m_AsyncThreadExited)
 520                         {
 521                                 MSG msg;
 522                                 if (::PeekMessage(&msg, NULL, 0,0, PM_NOREMOVE))
 523                                         AfxGetThread()->PumpMessage(); // process messages, so that GetTopIndex and so on in the thread work
 524                                 ret = ::WaitForSingleObject(m_DiffingThread->m_hThread, 100);
 525                         }
 526                         m_DiffingThread = NULL;
 527                 }
 528         };
 529
 530 protected:
 531         CComCriticalSection     m_critSec;
 532
 533         HICON                           m_hModifiedIcon;
 534         HICON                           m_hReplacedIcon;
 535         HICON                           m_hAddedIcon;
 536         HICON                           m_hDeletedIcon;
 537         HICON                           m_hFetchIcon;
 538
 539         HFONT                           m_boldFont;
 540
 541         CRegDWORD                       m_regMaxBugIDColWidth;
 542
 543         void                            *m_ProcData;
 544         CStoreSelection*        m_pStoreSelection;
 545
 546         CColors                         m_Colors;
 547
 548         CString                         m_CurrentBranch;
 549         CGitHash                        m_HeadHash;
 550
 551         COLORREF                        m_LineColors[Lanes::COLORS_NUM];
 552         DWORD                           m_LineWidth;
 553         DWORD                           m_NodeSize;
 554         DWORD                           m_DateFormat;   // DATE_SHORTDATE or DATE_LONGDATE
 555         bool                            m_bRelativeTimes;       // Show relative times
 556         GIT_LOG                         m_DllGitLog;
 557         CString                         m_SingleRemote;
 558         bool                            m_bTagsBranchesOnRightSide;
 559         bool                            m_bSymbolizeRefNames;
 560         bool                            m_bIncludeBoundaryCommits;
 561
 562         ColumnManager           m_ColumnManager;
 563         DWORD                           m_dwDefaultColumns;
 564 };
 565
 566