Merge Myagi exe shell version to show overlay

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

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index a32d859..077eedd 100644 (file)
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -1449,7 +1449,7 @@ void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listInde
        // relative path\r
        CString rename;\r
        rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());\r
-       if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
+       if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))\r
                entryname+=rename;\r
        \r
        InsertItem(index, entryname, icon_idx);\r
@@ -2060,7 +2060,7 @@ bool CGitStatusListCtrl::BuildStatistics()
        {\r
                int status=((CTGitPath*)m_arStatusArray[i])->m_Action;\r
 \r
-               if(status&CTGitPath::LOGACTIONS_ADDED)\r
+               if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))\r
                        m_nAdded++;\r
                \r
                if(status&CTGitPath::LOGACTIONS_DELETED)\r
@@ -4248,7 +4248,7 @@ void CGitStatusListCtrl::StartDiff(int fileindex)
 \r
        CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);\r
        CTGitPath file2;\r
-       if(file1.m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
+       if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))\r
        {\r
                file2.SetFromGit(file1.GetGitOldPathString());\r
        }else\r
@@ -4526,11 +4526,11 @@ void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
                                {\r
                                        crText = m_Colors.GetColor(CColors::Conflict);\r
 \r
-                               }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)\r
+                               }else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))\r
                                {\r
                                        crText = m_Colors.GetColor(CColors::Modified);\r
 \r
-                               }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)\r
+                               }else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))\r
                                {\r
                                        crText = m_Colors.GetColor(CColors::Added);\r
                                }\r