Git Blame Can Show Log

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

diff --git a/src/Git/Git.h b/src/Git/Git.h
index d5eeae8..1070a36 100644 (file)
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -19,7 +19,9 @@ class CGit
 private:\r
        GitAdminDir m_GitDir;\r
 public:\r
-       static CString m_MsysGitPath;\r
+       static BOOL CheckMsysGitDir();\r
+\r
+//     static CString m_MsysGitPath;\r
        CGit(void);\r
        ~CGit(void);\r
        int Run(CString cmd, CString* output);\r
@@ -42,13 +44,20 @@ public:
                BRANCH_ALL=BRANCH_LOCAL|BRANCH_REMOTE,\r
        }BRANCH_TYPE;\r
 \r
+       typedef enum\r
+       {\r
+               LOG_INFO_STAT=0x1,\r
+               LOG_INFO_FILESTATE=0x2,\r
+               LOG_INFO_PATCH=0x4,\r
+       }LOG_INFO_MASK;\r
+\r
        int GetRemoteList(STRING_VECTOR &list);\r
        int GetBranchList(STRING_VECTOR &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);\r
        int GetTagList(STRING_VECTOR &list);\r
        int GetMapHashToFriendName(MAP_HASH_NAME &map);\r
        \r
        //hash is empty means all. -1 means all\r
-       int GetLog(CString& logOut,CString &hash, int count=-1);\r
+       int GetLog(CString& logOut,CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE);\r
 \r
        git_revnum_t GetHash(CString &friendname);\r
 \r