mercurial/config.py
changeset 9567 02c43e8e0835
parent 9339 9be91129c96e
parent 9469 7f0f882af23d
child 10042 7cdd2a7db2c2
equal deleted inserted replaced
9565:08914fd0fddb 9567:02c43e8e0835
    91                         continue
    91                         continue
    92                     v = self.get(section, item) + "\n" + m.group(1)
    92                     v = self.get(section, item) + "\n" + m.group(1)
    93                     self.set(section, item, v, "%s:%d" % (src, line))
    93                     self.set(section, item, v, "%s:%d" % (src, line))
    94                     continue
    94                     continue
    95                 item = None
    95                 item = None
       
    96                 cont = False
    96             m = includere.match(l)
    97             m = includere.match(l)
    97             if m:
    98             if m:
    98                 inc = m.group(1)
    99                 inc = m.group(1)
    99                 base = os.path.dirname(src)
   100                 base = os.path.dirname(src)
   100                 inc = os.path.normpath(os.path.join(base, inc))
   101                 inc = os.path.normpath(os.path.join(base, inc))