75 if not isinstance(self.conf, (dict, list, tuple)): |
75 if not isinstance(self.conf, (dict, list, tuple)): |
76 map = {'paths': 'hgweb-paths'} |
76 map = {'paths': 'hgweb-paths'} |
77 if not os.path.exists(self.conf): |
77 if not os.path.exists(self.conf): |
78 raise util.Abort(_('config file %s not found!') % self.conf) |
78 raise util.Abort(_('config file %s not found!') % self.conf) |
79 u.readconfig(self.conf, remap=map, trust=True) |
79 u.readconfig(self.conf, remap=map, trust=True) |
80 paths = u.configitems('hgweb-paths') |
80 paths = [] |
|
81 for name, ignored in u.configitems('hgweb-paths'): |
|
82 for path in u.configlist('hgweb-paths', name): |
|
83 paths.append((name, path)) |
81 elif isinstance(self.conf, (list, tuple)): |
84 elif isinstance(self.conf, (list, tuple)): |
82 paths = self.conf |
85 paths = self.conf |
83 elif isinstance(self.conf, dict): |
86 elif isinstance(self.conf, dict): |
84 paths = self.conf.items() |
87 paths = self.conf.items() |
85 |
88 |