Merge with crew-stable
authorMatt Mackall <mpm@selenic.com>
Sat, 23 May 2009 12:31:28 -0500
changeset 8560 107af208ed0b
parent 8493 4c030ada58d2 (current diff)
parent 8536 6796d41be421 (diff)
child 8561 accb1cf85c31
child 8754 31c90d12f86c
Merge with crew-stable
--- 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):