merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / Git / GitRev.h

diff --git a/src/Git/GitRev.h b/src/Git/GitRev.h
index 78bc016..cc93f96 100644 (file)
--- a/src/Git/GitRev.h
+++ b/src/Git/GitRev.h
@@ -2,8 +2,10 @@
 #include "gittype.h"\r
 #include "GitStatus.h"\r
 #include "AtlTime.h"\r
+#include "GitHash.h"\r
+#include "GitDll.h"\r
 \r
-typedef std::vector<git_revnum_t> GIT_REV_LIST;\r
+typedef std::vector<CGitHash> GIT_REV_LIST;\r
 \r
 #define LOG_REV_AUTHOR_NAME    _T('0')\r
 #define LOG_REV_AUTHOR_EMAIL   _T('1')\r
@@ -50,12 +52,14 @@ public:
        CTime m_CommitterDate;\r
        CString m_Subject;\r
        CString m_Body;\r
-       git_revnum_t m_CommitHash;\r
+       CGitHash m_CommitHash;\r
        GIT_REV_LIST m_ParentHash;\r
        CTGitPathList m_Files;\r
        int     m_Action;\r
        TCHAR m_Mark;\r
-       \r
+       CString m_Ref;\r
+       CString m_RefAction;\r
+\r
        BOOL IsBoundary(){return m_Mark == _T('-');}\r
 \r
        void Clear();\r
@@ -71,6 +75,14 @@ public:
        \r
        int SafeFetchFullInfo(CGit *git);\r
 \r
+       int ParserFromCommit(GIT_COMMIT *commit);\r
+       int ParserParentFromCommit(GIT_COMMIT *commit);\r
+\r
+       int GetCommitFromHash(CGitHash &hash);\r
+       int GetCommit(CString &Rev);\r
+\r
+public:\r
+       void DbgPrint();\r
 private:\r
        TIME_ZONE_INFORMATION m_TimeZone;\r
 };\r