hgwebdir: refactor inner loop

mercurial/hgweb/hgwebdir_mod.py

@@ -73,12 +73,26 b' class hgwebdir(object):'
 
         try:
             try:
+
                 virtual = req.env.get("PATH_INFO", "").strip('/')
-                if virtual.startswith('static/'):
+                
+                # a static file
+                if virtual.startswith('static/') or 'static' in req.form:
                     static = os.path.join(templater.templatepath(), 'static')
+                    if virtual.startswith('static/'):
                     fname = virtual[7:]
+                    else:
+                        fname = req.form['static'][0]
                     req.write(staticfile(static, fname, req))
-                elif virtual:
+                    return
+
+                # top-level index
+                elif not virtual:
+                    tmpl = self.templater(req)
+                    self.makeindex(req, tmpl)
+                    return
+
+                # nested indexes and hgwebs
                     repos = dict(self.repos)
                     while virtual:
                         real = repos.get(virtual)
@@ -105,17 +119,12 b' class hgwebdir(object):'
                             break
                         virtual = virtual[:up]
 
+                # prefixes not found
                     tmpl = self.templater(req)
                     req.respond(404, tmpl("notfound", repo=virtual))
-                else:
-                    if req.form.has_key('static'):
-                        static = os.path.join(templater.templatepath(), "static")
-                        fname = req.form['static'][0]
-                        req.write(staticfile(static, fname, req))
-                    else:
+                
+            except ErrorResponse, err:
                         tmpl = self.templater(req)
-                        self.makeindex(req, tmpl)
-            except ErrorResponse, err:
                 req.respond(err.code, tmpl('error', error=err.message or ''))
         finally:
             tmpl = None