Plugins/VcsPlugins/vcsPySvn/subversion.py

changeset 1083
dc680a0ce221
parent 945
8cd4d08fa9f6
child 1112
8a7d1b9d18db
diff -r 8387830c1089 -r dc680a0ce221 Plugins/VcsPlugins/vcsPySvn/subversion.py
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon May 30 19:21:18 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon May 30 19:23:59 2011 +0200
@@ -1029,6 +1029,8 @@
         Public method used to switch a directory to a different tag/branch.
         
         @param name directory name to be switched (string)
+        @return flag indicating, that the switch contained an add
+            or delete (boolean)
         """
         dname, fname = self.splitPath(name)
         
@@ -1039,7 +1041,7 @@
                 self.trUtf8("""The URL of the project repository could not be"""
                     """ retrieved from the working copy. The switch operation will"""
                     """ be aborted"""))
-            return
+            return False
         
         if self.otherData["standardLayout"]:
             url = None
@@ -1053,7 +1055,7 @@
                 self.allTagsBranchesList.remove(tag)
             self.allTagsBranchesList.insert(0, tag)
         else:
-            return
+            return False
         
         if self.otherData["standardLayout"]:
             rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
@@ -1063,7 +1065,7 @@
                     self.trUtf8("""The URL of the project repository has an"""
                         """ invalid format. The switch operation will"""
                         """ be aborted"""))
-                return
+                return False
             
             reposRoot = rx_base.cap(1)
             tn = tag
@@ -1093,6 +1095,9 @@
         locker.unlock()
         dlg.finish()
         dlg.exec_()
+        res = dlg.hasAddOrDelete()
+        self.checkVCSStatus()
+        return res
         
     def vcsMerge(self, name):
         """

eric ide

mercurial