merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitLogListBase.h

diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index 5b7051f..2aad727 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -156,7 +156,7 @@ public:
        void CopySelectionToClipBoard(bool hashonly=FALSE);\r
        void DiffSelectedRevWithPrevious();\r
        bool IsSelectionContinuous();\r
-       int  FillGitShortLog();\r
+       int  BeginFetchLog();\r
        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);\r
 \r
        inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); }\r
@@ -243,6 +243,8 @@ protected:
 \r
        int GetHeadIndex();\r
 \r
+       CComCriticalSection                     m_critSec;\r
+\r
        bool                            m_bFilterWithRegex;\r
 \r
        \r
@@ -266,7 +268,7 @@ protected:
        CColors                         m_Colors;\r
 \r
        CString                         m_CurrentBranch;\r
-       CString                         m_HeadHash;\r
+       CGitHash                        m_HeadHash;\r
 \r
        CString                         m_StartRef; //Ref of the top-commit\r
        \r
@@ -275,6 +277,7 @@ protected:
        COLORREF                        m_LineColors[Lanes::COLORS_NUM];\r
        DWORD                           m_DateFormat;   // DATE_SHORTDATE or DATE_LONGDATE\r
        bool                            m_bRelativeTimes;       // Show relative times\r
+       GIT_LOG                         m_DllGitLog;\r
 };\r
 \r
 \r