# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1243099888 18000
# Node ID 107af208ed0be0bdb89ce2946052b0798b6e83d4
# Parent  4c030ada58d2698815bbe85b984747c44a73b7d8# Parent  6796d41be42129c7b6e368807946d59c00ac8433
Merge with crew-stable

diff -r 4c030ada58d2 -r 107af208ed0b mercurial/hgweb/hgwebdir_mod.py
--- 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):