Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/config.py @ 9567:02c43e8e0835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hg-i18n-stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 30 Sep 2009 21:14:24 +0200
parents 9be91129c96e 7f0f882af23d
children 7cdd2a7db2c2
comparison
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))