changeset 8560:107af208ed0b

Merge with crew-stable
author Matt Mackall <mpm@selenic.com>
date Sat, 23 May 2009 12:31:28 -0500
parents 4c030ada58d2 (current diff) 6796d41be421 (diff)
children accb1cf85c31 31c90d12f86c
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py	Thu Apr 02 18:18:43 2009 -0600
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sat May 23 12:31:28 2009 -0500
@@ -72,12 +72,13 @@
                         self.repos.append((name, path))
             if cp.has_section('collections'):
                 for prefix, root in cp.items('collections'):
+                    prefix = util.pconvert(prefix)
                     for path in util.walkrepos(root, followsym=True):
                         repo = os.path.normpath(path)
-                        name = repo
+                        name = util.pconvert(repo)
                         if name.startswith(prefix):
                             name = name[len(prefix):]
-                        self.repos.append((name.lstrip(os.sep), repo))
+                        self.repos.append((name.lstrip('/'), repo))
             self.repos.sort()
 
     def run(self):