merge original branch.

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

diff --git a/src/Git/TGitPath.h b/src/Git/TGitPath.h
index 22bfb09..8cbc7c8 100644 (file)
--- a/src/Git/TGitPath.h
+++ b/src/Git/TGitPath.h
@@ -8,6 +8,7 @@ public:
        ~CTGitPath(void);\r
        CTGitPath(const CString& sUnknownPath);\r
        int m_Stage;\r
+       int m_ParentNo;\r
 public:\r
        enum\r
        {       \r
@@ -18,6 +19,8 @@ public:
                LOGACTIONS_UNMERGED = 0x00000010,\r
                LOGACTIONS_CACHE        = 0x00000020,\r
                LOGACTIONS_COPY         = 0x00000040,\r
+               LOGACTIONS_MERGED   = 0x00000080,\r
+               LOGACTIONS_FORWORD  = 0x00000100,\r
                LOGACTIONS_UNVER        = 0x80000000,\r
                LOGACTIONS_IGNORE       = 0x40000000,\r
                //LOGACTIONS_CONFLICT = 0x20000000,\r
@@ -97,6 +100,9 @@ public:
         * Returns true if the path points to a directory\r
         */\r
        bool IsDirectory() const;\r
+\r
+       CTGitPath GetSubPath(CTGitPath &root);\r
+\r
        /**\r
         * Returns the directory. If the path points to a directory, then the path\r
         * is returned unchanged. If the path points to a file, the path to the \r
@@ -212,6 +218,11 @@ public:
         */\r
        bool HasAdminDir() const;\r
        bool HasAdminDir(CString *ProjectTopDir) const;\r
+       bool HasSubmodules() const;\r
+       bool HasGitSVNDir() const;\r
+       bool HasStashDir() const;\r
+\r
+       int  GetAdminDirMask() const;\r
        \r
        /**\r
         * Checks if the path point to or below a Subversion admin directory (.Git).\r