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

diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index 9de0785..76564fb 100644
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -80,6 +80,7 @@ public:
 	unsigned __int64 m_ContextMenuMask;
 
 	bool				m_hasWC;
+	bool				m_bShowWC;
 	GitRev				m_wcRev;
 	volatile LONG 		m_bThreadRunning;
 	CLogCache			m_LogCache;
@@ -147,6 +148,7 @@ public:
 	ID_REBASE_TO_VERSION,
 	ID_CREATE_PATCH,
 	ID_DELETE,
+	ID_COMMIT,
 	};
 	inline unsigned __int64 GetContextMenuBit(int i){ return ((unsigned __int64 )0x1)<<i ;}
 	void InsertGitColumn();
@@ -154,7 +156,7 @@ public:
 	void CopySelectionToClipBoard(bool hashonly=FALSE);
 	void DiffSelectedRevWithPrevious();
 	bool IsSelectionContinuous();
-	int  FillGitShortLog();
+	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); }
@@ -184,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()
 	{
@@ -201,6 +205,8 @@ public:
 		m_StartRef=StartRef;
 	}
 
+	CString GetStartRef() const {return m_StartRef;}
+
 	
 	volatile bool		m_bExitThread;
 	CWinThread*			m_LoadingThread;
@@ -237,6 +243,8 @@ protected:
 
 	int GetHeadIndex();
 
+	CComCriticalSection			m_critSec;
+
 	bool				m_bFilterWithRegex;
 
 	
@@ -269,6 +277,7 @@ protected:
 	COLORREF			m_LineColors[Lanes::COLORS_NUM];
 	DWORD				m_DateFormat;	// DATE_SHORTDATE or DATE_LONGDATE
 	bool				m_bRelativeTimes;	// Show relative times
+	GIT_LOG				m_DllGitLog;
 };