Add conflict handle

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

diff --git a/src/Git/TGitPath.h b/src/Git/TGitPath.h
index 66d55cb..d6b8964 100644 (file)
--- a/src/Git/TGitPath.h
+++ b/src/Git/TGitPath.h
@@ -6,7 +6,8 @@ class CTGitPath
 public:\r
        CTGitPath(void);\r
        ~CTGitPath(void);\r
 public:\r
        CTGitPath(void);\r
        ~CTGitPath(void);\r

- CTGitPath(const CString& sUnknownPath);\r
+       CTGitPath(const CString& sUnknownPath);\r
+       int m_Stage;\r

 public:\r
        enum\r
        {       \r
 public:\r
        enum\r
        {       \r


@@ -15,9 +16,10 @@ public:
                LOGACTIONS_REPLACED     = 0x00000004,\r
                LOGACTIONS_DELETED      = 0x00000008,\r
                LOGACTIONS_UNMERGED = 0x00000010,\r
                LOGACTIONS_REPLACED     = 0x00000004,\r
                LOGACTIONS_DELETED      = 0x00000008,\r
                LOGACTIONS_UNMERGED = 0x00000010,\r

+               LOGACTIONS_CACHE        = 0x00000020,\r

                LOGACTIONS_UNVER        = 0x80000000,\r
                LOGACTIONS_IGNORE       = 0x40000000,\r
                LOGACTIONS_UNVER        = 0x80000000,\r
                LOGACTIONS_IGNORE       = 0x40000000,\r

-               LOGACTIONS_CONFLICT = 0x20000000,\r
+               //LOGACTIONS_CONFLICT = 0x20000000,\r

        };\r
 \r
        CString m_StatAdd;\r
        };\r
 \r
        CString m_StatAdd;\r


@@ -297,12 +299,14 @@ public:
        // A constructor which allows a path list to be easily built with one initial entry in\r
        explicit CTGitPathList(const CTGitPath& firstEntry);\r
        int m_Action;\r
        // A constructor which allows a path list to be easily built with one initial entry in\r
        explicit CTGitPathList(const CTGitPath& firstEntry);\r
        int m_Action;\r

+\r

 public:\r
        void AddPath(const CTGitPath& newPath);\r
        bool LoadFromFile(const CTGitPath& filename);\r
        bool WriteToFile(const CString& sFilename, bool bANSI = false) const;\r
        CTGitPath * LookForGitPath(CString path);\r
        int     ParserFromLog(BYTE_VECTOR &log);\r
 public:\r
        void AddPath(const CTGitPath& newPath);\r
        bool LoadFromFile(const CTGitPath& filename);\r
        bool WriteToFile(const CString& sFilename, bool bANSI = false) const;\r
        CTGitPath * LookForGitPath(CString path);\r
        int     ParserFromLog(BYTE_VECTOR &log);\r

+       int ParserFromLsFile(BYTE_VECTOR &out,bool staged=true);\r

        int FillUnRev(int Action,CTGitPathList *list=NULL);\r
        int GetAction();\r
        /**\r
        int FillUnRev(int Action,CTGitPathList *list=NULL);\r
        int GetAction();\r
        /**\r