# HG changeset patch
# User timeless <timeless@gmail.com>
# Date 1300241217 -3600
# Node ID 8cbb59124e67cd464a3ef1b14d49702face91085
# Parent  c49cddce0a819bb7a940c6dda4e597967163f4c2
hgweb: support multiple directories for the same path

[paths]
/dir = /path/1/*, /path/2/*

diff -r c49cddce0a81 -r 8cbb59124e67 mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Wed Mar 16 03:28:56 2011 +0100
+++ b/mercurial/hgweb/hgwebdir_mod.py	Wed Mar 16 03:06:57 2011 +0100
@@ -77,7 +77,10 @@
             if not os.path.exists(self.conf):
                 raise util.Abort(_('config file %s not found!') % self.conf)
             u.readconfig(self.conf, remap=map, trust=True)
-            paths = u.configitems('hgweb-paths')
+            paths = []
+            for name, ignored in u.configitems('hgweb-paths'):
+                for path in u.configlist('hgweb-paths', name):
+                    paths.append((name, path))
         elif isinstance(self.conf, (list, tuple)):
             paths = self.conf
         elif isinstance(self.conf, dict):