Mercurial > hg-stable

changeset 13215:d85d8ad88de9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 15:31:25 -0600
parents 3eee7b42d17e (current diff) 5bcb6c9d16db (diff)
children 637d07d8e377
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py	Wed Dec 29 14:19:44 2010 -0600
+++ b/mercurial/hgweb/hgwebdir_mod.py	Wed Dec 29 15:31:25 2010 -0600
@@ -64,6 +64,8 @@
 
         if not isinstance(self.conf, (dict, list, tuple)):
             map = {'paths': 'hgweb-paths'}
+            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')
         elif isinstance(self.conf, (list, tuple)):