Add external diff merge and udiff Setting at setting Page

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

diff --git a/src/Git/Git.h b/src/Git/Git.h
index f453a40..232ac02 100644 (file)
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -47,6 +47,11 @@ public:
        CString GetUserName(void);\r
        CString GetUserEmail(void);\r
        CString GetCurrentBranch(void);\r
+       // read current branch name from HEAD file, returns 0 on success, -1 on failure, 1 detached (branch name "HEAD" returned)\r
+       int GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut);\r
+       BOOL CheckCleanWorkTree();\r
+       int Revert(CTGitPath &path,bool keep=true);\r
+       int Revert(CTGitPathList &list,bool keep=true);\r
 \r
        bool SetCurrentDir(CString path)\r
        {\r
@@ -89,7 +94,7 @@ public:
        int GetLog(BYTE_VECTOR& logOut,CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME,\r
                                                                CString *from=NULL,CString *to=NULL);\r
 \r
-       BOOL EnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData);\r
+       BOOL EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData);\r
 \r
        git_revnum_t GetHash(CString &friendname);\r
 \r
@@ -98,7 +103,7 @@ public:
        static void StringAppend(CString *str,BYTE *p,int code=CP_UTF8,int length=-1);\r
 \r
        BOOL IsInitRepos();\r
-       static BOOL IsVista();\r
+       int ListConflictFile(CTGitPathList &list,CTGitPath *path=NULL);\r
        \r
 };\r
 extern void GetTempPath(CString &path);\r
@@ -107,4 +112,4 @@ extern CString GetTempFile();
 \r
 extern CGit g_Git;\r
 \r
-inline static BOOL wgEnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData) { return g_Git.EnumFiles(pszProjectPath, pszSubPath, nFlags, pEnumCb, pUserData); }\r
+inline static BOOL wgEnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData) { return g_Git.EnumFiles(pszProjectPath, pszSubPath, nFlags, pEnumCb, pUserData); }\r