eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py

branch
eric7
changeset 8620
84f7f7867b5f
parent 8618
356a2f1b04b0
child 8881
54e42bc2437a
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Mon Sep 20 07:29:27 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Mon Sep 20 19:47:18 2021 +0200
@@ -52,6 +52,8 @@
             <li>"R" path was deleted and then re-added</li>
             <li>"U" path needs an update</li>
             <li>"Z" path contains a conflict</li>
+            <li>"?" path is not tracked</li>
+            <li>"!" path is missing</li>
             <li>" " path is back at normal</li>
         </ul>
         
@@ -90,19 +92,22 @@
                         flags = match.group(1)
                         path = match.group(5).strip()
                     if (
-                        flags[0] in "ACDMR" or
-                        (flags[0] == " " and flags[-1] == "*")
+                        flags[0] in "ACDMR?!" or
+                        (flags[0] == " " and flags[-1] == "*") or
+                        flags[1] in "CM"
                     ):
                         if flags[-1] == "*":
                             status = "U"
                         else:
                             status = flags[0]
-                        if status == "C":
+                        if status == "C" or flags[1] == "C":
                             status = "Z"    # give it highest priority
                         elif status == "D":
                             status = "O"
                         if status == "U":
                             self.shouldUpdate = True
+                        if status == " " and flags[1] == "M":
+                            status = "M"
                         name = path
                         states[name] = status
                         try:

eric ide

mercurial