All configurations (Release/Debug and x86/x64) can be built properly.

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

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index e33d018..7c7e43c 100644 (file)
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -81,6 +81,7 @@ CTGitPath::CTGitPath(const CString& sUnknownPath) :
 {\r
        SetFromUnknown(sUnknownPath);\r
        m_Action=0;\r
+       m_Stage=0;\r
 }\r
 \r
 int CTGitPath::ParserAction(BYTE action)\r
@@ -97,6 +98,12 @@ int CTGitPath::ParserAction(BYTE action)
                m_Action|= LOGACTIONS_DELETED;\r
        if(action == 'U')\r
                m_Action|= LOGACTIONS_UNMERGED;\r
+       if(action == 'K')\r
+               m_Action|= LOGACTIONS_DELETED;\r
+       if(action == 'H')\r
+               m_Action|= LOGACTIONS_CACHE;\r
+       if(action == 'C' )\r
+               m_Action|= LOGACTIONS_COPY;\r
 \r
        return m_Action;\r
 }\r
@@ -121,6 +128,18 @@ void CTGitPath::SetFromGit(const char* pPath, bool bIsDirectory)
        m_bIsDirectory = bIsDirectory;\r
 }\r
 \r
+void CTGitPath::SetFromGit(const TCHAR* pPath, bool bIsDirectory)\r
+{\r
+       Reset();\r
+       if (pPath)\r
+       {\r
+               m_sFwdslashPath = pPath;\r
+               SanitizeRootPath(m_sFwdslashPath, true);\r
+       }\r
+       m_bDirectoryKnown = true;\r
+       m_bIsDirectory = bIsDirectory;\r
+}\r
+\r
 void CTGitPath::SetFromGit(const CString& sPath,CString *oldpath)\r
 {\r
        Reset();\r
@@ -725,11 +744,28 @@ bool CTGitPath::HasAdminDir() const
                return m_bHasAdminDir;\r
 \r
        EnsureBackslashPathSet();\r
-       m_bHasAdminDir = g_GitAdminDir.HasAdminDir(m_sBackslashPath, IsDirectory());\r
+       m_bHasAdminDir = g_GitAdminDir.HasAdminDir(m_sBackslashPath, IsDirectory(), &m_sProjectRoot);\r
        m_bHasAdminDirKnown = true;\r
        return m_bHasAdminDir;\r
 }\r
 \r
