Mercurial > hg
view tests/test-mq-missingfiles.t @ 23167:a3c2d9211294 stable
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
This keyword remapping was introduced in e06e9fd2d99f as part of converting
generator based iterators into list based iterators, mentioning "undesired
behavior in template" when a generator is exhausted, but doesn't say what and
introduces no tests.
The problem with the remapping was that it corrupted the output for keywords
like 'extras', 'file_copies' and 'file_copies_switch' in templates such as:
$ hg log -r 142b5d5ec9cc --template "{file_copies % ' File: {file_copy}\n'}"
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
What was happening was that in the first call to runtemplate() inside runmap(),
'lm' mapped the keyword (e.g. file_copies) to the appropriate showxxx() method.
On each subsequent call to runtemplate() in that loop however, the keyword was
mapped to a list of the first item's pieces, e.g.:
'file_copy': ['mercurial/changelog.py', ' (', 'mercurial/hg.py', ')']
Therefore, the dict for the second and any subsequent items were not processed
through the corresponding showxxx() method, and the first item's data was
reused.
The 'extras' keyword regressed in de7e6c489412, and 'file_copies' regressed in
0b241d7a8c62 for other reasons. The common thread of things fixed by this seems
to be when a list of dicts are passed to the templatekw._hybrid class.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 03 Nov 2014 12:08:03 -0500 |
parents | 6d42c797ca6e |
children | f1eaf03dd608 |
line wrap: on
line source
Issue835: qpush fails immediately when patching a missing file, but remaining added files are still created empty which will trick a future qrefresh. $ cat > writelines.py <<EOF > import sys > path = sys.argv[1] > args = sys.argv[2:] > assert (len(args) % 2) == 0 > > f = file(path, 'wb') > for i in xrange(len(args)/2): > count, s = args[2*i:2*i+2] > count = int(count) > s = s.decode('string_escape') > f.write(s*count) > f.close() > EOF $ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ hg init normal $ cd normal $ python ../writelines.py b 10 'a\n' $ hg ci -Am addb adding b $ echo a > a $ python ../writelines.py b 2 'b\n' 10 'a\n' 2 'c\n' $ echo c > c $ hg add a c $ hg qnew -f changeb $ hg qpop popping changeb patch queue now empty $ hg rm b $ hg ci -Am rmb Push patch with missing target: $ hg qpush applying changeb unable to find 'b' for patching 2 out of 2 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh changeb [2] Display added files: $ cat a a $ cat c c Display rejections: $ cat b.rej --- b +++ b @@ -1,3 +1,5 @@ +b +b a a a @@ -8,3 +10,5 @@ a a a +c +c Test missing renamed file $ hg qpop popping changeb patch queue now empty $ hg up -qC 0 $ echo a > a $ hg mv b bb $ python ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n' $ echo c > c $ hg add a c $ hg qnew changebb $ hg qpop popping changebb patch queue now empty $ hg up -qC 1 $ hg qpush applying changebb patching file bb Hunk #1 FAILED at 0 Hunk #2 FAILED at 7 2 out of 2 hunks FAILED -- saving rejects to file bb.rej b not tracked! patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh changebb [2] $ cat a a $ cat c c $ cat bb.rej --- bb +++ bb @@ -1,3 +1,5 @@ +b +b a a a @@ -8,3 +10,5 @@ a a a +c +c $ cd .. $ echo "[diff]" >> $HGRCPATH $ echo "git=1" >> $HGRCPATH $ hg init git $ cd git $ python ../writelines.py b 1 '\x00' $ hg ci -Am addb adding b $ echo a > a $ python ../writelines.py b 1 '\x01' 1 '\x00' $ echo c > c $ hg add a c $ hg qnew -f changeb $ hg qpop popping changeb patch queue now empty $ hg rm b $ hg ci -Am rmb Push git patch with missing target: $ hg qpush applying changeb unable to find 'b' for patching 1 out of 1 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh changeb [2] $ hg st ? b.rej Display added files: $ cat a a $ cat c c Display rejections: $ cat b.rej --- b +++ b GIT binary patch literal 2 Jc${No0000400IC2 $ cd .. Test push creating directory during git copy or rename: $ hg init missingdir $ cd missingdir $ echo a > a $ hg ci -Am adda adding a $ mkdir d $ hg copy a d/a2 $ hg mv a d/a $ hg qnew -g -f patch $ hg qpop popping patch patch queue now empty $ hg qpush applying patch now at: patch $ cd ..