Mercurial > hg-stable
annotate tests/test-obsmarker-template.t @ 33276:89796a25d4bb
template: add successors template
Add a 'successorssets' template that returns the list of all closest known
sucessorssets for a changectx. The elements of the list are changesets.
The "closest successors" are the first locally known revisions encountered
while, walking successors markers. It uses successorsets previously modified
to support the closest argument.
This logic respect repository filtering. So hidden revision will be skipped by
this logic unless --hidden is specified. Since we only display the visible
predecessors, this template will not display anything in most case. It makes a
good candidate for inclusion in the default log output.
I updated the test-obsmarker-template.t test file introduced with the
predecessors template to test successorssets template.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 03 Jul 2017 11:22:00 +0200 |
parents | 4cf60d5894b5 |
children | b11e8c67fb0f |
rev | line source |
---|---|
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 This test file test the various templates related to obsmarkers. |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 Global setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 ============ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 $ . $TESTDIR/testlib/obsmarker-common.sh |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 $ cat >> $HGRCPATH <<EOF |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 > [ui] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 > interactive = true |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 > [phases] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 > publish=False |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 > [experimental] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 > evolution=all |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 > [alias] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 > tlog = log -G -T '{node|short}\ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
32927
89610c586fa2
templatekw: reference predecessor node id as {node} in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32897
diff
changeset
|
18 > {if(predecessors, "\n json: {predecessors|json}")}\ |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
19 > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
20 > {if(successorssets, "\n Successors: {successorssets}")}\ |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
21 > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
22 > {if(successorssets, "\n json: {successorssets|json}")}\n' |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 > EOF |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 Test templates on amended commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 ================================ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 $ hg init $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 $ cd $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 $ echo 42 >> A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 $ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 @ changeset: 4:d004c8f274b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 | x changeset: 3:a468dc9b3633 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 | x changeset: 2:f137d23bb3e1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 | | summary: temporary amend commit for 471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 $ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 o d004c8f274b9 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
76 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
77 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
79 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 | @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
81 |/ Successors: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
82 | multi-line: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
83 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 $ hg up 'desc(A1)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 o d004c8f274b9 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
92 | Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
93 | semi-colon: 3:a468dc9b3633 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
95 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 | @ a468dc9b3633 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
97 |/ Successors: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
98 | multi-line: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
99 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 Predecessors template should show all the predecessors as we force their display |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 o d004c8f274b9 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
106 | Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
107 | semi-colon: 3:a468dc9b3633 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
109 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 | @ a468dc9b3633 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
111 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
112 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
114 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
115 | Successors: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
116 | multi-line: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
117 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 | x f137d23bb3e1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
121 |/ Successors: 3:a468dc9b3633 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
122 | multi-line: 3:a468dc9b3633 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
123 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
124 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 Predecessors template shouldn't show anything as all obsolete commit are not |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 visible. |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 @ d004c8f274b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 @ d004c8f274b9 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
138 | Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
139 | semi-colon: 3:a468dc9b3633 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
141 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 | x a468dc9b3633 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
143 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
144 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
146 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
147 | Successors: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
148 | multi-line: 4:d004c8f274b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
149 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 | x f137d23bb3e1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
153 |/ Successors: 3:a468dc9b3633 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
154 | multi-line: 3:a468dc9b3633 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
155 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 Test templates with splitted commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 =================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 $ hg init $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 $ cd $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 @ changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 # Simulate split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 @ changeset: 3:f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 o changeset: 2:337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 | x changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
219 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
220 $ hg up 'obsolete()' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
225 o f257fde29c7a |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
226 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
227 | semi-colon: 1:471597cad322 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
228 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
229 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 o 337fec4d2edc |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
231 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
232 | semi-colon: 1:471597cad322 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
233 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
234 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 | @ 471597cad322 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
236 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
237 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
238 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
239 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
240 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 $ hg up f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
244 Predecessors template should not show a predecessor as it's not displayed in |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
245 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
246 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
247 @ f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
248 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 o 337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
250 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
251 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 Predecessors template should show both predecessors as we force their display |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
255 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
256 @ f257fde29c7a |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
257 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
258 | semi-colon: 1:471597cad322 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
259 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
260 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
261 o 337fec4d2edc |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
262 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
263 | semi-colon: 1:471597cad322 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
264 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
265 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
266 | x 471597cad322 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
267 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
268 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
269 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
270 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 Test templates with folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
273 ================================= |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
274 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
275 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
276 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
277 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
278 $ hg init $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
279 $ cd $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
282 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 @ changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
285 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
304 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 @ changeset: 3:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
337 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 $ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 o eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
344 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
345 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
347 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 | @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
349 |/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
350 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
351 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
352 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
353 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
354 $ hg up 'desc(B0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
356 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
357 Predecessors template should show both predecessors as they should be both |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 displayed |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
359 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 o eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
361 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
362 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
363 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
364 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 | @ 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
366 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
367 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
368 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
370 |/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
371 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
372 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
373 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
374 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
375 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
376 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
377 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
378 Predecessors template should not show predecessors as they are not displayed in |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
379 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
380 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
381 @ eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
382 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
383 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
385 Predecessors template should show both predecessors as we force their display |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
386 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
387 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
388 @ eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
389 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
390 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
391 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
392 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
393 | x 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
394 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
395 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
396 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
397 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
398 |/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
399 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
400 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
401 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
402 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
403 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
404 Test templates with divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
405 ============================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
406 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
407 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
408 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
409 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
410 $ hg init $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
411 $ cd $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
412 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
413 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
414 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
415 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
416 @ changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
419 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
420 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
421 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
422 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
423 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
424 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
428 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 $ hg update --hidden 'desc(A0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 $ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 @ changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 | trouble: divergent |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 | o changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 | trouble: divergent |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
452 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
460 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 $ hg commit --amend -m 'A3' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 @ changeset: 4:019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 | trouble: divergent |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 | summary: A3 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 | x changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 | o changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 | trouble: divergent |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 $ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
501 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
502 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 o 019fadeab383 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
505 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
506 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
508 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
509 | o fdf9bde5129a |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
510 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
511 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
513 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
514 | @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
515 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
516 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
517 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
518 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
519 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 $ hg up 'desc(A1)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
523 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
524 Predecessors template should not show predecessors as they are not displayed in |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
526 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 o 019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
528 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
529 | @ fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 |/ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 Predecessors template should the predecessors as we force their display with |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 o 019fadeab383 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
537 | Predecessors: 3:65b757b745b9 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
538 | semi-colon: 3:65b757b745b9 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
540 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 | x 65b757b745b9 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
542 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
543 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
545 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
546 | Successors: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
547 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
548 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 | @ fdf9bde5129a |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
550 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
551 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
553 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
555 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
556 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
557 | multi-line: 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
558 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 Test templates with amended + folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
563 =========================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
565 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
566 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
567 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 $ hg init $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 $ cd $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 $ hg commit --amend -m "B1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 @ changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
595 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 # Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
600 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
601 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
603 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
605 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
606 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
607 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
608 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
609 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
610 @ changeset: 4:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
611 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
612 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
613 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
614 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
615 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
616 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
617 | x changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 | | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
621 | | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
622 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
623 | | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
624 | |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
625 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
626 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
627 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
628 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
629 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
630 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
631 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
632 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
633 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
634 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
635 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
636 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
637 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
638 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
639 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
640 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
641 $ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
642 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
643 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
644 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
645 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
646 o eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
647 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
648 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
649 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
650 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
651 | @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
652 |/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
653 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
654 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
655 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
656 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
657 $ hg up 'desc(B0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
658 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
659 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
660 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
661 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
662 o eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
663 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
664 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
665 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
666 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
667 | @ 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
668 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
669 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
670 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
671 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
672 |/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
673 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
674 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
675 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
676 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
677 $ hg up 'desc(B1)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
678 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
679 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
680 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
681 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
682 o eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
683 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
684 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
685 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
686 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
687 | @ b7ea6d14e664 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
688 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
689 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
690 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
691 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
692 |/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
693 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
694 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
695 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
696 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
697 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
698 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
699 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
700 Predecessors template should show no predecessors as they are both non visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
701 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
702 @ eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
703 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
704 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
705 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
706 Predecessors template should show all predecessors as we force their display |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
707 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
708 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
709 @ eb5a0daa2192 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
710 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
711 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
712 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
713 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
714 | x b7ea6d14e664 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
715 | | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
716 | | semi-colon: 2:0dec01379d3b |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
717 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
718 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
719 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
720 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
721 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
722 | | x 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
723 | |/ Successors: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
724 | | multi-line: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
725 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
726 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
727 |/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
728 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
729 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
730 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
731 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
732 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
733 Test template with pushed and pulled obs markers |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
734 ================================================ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
735 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
736 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
737 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
738 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
739 $ hg init $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
740 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
741 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
742 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
743 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
744 updating to branch default |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
747 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
749 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
751 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
754 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
755 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
756 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
758 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
759 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
761 $ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 @ changeset: 3:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
764 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
765 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
766 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
768 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
769 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
770 | x changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
771 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
772 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
773 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
774 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
775 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
776 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
777 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
778 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
779 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
780 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
781 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
782 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
783 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
784 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
785 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
786 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
787 $ hg pull |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
788 pulling from $TESTTMP/templates-local-remote-markers-1 (glob) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
789 searching for changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
790 adding changesets |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
791 adding manifests |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
792 adding file changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
793 added 1 changesets with 0 changes to 1 files (+1 heads) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
794 2 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32929
diff
changeset
|
795 obsoleted 1 changesets |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
796 (run 'hg heads' to see heads, 'hg merge' to merge) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
797 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
798 o changeset: 2:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
799 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
800 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
801 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
802 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
803 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
804 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
805 | @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
806 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
807 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
808 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
809 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
810 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
811 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
812 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
813 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
814 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
815 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
816 $ hg debugobsolete |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
817 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
818 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
819 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
820 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
821 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
822 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
823 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
824 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
825 o 7a230b46bf61 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
826 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
827 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
828 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
829 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
830 | @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
831 |/ Successors: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
832 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
833 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
834 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
835 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
836 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
837 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
838 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
839 Predecessors template should show no predecessors as they are non visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
840 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
841 @ 7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
842 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
843 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
844 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
845 Predecessors template should show all predecessors as we force their display |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
846 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
847 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
848 @ 7a230b46bf61 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
849 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
850 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
851 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
852 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
853 | x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
854 |/ Successors: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
855 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
856 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
857 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
858 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
859 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
860 Test template with obsmarkers cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
861 =================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
862 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
863 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
864 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
865 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
866 $ hg init $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
867 $ cd $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
868 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
869 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
870 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
871 $ hg up -r 0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
872 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
873 $ mkcommit C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
874 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
875 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
876 Create the cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
877 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
878 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
879 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
880 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
881 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
882 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
883 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
884 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
885 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
886 @ f897c6137566 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
887 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
888 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
889 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
890 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
891 $ hg up -r "desc(B0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
892 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
893 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
894 o f897c6137566 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
895 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
896 | semi-colon: 2:0dec01379d3b |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
897 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
898 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
899 | @ 0dec01379d3b |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
900 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
901 | | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
902 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
903 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
904 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
905 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
906 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
907 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
908 | x 471f378eab4c |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
909 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
910 | semi-colon: 2:0dec01379d3b |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
911 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
912 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
913 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
914 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
915 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
916 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
917 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
918 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
919 $ hg up -r "desc(A0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
920 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
921 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
922 o f897c6137566 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
923 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
924 | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
925 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
926 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
927 | @ 471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
928 |/ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
929 o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
930 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
931 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
932 $ hg up -r "desc(ROOT)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
933 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
934 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
935 o f897c6137566 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
936 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
937 @ ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
938 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
939 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
940 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
941 o f897c6137566 |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
942 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
943 | semi-colon: 2:0dec01379d3b |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
944 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
945 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
946 | x 0dec01379d3b |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
947 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
948 | | semi-colon: 1:471f378eab4c |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
949 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
950 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
951 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
952 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
953 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
954 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
955 | x 471f378eab4c |
32929
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
956 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32928
diff
changeset
|
957 | semi-colon: 2:0dec01379d3b |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
958 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32928
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32927
diff
changeset
|
959 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
960 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
961 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
962 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32897
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
963 @ ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
964 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
965 Test template with split + divergence with cycles |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
966 ================================================= |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
967 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
968 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
969 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
970 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
971 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
972 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
973 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
974 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
975 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
976 @ changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
977 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
978 date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
979 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
980 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
981 $ hg up |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
982 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
983 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
984 Create a commit with three files |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
985 $ touch A B C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
986 $ hg commit -A -m "Add A,B,C" A B C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
987 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
988 Split it |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
989 $ hg up 3 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
990 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
991 $ touch A |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
992 $ hg commit -A -m "Add A,B,C" A |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
993 created new head |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
994 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
995 $ touch B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
996 $ hg commit -A -m "Add A,B,C" B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
997 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
998 $ touch C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
999 $ hg commit -A -m "Add A,B,C" C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1001 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1002 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1003 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1004 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1005 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1006 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1007 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1008 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1009 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1010 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1011 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1012 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1013 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1014 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1015 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1016 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1017 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1018 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1019 | o changeset: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1020 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1021 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1022 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1023 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1024 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1025 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1026 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1027 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1028 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1029 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1030 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1031 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1032 date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1033 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1034 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1035 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1036 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1037 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1038 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1039 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1040 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1041 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1042 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1043 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1044 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1045 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1046 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1047 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1048 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1049 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1050 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1051 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1052 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1053 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1054 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1055 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1056 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1057 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1058 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1059 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1060 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1061 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1062 date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1063 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1064 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1065 Diverge one of the splitted commit |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1066 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1067 $ hg up 6 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1068 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1069 $ hg commit --amend -m "Add only B" |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1070 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1071 $ hg up 6 --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1072 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1073 $ hg commit --amend -m "Add B only" |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1074 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1075 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1076 @ changeset: 9:0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1077 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1078 | parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1079 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1080 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1081 | trouble: divergent |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1082 | summary: Add B only |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1083 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1084 | o changeset: 8:b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1085 |/ parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1086 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1087 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1088 | trouble: divergent |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1089 | summary: Add only B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1090 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1091 | o changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1092 | | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1093 | | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1094 | | trouble: unstable, divergent |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1095 | | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1096 | | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1097 | x changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1098 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1099 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1100 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1101 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1102 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1103 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1104 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1105 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1106 | trouble: divergent |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1107 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1108 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1109 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1110 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1111 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1112 | date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1113 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1114 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1115 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1116 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1117 date: Thu Jan 01 00:00:00 1970 +0000 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1118 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1119 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1120 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1121 Check templates |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1122 --------------- |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1123 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1124 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1125 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1126 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1127 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1128 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1129 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1130 | o b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1131 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1132 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1133 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1134 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1135 | o ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1136 | | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1137 | x 4a004186e638 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1138 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1139 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1140 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1141 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1142 o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1143 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1144 o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1145 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1146 o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1147 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1148 $ hg tlog --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1149 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1150 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1151 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1152 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1153 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1154 | o b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1155 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1156 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1157 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1158 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1159 | o ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1160 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1161 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1162 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1163 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1164 | x 4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1165 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1166 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1167 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1168 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1169 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1170 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1171 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1172 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1173 o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1174 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1175 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1176 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1177 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1178 | x 9bd10a0775e4 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1179 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1180 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1181 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1182 o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1183 | Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1184 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1185 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1186 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1187 | x 0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1188 | | Predecessors: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1189 | | semi-colon: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1190 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1191 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1192 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1193 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1194 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1195 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1196 | x 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1197 |/ Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1198 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1199 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1200 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1201 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1202 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1203 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1204 o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1205 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1206 $ hg up --hidden 4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1208 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1209 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1210 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1211 o eceed8f98ffc |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1212 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1213 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1214 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1215 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1216 | o 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1217 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1218 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1219 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1220 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1221 o | b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1222 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1223 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1224 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1225 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1226 o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1227 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1228 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1229 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1230 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1231 | @ 9bd10a0775e4 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1232 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1233 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1234 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1235 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1236 o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1237 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1238 o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1239 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1240 Test templates with pruned commits |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1241 ================================== |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1242 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1243 Test setup |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1244 ---------- |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1245 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1246 $ hg init $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1247 $ cd $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1248 $ mkcommit ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1249 $ mkcommit A0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1250 $ hg debugobsolete --record-parent `getid "."` |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1251 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1252 Check output |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1253 ------------ |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1254 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1255 $ hg up "desc(A0)" --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1257 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1258 @ 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1259 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1260 o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1261 |