# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1293658285 21600
# Node ID d85d8ad88de938f4a6a5a0e3818eab70fc0c2ec0
# Parent  3eee7b42d17e10422fbefe63a04bba2228fe99da# Parent  5bcb6c9d16dbad4a99be85f70cdf2634bf2c1b40
merge with stable

diff -r 3eee7b42d17e -r d85d8ad88de9 mercurial/hgweb/hgwebdir_mod.py
--- 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)):