+bool CTGitPath::HasAdminDir(CString *ProjectTopDir) const\r
+{\r
+       if (m_bHasAdminDirKnown)\r
+       {\r
+               if (ProjectTopDir)\r
+                       *ProjectTopDir = m_sProjectRoot;\r
+               return m_bHasAdminDir;\r
+       }\r
+\r
+       EnsureBackslashPathSet();\r
+       m_bHasAdminDir = g_GitAdminDir.HasAdminDir(m_sBackslashPath, IsDirectory(), &m_sProjectRoot);\r
+       m_bHasAdminDirKnown = true;\r
+       if (ProjectTopDir)\r
+               *ProjectTopDir = m_sProjectRoot;\r
+       return m_bHasAdminDir;\r
+}\r
+\r
 bool CTGitPath::IsAdminDir() const\r
 {\r
        if (m_bIsAdminDirKnown)\r
@@ -827,6 +863,43 @@ CTGitPathList::CTGitPathList(const CTGitPath& firstEntry)
 {\r
        AddPath(firstEntry);\r
 }\r
+int CTGitPathList::ParserFromLsFile(BYTE_VECTOR &out,bool staged)\r
+{\r
+       int pos=0;\r
+       CString one;\r
+       CTGitPath path;\r
+       CString part;\r
+       while(pos>=0 && pos<out.size())\r
+       {\r
+               one.Empty();\r
+               path.Reset();\r
+\r
+               g_Git.StringAppend(&one,&out[pos],CP_OEMCP);\r
+               int tabstart=0;\r
+               path.m_Action=path.ParserAction(out[pos]);\r
+               one.Tokenize(_T("\t"),tabstart); \r
+\r
+               if(tabstart>=0)\r
+                       path.SetFromGit(one.Right(one.GetLength()-tabstart));\r
+\r
+               tabstart=0;\r
+\r
+               part=one.Tokenize(_T(" "),tabstart); //Tag\r
+\r
+               part=one.Tokenize(_T(" "),tabstart); //Mode\r
+               \r
+               part=one.Tokenize(_T(" "),tabstart); //Hash\r
+\r
+               part=one.Tokenize(_T("\t"),tabstart); //Stage\r
+\r
+               path.m_Stage=_ttol(part);\r
+\r
+               this->AddPath(path);\r
+\r
+               pos=out.findNextString(pos);\r
+       }\r
+       return pos;\r
+}\r
 int CTGitPathList::FillUnRev(int action,CTGitPathList *list)\r
 {\r
        int pos=0;\r
@@ -849,23 +922,26 @@ int CTGitPathList::FillUnRev(int action,CTGitPathList *list)
                \r
                if(list==NULL)\r
                {\r
-                       cmd=_T("git.exe ls-files --exclude-standard --full-name --others");\r
+                       cmd=_T("git.exe ls-files --exclude-standard --full-name --others -z");\r
                        cmd+=ignored;\r
                        \r
                }\r
                else\r
-               {       cmd.Format(_T("git.exe ls-files --exclude-standard --full-name --others %s-- \"%s\""),\r
+               {       cmd.Format(_T("git.exe ls-files --exclude-standard --full-name --others -z %s-- \"%s\""),\r
                                        ignored,\r
                                        (*list)[i].GetWinPathString());\r
                }\r
-#ifdef VECTOR_F                \r
-               CString out;\r
-               g_Git.Run(cmd,&out);\r
 \r
+               BYTE_VECTOR out;\r
+               out.clear();\r
+               g_Git.Run(cmd,&out);\r
+               \r
+               pos=0;\r
                CString one;\r
-               while( pos>=0 )\r
+               while( pos>=0 && pos<out.size())\r
                {\r
-                       one=out.Tokenize(_T("\n"),pos);\r
+                       one.Empty();\r
+                       g_Git.StringAppend(&one,&out[pos],CP_OEMCP);\r
                        if(!one.IsEmpty())\r
                        {\r
                                //SetFromGit will clear all status\r
@@ -873,8 +949,9 @@ int CTGitPathList::FillUnRev(int action,CTGitPathList *list)
                                path.m_Action=action;\r
                                AddPath(path);\r
                        }\r
+                       pos=out.findNextString(pos);\r
                }\r
-#endif\r
+\r
        }\r
        return 0;\r
 }\r
@@ -882,7 +959,7 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log)
 {\r
        this->Clear();\r
        int pos=0;\r
-       BYTE *p=&log[0];\r
+       //BYTE *p=&log[0];\r
        //CString one;\r
        CTGitPath path;\r
        m_Action=0;\r
@@ -990,6 +1067,7 @@ int CTGitPathList::ParserFromLog(BYTE_VECTOR &log)
                                        sec++;\r
                                        g_Git.StringAppend(&file1,&log[sec],CP_OEMCP);\r
                                }\r
+                               pos=sec;\r
 \r
                        }else\r
                        {\r
@@ -1799,19 +1877,35 @@ CTGitPath * CTGitPathList::LookForGitPath(CString path)
        }\r
        return NULL;\r
 }\r
-\r
-CString CTGitPath::GetActionName()\r
+CString CTGitPath::GetActionName(int action)\r
 {\r
-       if(m_Action  & CTGitPath::LOGACTIONS_ADDED)\r
+       if(action  & CTGitPath::LOGACTIONS_UNMERGED)\r
+               return _T("Conflict");\r
+       if(action  & CTGitPath::LOGACTIONS_ADDED)\r
                return _T("Added");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_DELETED)\r
+       if(action  & CTGitPath::LOGACTIONS_DELETED)\r
                return _T("Deleted");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_MODIFIED)\r
+       if(action  & CTGitPath::LOGACTIONS_MODIFIED)\r
                return _T("Modified");\r
-       if(m_Action  & CTGitPath::LOGACTIONS_REPLACED)\r
+       if(action  & CTGitPath::LOGACTIONS_REPLACED)\r
                return _T("Rename");\r
+       if(action  & CTGitPath::LOGACTIONS_COPY)\r
+               return _T("Copy");\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+               return _T("Edit");\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_SQUASH)\r
+               return _T("Squash");\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_PICK)\r
+               return _T("Pick");\r
+       if(action & CTGitPath::LOGACTIONS_REBASE_SKIP)\r
+               return _T("Skip");\r
+\r
        return _T("Unknown");\r
 }\r
+CString CTGitPath::GetActionName()\r
+{\r
+       return GetActionName(m_Action);\r
+}\r
 \r
 int CTGitPathList::GetAction()\r
 {\r