TGitPath Add Rename handle

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

diff --git a/src/Git/TGitPath.h b/src/Git/TGitPath.h
index 1cdfa13..5b99a67 100644 (file)
--- a/src/Git/TGitPath.h
+++ b/src/Git/TGitPath.h
@@ -15,6 +15,7 @@ public:
                LOGACTIONS_DELETED      = 0x00000008,\r
                LOGACTIONS_UNVER        = 0x80000000,\r
                LOGACTIONS_IGNORE       = 0x40000000,\r
+               LOGACTIONS_CONFLICT = 0x20000000,\r
        };\r
 \r
        CString m_StatAdd;\r
@@ -28,7 +29,8 @@ public:
         */\r
        void SetFromGit(const char* pPath);\r
        void SetFromGit(const char* pPath, bool bIsDirectory);\r
-       void SetFromGit(const CString& sPath);\r
+       void SetFromGit(const CString& sPath,CString *OldPath=NULL);\r
+       \r
        /**\r
         * Set the path as UNICODE with backslashes\r
         */\r
@@ -51,6 +53,8 @@ public:
         * Returns the path with forward slashes.\r
         */\r
        const CString& GetGitPathString() const;\r
+\r
+       const CString& GetGitOldPathString() const;\r
        /**\r
         * Returns the path completely prepared to be fed the the Git APIs\r
         * It will be in UTF8, with URLs escaped, if necessary\r
@@ -244,6 +248,11 @@ private:
        mutable CString m_sUIPath;\r
        mutable CStringA m_sUTF8FwdslashPath;\r
        mutable CStringA m_sUTF8FwdslashPathEscaped;\r
+\r
+       //used for rename case\r
+       mutable CString m_sOldBackslashPath;\r
+       mutable CString m_sOldFwdslashPath;\r
+       \r
        // Have we yet determined if this is a directory or not?\r
        mutable bool m_bDirectoryKnown;\r
        mutable bool m_bIsDirectory;\r
@@ -292,7 +301,7 @@ public:
        bool WriteToFile(const CString& sFilename, bool bANSI = false) const;\r
        CTGitPath * LookForGitPath(CString path);\r
        int     ParserFromLog(CString &log);\r
-       int FillUnRev(int Action);\r
+       int FillUnRev(int Action,CTGitPathList *list=NULL);\r
        int GetAction();\r
        /**\r
         * Load from the path argument string, when the 'path' parameter is used\r