Mercurial > hg-stable
changeset 10296:cade47dcac2d
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 28 Jan 2010 23:13:10 -0600 |
| parents | ea7a14ca118a (current diff) 44c923eeb81d (diff) |
| children | e7727a545c48 |
| files | mercurial/copies.py tests/test-hgrc tests/test-hgrc.out |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/config.py Thu Jan 28 22:45:04 2010 -0600 +++ b/mercurial/config.py Thu Jan 28 23:13:10 2010 -0600 @@ -73,10 +73,10 @@ 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)') + contre = re.compile(r'\s+(\S|\S.*\S)\s*$') emptyre = re.compile(r'(;|#|\s*$)') unsetre = re.compile(r'%unset\s+(\S+)') - includere = re.compile(r'%include\s+(\S.*\S)') + includere = re.compile(r'%include\s+(\S|\S.*\S)\s*$') section = "" item = None line = 0
--- a/mercurial/copies.py Thu Jan 28 22:45:04 2010 -0600 +++ b/mercurial/copies.py Thu Jan 28 23:13:10 2010 -0600 @@ -154,7 +154,7 @@ break # no merge needed, quit early c2 = ctx(of, m2[of]) cr = related(oc, c2, ca.rev()) - if of == f or of == c2.path(): # non-divergent + if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent copy[f] = of of = None break
--- a/tests/test-hgrc Thu Jan 28 22:45:04 2010 -0600 +++ b/tests/test-hgrc Thu Jan 28 23:13:10 2010 -0600 @@ -19,5 +19,9 @@ echo ' x = y' >> $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" +python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \ + > $HGRCPATH +hg showconfig foo + echo '%include /no-such-file' > $HGRCPATH hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
--- a/tests/test-hgrc.out Thu Jan 28 22:45:04 2010 -0600 +++ b/tests/test-hgrc.out Thu Jan 28 23:13:10 2010 -0600 @@ -7,4 +7,6 @@ bundle.mainreporoot=.../foobar paths.default=.../foo%bar hg: config error at $HGRCPATH:2: ' x = y' +foo.bar=a\nb\nc\nde\nfg +foo.baz=bif cb hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)