Fixed an issue causing change lists to remain unrecognized by the PySvn status dialog on Windows systems. 5_2_x

Sat, 30 Jun 2012 17:03:09 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 30 Jun 2012 17:03:09 +0200
branch
5_2_x
changeset 1925
96a8f8fa0f42
parent 1923
434ed7f9c7f9
child 1931
0e67826e1991

Fixed an issue causing change lists to remain unrecognized by the PySvn status dialog on Windows systems.

Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Jun 30 14:24:37 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Jun 30 17:03:09 2012 +0200
@@ -26,6 +26,7 @@
 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog
 
 import Preferences
+import Utilities
 
 
 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog):
@@ -310,8 +311,9 @@
                     else:
                         depth = pysvn.depth.immediate
                     changelists = self.client.get_changelist(name, depth=depth)
-                    for entry in changelists:
-                        changelistsDict[entry[0]] = entry[1]
+                    for fpath, changelist in changelists:
+                        fpath = Utilities.normcasepath(fpath)
+                        changelistsDict[fpath] = changelist
                 hideChangelistColumn = hideChangelistColumn and \
                     len(changelistsDict) == 0
                 
@@ -344,7 +346,7 @@
                              file.entry.lock_token != file.repos_lock["token"]:
                             lockState = "S"
                     
-                    fpath = os.path.join(self.dname, file.path)
+                    fpath = Utilities.normcasepath(os.path.join(self.dname, file.path))
                     if fpath in changelistsDict:
                         changelist = changelistsDict[fpath]
                     else:

eric ide

mercurial