Allow per-file shadowing of static directory in templatepath

mercurial/hgweb/common.py

@@ -53,12 +53,17 b' def staticfile(directory, fname, req):'
 
     """
     parts = fname.split('/')
-    path = directory
     for part in parts:
         if (part in ('', os.curdir, os.pardir) or
             os.sep in part or os.altsep is not None and os.altsep in part):
             return ""
-        path = os.path.join(path, part)
+    fpath = os.path.join(*parts)
+    if isinstance(directory, str):
+        directory = [directory]
+    for d in directory:
+        path = os.path.join(d, fpath)
+        if os.path.exists(path):
+            break
     try:
         os.stat(path)
         ct = mimetypes.guess_type(path)[0] or "text/plain"

mercurial/hgweb/webcommands.py

@@ -583,10 +583,7 b' def static(web, req, tmpl):'
         tp = web.templatepath
         if isinstance(tp, str):
             tp = [tp]
-        for path in tp:
-            static = os.path.join(path, 'static')
-            if os.path.isdir(static):
-                break
+        static = [os.path.join(p, 'static') for p in tp]
     return [staticfile(static, fname, req)]
 
 def graph(web, req, tmpl):