Added indication of deleted entries to the Subversion status monitors.

Sun, 04 Mar 2012 13:04:06 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 04 Mar 2012 13:04:06 +0100
changeset 1688
389ee9508e35
parent 1687
5efcb0cea376
child 1689
2d007a789078

Added indication of deleted entries to the Subversion status monitors.

Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Binary file Documentation/Help/source.qch has changed
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sat Mar 03 18:40:25 2012 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sun Mar 04 13:04:06 2012 +0100
@@ -42,6 +42,7 @@
         <ul>
             <li>"A" path was added but not yet comitted</li>
             <li>"M" path has local changes</li>
+            <li>"O" path was removed</li>
             <li>"R" path was deleted and then re-added</li>
             <li>"U" path needs an update</li>
             <li>"Z" path contains a conflict</li>
@@ -83,6 +84,9 @@
                 elif file.text_status == pysvn.wc_status_kind.conflicted or \
                    file.prop_status == pysvn.wc_status_kind.conflicted:
                     status = "Z"
+                elif file.text_status == pysvn.wc_status_kind.deleted or \
+                   file.prop_status == pysvn.wc_status_kind.deleted:
+                    status = "O"
                 elif file.text_status == pysvn.wc_status_kind.modified or \
                    file.prop_status == pysvn.wc_status_kind.modified:
                     status = "M"
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Mar 03 18:40:25 2012 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sun Mar 04 13:04:06 2012 +0100
@@ -47,6 +47,7 @@
         <ul>
             <li>"A" path was added but not yet comitted</li>
             <li>"M" path has local changes</li>
+            <li>"O" path was removed</li>
             <li>"R" path was deleted and then re-added</li>
             <li>"U" path needs an update</li>
             <li>"Z" path contains a conflict</li>
@@ -83,7 +84,7 @@
                         path = self.rx_status2.cap(5).strip()
                     else:
                         continue
-                    if flags[0] in "ACMR" or \
+                    if flags[0] in "ACDMR" or \
                        (flags[0] == " " and flags[7] == "*"):
                         if flags[7] == "*":
                             status = "U"
@@ -91,6 +92,8 @@
                             status = flags[0]
                         if status == "C":
                             status = "Z"    # give it highest priority
+                        elif status == "D":
+                            status = "O"
                         if status == "U":
                             self.shouldUpdate = True
                         name = path

eric ide

mercurial