X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FGitLogListBase.h;h=76564fb3bb66aa7a187108619d64cbfd51a3d651;hp=94be5ba1132b20a86835a5c15387b497f679a719;hb=8feb7c6a89a613054e5f42da7a0d99d022747c90;hpb=9ef9157a827416ff749f5d45371b74ae83a6329e

diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index 94be5ba..76564fb 100644
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -70,6 +70,8 @@ public:
 	BOOL m_IsOldFirst;
 	BOOL m_IsRebaseReplaceGraph;
 
+	void MeasureItem(LPMEASUREITEMSTRUCT lpMeasureItemStruct);
+	void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct);
 
 	BOOL m_bStrictStopped;
 	BOOL m_bShowBugtraqColumn;
@@ -78,6 +80,7 @@ public:
 	unsigned __int64 m_ContextMenuMask;
 
 	bool				m_hasWC;
+	bool				m_bShowWC;
 	GitRev				m_wcRev;
 	volatile LONG 		m_bThreadRunning;
 	CLogCache			m_LogCache;
@@ -143,6 +146,9 @@ public:
 	ID_STASH_APPLY,
 	ID_REFLOG_DEL,
 	ID_REBASE_TO_VERSION,
+	ID_CREATE_PATCH,
+	ID_DELETE,
+	ID_COMMIT,
 	};
 	inline unsigned __int64 GetContextMenuBit(int i){ return ((unsigned __int64 )0x1)<<i ;}
 	void InsertGitColumn();
@@ -150,8 +156,8 @@ public:
 	void CopySelectionToClipBoard(bool hashonly=FALSE);
 	void DiffSelectedRevWithPrevious();
 	bool IsSelectionContinuous();
-	int  FillGitShortLog();
-	int  FillGitLog(CTGitPath *path,int infomask=CGit::	LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE,CString *from=NULL,CString *to=NULL);
+	int  BeginFetchLog();
+	int  FillGitLog(CTGitPath *path,int infomask=CGit::	LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,CString *from=NULL,CString *to=NULL);
 
 	inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); }
 	int FetchLogAsync(void * data=NULL);
@@ -180,6 +186,8 @@ public:
 		g_Git.GetMapHashToFriendName(m_HashMap);
 		m_CurrentBranch=g_Git.GetCurrentBranch();
 		this->m_HeadHash=g_Git.GetHash(CString(_T("HEAD"))).Left(40);
+		m_wcRev.m_ParentHash.clear();
+		m_wcRev.m_ParentHash.push_back(m_HeadHash);
 	}
 	void TerminateThread()
 	{
@@ -191,6 +199,14 @@ public:
 	{
 		return (AfxGetThread() == m_LoadingThread);
 	}
+
+	void SetStartRef(const CString& StartRef)
+	{
+		m_StartRef=StartRef;
+	}
+
+	CString GetStartRef() const {return m_StartRef;}
+
 	
 	volatile bool		m_bExitThread;
 	CWinThread*			m_LoadingThread;
@@ -216,7 +232,7 @@ protected:
 
 	BOOL GetShortName(CString ref, CString &shortname,CString prefix);
 	void paintGraphLane(HDC hdc,int laneHeight, int type, int x1, int x2,
-                                      const COLORREF& col,int top) ; 
+                                      const COLORREF& col,const COLORREF& activeColor, int top) ; 
 	void DrawLine(HDC hdc, int x1, int y1, int x2, int y2){::MoveToEx(hdc,x1,y1,NULL);::LineTo(hdc,x2,y2);}
 	/**
 	* Save column widths to the registry
@@ -227,6 +243,8 @@ protected:
 
 	int GetHeadIndex();
 
+	CComCriticalSection			m_critSec;
+
 	bool				m_bFilterWithRegex;
 
 	
@@ -251,12 +269,15 @@ protected:
 
 	CString				m_CurrentBranch;
 	CString				m_HeadHash;
+
+	CString				m_StartRef; //Ref of the top-commit
 	
 	CString				m_ColumnRegKey;
 
 	COLORREF			m_LineColors[Lanes::COLORS_NUM];
 	DWORD				m_DateFormat;	// DATE_SHORTDATE or DATE_LONGDATE
 	bool				m_bRelativeTimes;	// Show relative times
+	GIT_LOG				m_DllGitLog;
 };