made wingit.dll delay load so that PATH can be inited with git/bin dir before dll...

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

diff --git a/src/Git/TGitPath.h b/src/Git/TGitPath.h
index 5b99a67..f6ea8b4 100644 (file)
--- a/src/Git/TGitPath.h
+++ b/src/Git/TGitPath.h
@@ -1,11 +1,13 @@
 #pragma once\r
+#include "gittype.h"\r
 \r
 class CTGitPath\r
 {\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
@@ -13,16 +15,18 @@ public:
                LOGACTIONS_MODIFIED     = 0x00000002,\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_CONFLICT = 0x20000000,\r
+               //LOGACTIONS_CONFLICT = 0x20000000,\r
        };\r
 \r
        CString m_StatAdd;\r
        CString m_StatDel;\r
        int             m_Action;\r
        bool    m_Checked;\r
-       int     ParserAction(CString action);\r
+       int     ParserAction(BYTE action);\r
        CString GetActionName();\r
        /**\r
         * Set the path as an UTF8 string with forward slashes\r
@@ -189,6 +193,7 @@ public:
         * contains an admin directory.\r
         */\r
        bool HasAdminDir() const;\r
+       bool HasAdminDir(CString *ProjectTopDir) const;\r
        \r
        /**\r
         * Checks if the path point to or below a Subversion admin directory (.Git).\r
@@ -248,11 +253,7 @@ 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
+       mutable CString m_sProjectRoot;\r
        // Have we yet determined if this is a directory or not?\r
        mutable bool m_bDirectoryKnown;\r
        mutable bool m_bIsDirectory;\r
@@ -295,12 +296,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
+\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(CString &log);\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