Plugins/VcsPlugins/vcsPySvn/subversion.py

changeset 169
a03768260179
parent 110
c9a969db1469
child 248
f4561c24989a
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Apr 02 17:12:47 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Apr 04 13:57:59 2010 +0000
@@ -791,6 +791,7 @@
         rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+')
         opts = self.options['global']
         res = False
+        
         if noDialog:
             if target is None:
                 return False
@@ -802,6 +803,11 @@
             if accepted:
                 target, force = dlg.getData()
         
+        if not rx_prot.exactMatch(target):
+            isDir = os.path.isdir(name)
+        else:
+            isDir = False
+        
         if accepted:
             client = self.getClient()
             if rx_prot.exactMatch(target):
@@ -834,12 +840,12 @@
                 dlg.exec_()
             if res and not rx_prot.exactMatch(target):
                 if target.startswith(project.getProjectPath()):
-                    if os.path.isdir(name):
+                    if isDir:
                         project.moveDirectory(name, target)
                     else:
                         project.renameFileInPdata(name, target)
                 else:
-                    if os.path.isdir(name):
+                    if isDir:
                         project.removeDirectory(name)
                     else:
                         project.removeFile(name)

eric ide

mercurial