merge with crew
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 15 Oct 2008 23:27:35 +0200
changeset 7103 7a19053e4bfc
parent 7102 14f3ea2ea54f (diff)
parent 7101 e786192d995d (current diff)
child 7104 9514cbb6e4f6
merge with crew
--- a/mercurial/hgweb/webcommands.py	Wed Oct 15 20:14:28 2008 +0200
+++ b/mercurial/hgweb/webcommands.py	Wed Oct 15 23:27:35 2008 +0200
@@ -276,12 +276,11 @@
         if f[:l] != path:
             continue
         remain = f[l:]
-        if "/" in remain:
-            short = remain[:remain.index("/") + 1] # bleah
-            files[short] = (f, None)
-        else:
-            short = os.path.basename(remain)
-            files[short] = (f, n)
+        idx = remain.find('/')
+        if idx != -1:
+            remain = remain[:idx+1]
+            n = None
+        files[remain] = (f, n)
 
     if not files:
         raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)