Fixed an issue in the Subversion vcsMove method. 5_4_x

Wed, 21 May 2014 18:47:56 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 21 May 2014 18:47:56 +0200
branch
5_4_x
changeset 3599
1a3123f385b6
parent 3584
e92f4aa860f6
child 3606
f2f90775526f

Fixed an issue in the Subversion vcsMove method.
(grafted from 37fdb72a2388f98f2b69d44eb5f8667d2207a128)

Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
diff -r e92f4aa860f6 -r 1a3123f385b6 Plugins/VcsPlugins/vcsPySvn/subversion.py
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat May 17 11:43:07 2014 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Wed May 21 18:47:56 2014 +0200
@@ -913,6 +913,8 @@
             accepted = (dlg.exec_() == QDialog.Accepted)
             if accepted:
                 target, force = dlg.getData()
+            if not target:
+                return False
         
         if not rx_prot.exactMatch(target):
             isDir = os.path.isdir(name)
diff -r e92f4aa860f6 -r 1a3123f385b6 Plugins/VcsPlugins/vcsSubversion/subversion.py
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat May 17 11:43:07 2014 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Wed May 21 18:47:56 2014 +0200
@@ -836,6 +836,8 @@
             accepted = (dlg.exec_() == QDialog.Accepted)
             if accepted:
                 target, force = dlg.getData()
+            if not target:
+                return False
         
         if not rx_prot.exactMatch(target):
             isDir = os.path.isdir(name)

eric ide

mercurial