Fixed an issue adding a sub-repository on Windows systems.

Sun, 17 Jun 2012 18:44:40 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 17 Jun 2012 18:44:40 +0200
changeset 1910
96641d9a10a2
parent 1909
b8be6f82bc7c
child 1911
0ad47d8b7e57

Fixed an issue adding a sub-repository on Windows systems.

E5Gui/E5FileDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py file | annotate | diff | comparison | revisions
--- a/E5Gui/E5FileDialog.py	Sun Jun 17 14:10:47 2012 +0200
+++ b/E5Gui/E5FileDialog.py	Sun Jun 17 18:44:40 2012 +0200
@@ -13,6 +13,7 @@
 import Globals
 
 Options = QFileDialog.Options
+Option = QFileDialog.Option
 
 ShowDirsOnly = QFileDialog.ShowDirsOnly
 DontResolveSymlinks = QFileDialog.DontResolveSymlinks
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sun Jun 17 14:10:47 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sun Jun 17 18:44:40 2012 +0200
@@ -84,9 +84,10 @@
             E5FileDialog.Options(E5FileDialog.Option(0)))
         
         if path:
+            path = Utilities.toNativeSeparators(path)
             if path.startswith(self.__projectPath):
                 path = path.replace(self.__projectPath, "")[1:]
-                self.pathEdit.setText(Utilities.toNativeSeparators(path))
+                self.pathEdit.setText(path)
             else:
                 E5MessageBox.critical(self,
                     self.trUtf8("Add Sub-repository"),

eric ide

mercurial