Merge with stable

mercurial/config.py

@@ -1,138 +1,144 b''
 # config.py - configuration parsing for Mercurial
 #
 #  Copyright 2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import error
 import re, os
 
 class sortdict(dict):
     'a simple sorted dictionary'
     def __init__(self, data=None):
         self._list = []
         if data:
             self.update(data)
     def copy(self):
         return sortdict(self)
     def __setitem__(self, key, val):
         if key in self:
             self._list.remove(key)
         self._list.append(key)
         dict.__setitem__(self, key, val)
     def __iter__(self):
         return self._list.__iter__()
     def update(self, src):
         for k in src:
             self[k] = src[k]
     def items(self):
         return [(k, self[k]) for k in self._list]
     def __delitem__(self, key):
         dict.__delitem__(self, key)
         self._list.remove(key)
 
 class config(object):
     def __init__(self, data=None):
         self._data = {}
         self._source = {}
         if data:
             for k in data._data:
                 self._data[k] = data[k].copy()
             self._source = data._source.copy()
     def copy(self):
         return config(self)
     def __contains__(self, section):
         return section in self._data
     def __getitem__(self, section):
         return self._data.get(section, {})
     def __iter__(self):
         for d in self.sections():
             yield d
     def update(self, src):
         for s in src:
             if s not in self:
                 self._data[s] = sortdict()
             self._data[s].update(src._data[s])
         self._source.update(src._source)
     def get(self, section, item, default=None):
         return self._data.get(section, {}).get(item, default)
     def source(self, section, item):
         return self._source.get((section, item), "")
     def sections(self):
         return sorted(self._data.keys())
     def items(self, section):
         return self._data.get(section, {}).items()
     def set(self, section, item, value, source=""):
         if section not in self:
             self._data[section] = sortdict()
         self._data[section][item] = value
         self._source[(section, item)] = source
 
     def parse(self, src, data, sections=None, remap=None, include=None):
         sectionre = re.compile(r'\[([^\[]+)\]')
         itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)')
         contre = re.compile(r'\s+(\S.*\S)')
         emptyre = re.compile(r'(;|#|\s*$)')
         unsetre = re.compile(r'%unset\s+(\S+)')
         includere = re.compile(r'%include\s+(\S.*\S)')
         section = ""
         item = None
         line = 0
         cont = False
 
         for l in data.splitlines(True):
             line += 1
             if cont:
                 m = contre.match(l)
                 if m:
                     if sections and section not in sections:
                         continue
                     v = self.get(section, item) + "\n" + m.group(1)
                     self.set(section, item, v, "%s:%d" % (src, line))
                     continue
                 item = None
                 cont = False
             m = includere.match(l)
             if m:
                 inc = m.group(1)
                 base = os.path.dirname(src)
                 inc = os.path.normpath(os.path.join(base, inc))
                 if include:
-                    include(inc, remap=remap, sections=sections)
+                    try:
+                        include(inc, remap=remap, sections=sections)
+                    except IOError, inst:
+                        msg = _("config error at %s:%d: "
+                                "cannot include %s (%s)") \
+                            % (src, line, inc, inst.strerror)
+                        raise error.ConfigError(msg)
                 continue
             if emptyre.match(l):
                 continue
             m = sectionre.match(l)
             if m:
                 section = m.group(1)
                 if remap:
                     section = remap.get(section, section)
                 if section not in self:
                     self._data[section] = sortdict()
                 continue
             m = itemre.match(l)
             if m:
                 item = m.group(1)
                 cont = True
                 if sections and section not in sections:
                     continue
                 self.set(section, item, m.group(2), "%s:%d" % (src, line))
                 continue
             m = unsetre.match(l)
             if m:
                 name = m.group(1)
                 if sections and section not in sections:
                     continue
                 if self.get(section, name) != None:
                     del self._data[section][name]
                 continue
 
             raise error.ConfigError(_("config error at %s:%d: '%s'")
                                     % (src, line, l.rstrip()))
 
     def read(self, path, fp=None, sections=None, remap=None):
         if not fp:
             fp = open(path)
         self.parse(path, fp.read(), sections, remap, self.read)

tests/test-hgrc

@@ -1,20 +1,23 b''
 #!/bin/sh
 
 echo "invalid" > $HGRCPATH
 hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
 echo "" > $HGRCPATH
 
 # issue1199: escaping
 hg init "foo%bar"
 hg clone "foo%bar" foobar
 p=`pwd`
 cd foobar
 cat .hg/hgrc | sed -e "s:$p:...:"
 hg paths | sed -e "s:$p:...:"
 hg showconfig | sed -e "s:$p:...:"
 cd ..
 
 # issue1829: wrong indentation
 echo '[foo]' > $HGRCPATH
 echo '  x = y' >> $HGRCPATH
 hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
+
+echo '%include /no-such-file' > $HGRCPATH
+hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"

tests/test-hgrc.out

@@ -1,9 +1,10 b''
 hg: config error at $HGRCPATH:1: 'invalid'
 updating to branch default
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [paths]
 default = .../foo%bar
 default = .../foo%bar
 bundle.mainreporoot=.../foobar
 paths.default=.../foo%bar
 hg: config error at $HGRCPATH:2: '  x = y'
+hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)