Mercurial > hg
annotate tests/test-default-push.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 | 2be7d5ebd4d0 |
children | 10917b062adf |
rev | line source |
---|---|
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
1 $ hg init a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
2 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
3 $ echo a > a/a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
4 $ hg --cwd a ci -Ama |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
5 adding a |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
7 $ hg clone a c |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
8 updating to branch default |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
11 $ hg clone a b |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
12 updating to branch default |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
14 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
15 $ echo b >> b/a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
16 $ hg --cwd b ci -mb |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
17 |
20558
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
18 Push should provide a hint when both 'default' and 'default-push' not set: |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
19 $ cd c |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
20 $ hg push --config paths.default= |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
21 pushing to default-push |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
22 abort: default repository not configured! |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
23 (see the "path" section in "hg help config") |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
24 [255] |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
25 |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
26 $ cd .. |
c4f45ce85351
push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents:
15447
diff
changeset
|
27 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
28 Push should push to 'default' when 'default-push' not set: |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
30 $ hg --cwd b push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
31 pushing to $TESTTMP/a (glob) |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
32 searching for changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
33 adding changesets |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
34 adding manifests |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
35 adding file changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
36 added 1 changesets with 1 changes to 1 files |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
37 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
38 Push should push to 'default-push' when set: |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 |
22837
2be7d5ebd4d0
config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20558
diff
changeset
|
40 $ echo '[paths]' >> b/.hg/hgrc |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
41 $ echo 'default-push = ../c' >> b/.hg/hgrc |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
42 $ hg --cwd b push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
43 pushing to $TESTTMP/c (glob) |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
44 searching for changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
45 adding changesets |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
46 adding manifests |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
47 adding file changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
48 added 1 changesets with 1 changes to 1 files |