Fixed a bug in the VCS copy dialogs causing a failure on Windows systems.

Fri, 18 Jan 2013 19:31:43 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 18 Jan 2013 19:31:43 +0100
changeset 2357
f6a2cbf3f514
parent 2355
cb5489f9b734
child 2359
ef81d2d0a031

Fixed a bug in the VCS copy dialogs causing a failure on Windows systems.

Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py file | annotate | diff | comparison | revisions
diff -r cb5489f9b734 -r f6a2cbf3f514 Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Wed Jan 16 19:56:34 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Fri Jan 18 19:31:43 2013 +0100
@@ -17,6 +17,8 @@
 
 from .Ui_HgCopyDialog import Ui_HgCopyDialog
 
+import Utilities
+
 
 class HgCopyDialog(QDialog, Ui_HgCopyDialog):
     """
@@ -61,7 +63,7 @@
         if not os.path.isabs(target):
             sourceDir = os.path.dirname(self.sourceEdit.text())
             target = os.path.join(sourceDir, target)
-        return target, self.forceCheckBox.isChecked()
+        return Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked()
     
     @pyqtSlot()
     def on_dirButton_clicked(self):
@@ -84,7 +86,7 @@
                 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
         
         if target:
-            self.targetEdit.setText(target)
+            self.targetEdit.setText(Utilities.toNativeSeparators(target))
     
     @pyqtSlot(str)
     def on_targetEdit_textChanged(self, txt):
diff -r cb5489f9b734 -r f6a2cbf3f514 Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Wed Jan 16 19:56:34 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Fri Jan 18 19:31:43 2013 +0100
@@ -17,6 +17,8 @@
 
 from .Ui_SvnCopyDialog import Ui_SvnCopyDialog
 
+import Utilities
+
 
 class SvnCopyDialog(QDialog, Ui_SvnCopyDialog):
     """
@@ -61,7 +63,7 @@
         if not os.path.isabs(target):
             sourceDir = os.path.dirname(self.sourceEdit.text())
             target = os.path.join(sourceDir, target)
-        return target, self.forceCheckBox.isChecked()
+        return Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked()
         
     @pyqtSlot()
     def on_dirButton_clicked(self):
@@ -84,7 +86,7 @@
                 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
         
         if target:
-            self.targetEdit.setText(target)
+            self.targetEdit.setText(Utilities.toNativeSeparators(target))
     
     @pyqtSlot(str)
     def on_targetEdit_textChanged(self, txt):
diff -r cb5489f9b734 -r f6a2cbf3f514 Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Wed Jan 16 19:56:34 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Fri Jan 18 19:31:43 2013 +0100
@@ -17,6 +17,8 @@
 
 from .Ui_SvnCopyDialog import Ui_SvnCopyDialog
 
+import Utilities
+
 
 class SvnCopyDialog(QDialog, Ui_SvnCopyDialog):
     """
@@ -61,7 +63,7 @@
         if not os.path.isabs(target):
             sourceDir = os.path.dirname(self.sourceEdit.text())
             target = os.path.join(sourceDir, target)
-        return target, self.forceCheckBox.isChecked()
+        return Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked()
         
     @pyqtSlot()
     def on_dirButton_clicked(self):
@@ -84,7 +86,7 @@
                 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
         
         if target:
-            self.targetEdit.setText(target)
+            self.targetEdit.setText(Utilities.toNativeSeparators(target))
     
     @pyqtSlot(str)
     def on_targetEdit_textChanged(self, txt):

eric ide

mercurial