Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Thu, 21 May 2009 22:41:18 +0200
changeset 8537 b48a1e081f23
parent 8535 5b6a6ed4f185 (current diff)
parent 8536 6796d41be421 (diff)
child 8538 6419bc7b3d9c
Merge with crew-stable
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Wed May 20 12:20:27 2009 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Thu May 21 22:41:18 2009 +0200
@@ -79,12 +79,13 @@
 
         self.repos = findrepos(paths)
         for prefix, root in self.ui.configitems('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()
         self.lastrefresh = time.time()