X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FGit%2FGitRev.h;h=78bc0161869f5ed0c6eb9b2ff0746708f7b22090;hp=84ca319f19ed7eb97f5e391245bce5f3dcd3cd68;hb=cd4ba8d7c61fc50368083505acdc9b2cd9f8ebe1;hpb=45f2d6f8c44c2d585ebd3474e96cd3e4a8cee594;ds=sidebyside diff --git a/src/Git/GitRev.h b/src/Git/GitRev.h index 84ca319..78bc016 100644 --- a/src/Git/GitRev.h +++ b/src/Git/GitRev.h @@ -1,4 +1,5 @@ #pragma once +#include "gittype.h" #include "GitStatus.h" #include "AtlTime.h" @@ -36,7 +37,7 @@ public: REV_UNSPECIFIED = -4, ///< unspecified revision }; - int CopyFrom(GitRev &rev); + int CopyFrom(GitRev &rev,bool OmitParentAndMark=false); static CString GetHead(){return CString(_T("HEAD"));}; static CString GetWorkingCopy(){return CString(GIT_REV_ZERO);}; @@ -58,7 +59,7 @@ public: BOOL IsBoundary(){return m_Mark == _T('-');} void Clear(); - int ParserFromLog(CString &log); + int ParserFromLog(BYTE_VECTOR &log,int start=0); CTime ConverFromString(CString input); inline int ParentsCount(){return m_ParentHash.size();} @@ -69,4 +70,7 @@ public: volatile LONG m_IsUpdateing; int SafeFetchFullInfo(CGit *git); + +private: + TIME_ZONE_INFORMATION m_TimeZone; };