author | Jun Wu <quark@fb.com> |
Tue, 18 Jul 2017 01:34:55 -0700 | |
changeset 33833 | fb59192b4981 |
parent 33773 | 6c1a9fd8361b |
child 33912 | e278d6d2d7d2 |
permissions | -rw-r--r-- |
32879
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] |
33773
6c1a9fd8361b
test: update evolution config
Boris Feld <boris.feld@octobus.net>
parents:
33688
diff
changeset
|
13 |
> stabilization=all |
32879
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, "; ")}")}\ |
32909
89610c586fa2
templatekw: reference predecessor node id as {node} in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32879
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' |
32879
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 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
76 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
77 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
79 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
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"]] |
32879
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 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
92 |
| Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
93 |
| semi-colon: 3:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
95 |
| map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32879
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"]] |
32879
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 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
106 |
| Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
107 |
| semi-colon: 3:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |
| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
109 |
| map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
| @ a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
111 |
|/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
112 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
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"]] |
32879
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"]] |
32879
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 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
138 |
| Predecessors: 3:a468dc9b3633 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
139 |
| semi-colon: 3:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 |
| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
141 |
| map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
| x a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
143 |
|/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
144 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
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"]] |
32879
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"]] |
32879
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"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
193 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
@ changeset: 3:f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 |
o changeset: 2:337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |
| x changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 |
Check templates |
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 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 |
$ hg up 'obsolete()' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 |
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
|
223 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 |
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
|
225 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
226 |
o f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
227 |
| Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
228 |
| semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
229 |
| json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
230 |
| map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 |
o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
232 |
| Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
233 |
| semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
234 |
| json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
235 |
| map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 |
| @ 471597cad322 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
237 |
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
238 |
| multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
239 |
| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
240 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 |
$ hg up f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 |
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
|
244 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
245 |
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
|
246 |
the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
247 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
248 |
@ f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
250 |
o 337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
251 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 |
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
|
255 |
with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
256 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
257 |
@ f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
258 |
| Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
259 |
| semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
260 |
| json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
261 |
| map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
262 |
o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
263 |
| Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
264 |
| semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
265 |
| json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
266 |
| map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
267 |
| x 471597cad322 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
268 |
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
269 |
| multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
270 |
| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
273 |
Test templates with folded commit |
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 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
276 |
Test setup |
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 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
279 |
$ hg init $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 |
$ cd $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 |
$ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
282 |
$ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 |
$ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
285 |
@ changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 |
| summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 |
o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 |
Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 |
$ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 |
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
|
304 |
$ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 |
$ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 |
$ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 |
adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 |
adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 |
created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 |
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
311 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 |
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
313 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 |
@ changeset: 3:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 |
| summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 |
| x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 |
| | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 |
| | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 |
| | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 |
| x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 |
summary: ROOT |
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 |
Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
--------------- |
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 |
$ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 |
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
|
343 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
344 |
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
|
345 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 |
o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
347 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
348 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
350 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
351 |
| @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
352 |
|/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
353 |
| multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
354 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 |
o ea207398892e |
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 |
$ hg up 'desc(B0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 |
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
|
359 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 |
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
|
361 |
displayed |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
362 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
363 |
o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
364 |
| Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
365 |
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
367 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
368 |
| @ 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
369 |
| | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
370 |
| | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
371 |
| | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
372 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
373 |
|/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
374 |
| multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
375 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
376 |
o ea207398892e |
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 |
$ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
379 |
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
|
380 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
381 |
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
|
382 |
the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
383 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 |
@ eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
385 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
386 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
387 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
388 |
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
|
389 |
with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
390 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
391 |
@ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
392 |
| Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
393 |
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
394 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
395 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
396 |
| x 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
397 |
| | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
398 |
| | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
399 |
| | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
400 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
401 |
|/ Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
402 |
| multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
403 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
404 |
o ea207398892e |
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 templates with divergence |
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 |
Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
411 |
---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
412 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
413 |
$ hg init $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
414 |
$ cd $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
415 |
$ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
416 |
$ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 |
$ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
419 |
@ changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
420 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
421 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
422 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
423 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
424 |
| summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 |
| x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
428 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 |
$ hg update --hidden 'desc(A0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 |
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
|
438 |
$ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 |
@ changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
445 |
| instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 |
| summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 |
| o changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 |
|/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
452 |
| instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 |
| summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 |
| x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
460 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 |
$ hg commit --amend -m 'A3' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 |
@ changeset: 4:019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
472 |
| instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 |
| summary: A3 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 |
| x changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 |
|/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 |
| summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 |
| o changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 |
|/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
485 |
| instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |
| summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 |
| x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 |
summary: ROOT |
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 |
Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 |
--------------- |
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 |
$ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 |
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
|
504 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 |
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
|
506 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 |
o 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
508 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
509 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
510 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
511 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 |
| o fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
513 |
|/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
514 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
515 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
516 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
517 |
| @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
518 |
|/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
519 |
| multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
520 |
| multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
521 |
| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 |
o ea207398892e |
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 |
$ hg up 'desc(A1)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 |
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
|
526 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 |
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
|
528 |
the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
529 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 |
o 019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 |
| @ fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 |
|/ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 |
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
|
537 |
--hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 |
o 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
540 |
| Predecessors: 3:65b757b745b9 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
541 |
| semi-colon: 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 |
| json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
543 |
| map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 |
| x 65b757b745b9 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
545 |
|/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
546 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
548 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
549 |
| Successors: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
550 |
| multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
551 |
| json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 |
| @ fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
553 |
|/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
554 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
556 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
558 |
|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
559 |
| multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
560 |
| multi-line: 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
561 |
| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 |
o ea207398892e |
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 templates with amended + folded commit |
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 |
Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 |
---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 |
$ hg init $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 |
$ cd $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 |
$ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 |
$ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 |
$ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 |
$ hg commit --amend -m "B1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 |
@ changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 |
| parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 |
| summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 |
| x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 |
|/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 |
| summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 |
o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 |
| summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
595 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
600 |
# Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
601 |
$ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 |
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
|
603 |
$ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 |
$ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
605 |
$ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
606 |
adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
607 |
adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
608 |
created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
609 |
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
610 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
611 |
$ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
612 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
613 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
614 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
615 |
@ changeset: 4:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
616 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
617 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 |
| summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
621 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
622 |
| x changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
623 |
| | parent: 1:471f378eab4c |
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: B1 |
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: 2:0dec01379d3b |
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: B0 |
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 |
| x changeset: 1:471f378eab4c |
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: A0 |
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 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
639 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
640 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
641 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
642 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
643 |
Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
644 |
--------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
645 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
646 |
$ hg up 'desc(A0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
647 |
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
|
648 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
649 |
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
|
650 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
651 |
o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
652 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
653 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
654 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
655 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
656 |
| @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
657 |
|/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
658 |
| multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
659 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
660 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
661 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
662 |
$ hg up 'desc(B0)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
663 |
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
|
664 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
665 |
Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
666 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
667 |
o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
668 |
| Predecessors: 2:0dec01379d3b 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
669 |
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
670 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
671 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
672 |
| @ 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
673 |
| | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
674 |
| | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
675 |
| | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
676 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
677 |
|/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
678 |
| multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
679 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
680 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
681 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
682 |
$ hg up 'desc(B1)' --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
683 |
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
|
684 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
685 |
Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
686 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
687 |
o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
688 |
| Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
689 |
| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
690 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
691 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
692 |
| @ b7ea6d14e664 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
693 |
| | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
694 |
| | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
695 |
| | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
696 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
697 |
|/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
698 |
| multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
699 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
700 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
701 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
702 |
$ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
703 |
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
|
704 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
705 |
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
|
706 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
707 |
@ eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
708 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
709 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
710 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
711 |
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
|
712 |
with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
713 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
714 |
@ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
715 |
| Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
716 |
| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
717 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
718 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
719 |
| x b7ea6d14e664 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
720 |
| | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
721 |
| | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
722 |
| | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
723 |
| | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
724 |
| | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
725 |
| | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
726 |
| | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
727 |
| | x 0dec01379d3b |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
728 |
| |/ Successors: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
729 |
| | multi-line: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
730 |
| | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
731 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
732 |
|/ Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
733 |
| multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
734 |
| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
735 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
736 |
|
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 |
Test template with pushed and pulled obs markers |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
739 |
================================================ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
740 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
741 |
Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
742 |
---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
743 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
744 |
$ hg init $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 |
$ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 |
$ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
747 |
$ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 |
$ 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
|
749 |
updating to branch default |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 |
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
|
751 |
$ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 |
@ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
754 |
| tag: tip |
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: A0 |
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 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
761 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
764 |
$ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
765 |
$ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
766 |
$ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
768 |
@ changeset: 3:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
769 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
770 |
| parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
771 |
| user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
772 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
773 |
| summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
774 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
775 |
| x changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
776 |
|/ parent: 0:ea207398892e |
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: A1 |
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 |
| x changeset: 1:471f378eab4c |
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: A0 |
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 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
787 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
788 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
789 |
summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
790 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
791 |
$ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
792 |
$ hg pull |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
793 |
pulling from $TESTTMP/templates-local-remote-markers-1 (glob) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
794 |
searching for changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
795 |
adding changesets |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
796 |
adding manifests |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
797 |
adding file changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
798 |
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
|
799 |
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:
32911
diff
changeset
|
800 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
801 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
802 |
$ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
803 |
o changeset: 2:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
804 |
| tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
805 |
| parent: 0:ea207398892e |
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: A2 |
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 |
| @ changeset: 1:471f378eab4c |
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: A0 |
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 |
o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
816 |
user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
817 |
date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
818 |
summary: ROOT |
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 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
821 |
$ hg debugobsolete |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
822 |
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
|
823 |
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
|
824 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
825 |
Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
826 |
--------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
827 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
828 |
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
|
829 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
830 |
o 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
831 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
832 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
833 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
834 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
835 |
| @ 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
836 |
|/ Successors: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
837 |
| multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
838 |
| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
839 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
840 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
841 |
$ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
842 |
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
|
843 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
844 |
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
|
845 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
846 |
@ 7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
847 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
848 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
849 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
850 |
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
|
851 |
with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
852 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
853 |
@ 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
854 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
855 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
856 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
857 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
858 |
| x 471f378eab4c |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
859 |
|/ Successors: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
860 |
| multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
861 |
| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
862 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
863 |
|
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 |
Test template with obsmarkers cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
866 |
=================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
867 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
868 |
Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
869 |
---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
870 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
871 |
$ hg init $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
872 |
$ cd $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
873 |
$ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
874 |
$ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
875 |
$ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
876 |
$ hg up -r 0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
877 |
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
|
878 |
$ mkcommit C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
879 |
created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
880 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
881 |
Create the cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
882 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
883 |
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
884 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
885 |
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
886 |
obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
887 |
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
888 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
889 |
Check templates |
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 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
892 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
893 |
@ f897c6137566 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
894 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
895 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
896 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
897 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
898 |
$ hg up -r "desc(B0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
899 |
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
|
900 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
901 |
o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
902 |
| Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
903 |
| semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
904 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
905 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
906 |
| @ 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
907 |
| | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
908 |
| | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
909 |
| | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
910 |
| | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
911 |
| | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
912 |
| | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
913 |
| | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
914 |
| | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
915 |
| x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
916 |
|/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
917 |
| semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
918 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
919 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
920 |
| Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
921 |
| multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
922 |
| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
923 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
924 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
925 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
926 |
$ hg up -r "desc(A0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
927 |
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
|
928 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
929 |
o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
930 |
| Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
931 |
| semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
932 |
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
933 |
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
934 |
| @ 471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
935 |
|/ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
936 |
o ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
937 |
|
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 |
$ hg up -r "desc(ROOT)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
940 |
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
|
941 |
$ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
942 |
o f897c6137566 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
943 |
| |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
944 |
@ ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
945 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
946 |
|
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
947 |
$ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
948 |
o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
949 |
| Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
950 |
| semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
951 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
952 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
953 |
| x 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
954 |
| | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
955 |
| | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
956 |
| | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
957 |
| | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
958 |
| | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
959 |
| | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
960 |
| | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
961 |
| | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
962 |
| x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
963 |
|/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
964 |
| semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
965 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
966 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
967 |
| Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
968 |
| multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
969 |
| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
970 |
@ ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
971 |
|
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
972 |
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
|
973 |
================================================= |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
974 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
975 |
$ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
976 |
o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
977 |
| tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
978 |
| parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
979 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
980 |
| 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
|
981 |
| summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
982 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
983 |
@ changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
984 |
user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
985 |
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
|
986 |
summary: ROOT |
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 |
$ hg up |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
989 |
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
|
990 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
991 |
Create a commit with three files |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
992 |
$ touch A B C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
993 |
$ 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
|
994 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
995 |
Split it |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
996 |
$ hg up 3 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
997 |
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
|
998 |
$ touch A |
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" A |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1000 |
created new head |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1001 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1002 |
$ touch B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1003 |
$ 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
|
1004 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1005 |
$ touch C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1006 |
$ 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
|
1007 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1008 |
$ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1009 |
@ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1010 |
| tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1011 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1012 |
| 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
|
1013 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1014 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1015 |
o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1016 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1017 |
| 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
|
1018 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1019 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1020 |
o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1021 |
| parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1022 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1023 |
| 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
|
1024 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1025 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1026 |
| o changeset: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1027 |
|/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1028 |
| 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
|
1029 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1030 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1031 |
o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1032 |
| parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1033 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1034 |
| 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
|
1035 |
| summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1036 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1037 |
o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1038 |
user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1039 |
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
|
1040 |
summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1041 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1042 |
$ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1043 |
obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1044 |
$ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1045 |
@ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1046 |
| tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1047 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1048 |
| 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
|
1049 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1050 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1051 |
o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1052 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1053 |
| 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
|
1054 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1055 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1056 |
o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1057 |
| parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1058 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1059 |
| 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
|
1060 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1061 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1062 |
o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1063 |
| parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1064 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1065 |
| 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
|
1066 |
| summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1067 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1068 |
o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1069 |
user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1070 |
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
|
1071 |
summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1072 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1073 |
Diverge one of the splitted commit |
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 up 6 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1076 |
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
|
1077 |
$ 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
|
1078 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1079 |
$ hg up 6 --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1080 |
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
|
1081 |
$ 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
|
1082 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1083 |
$ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1084 |
@ changeset: 9:0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1085 |
| tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1086 |
| parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1087 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1088 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1089 |
| instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1090 |
| summary: Add B only |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1091 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1092 |
| o changeset: 8:b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1093 |
|/ parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1094 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1095 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1096 |
| instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1097 |
| summary: Add only B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1098 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1099 |
| o changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1100 |
| | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1101 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1102 |
| | instability: orphan, content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1103 |
| | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1104 |
| | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1105 |
| x changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1106 |
|/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1107 |
| 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
|
1108 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1109 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1110 |
o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1111 |
| parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1112 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1113 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
33688
2194a8723138
evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1114 |
| instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1115 |
| summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1116 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1117 |
o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1118 |
| parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1119 |
| user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1120 |
| 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
|
1121 |
| summary: C0 |
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 |
o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1124 |
user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1125 |
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
|
1126 |
summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1127 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1128 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1129 |
Check templates |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1130 |
--------------- |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1131 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1132 |
$ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1133 |
@ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1134 |
| Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1135 |
| semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1136 |
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1137 |
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1138 |
| o b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1139 |
|/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1140 |
| semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1141 |
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1142 |
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1143 |
| o ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1144 |
| | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1145 |
| x 4a004186e638 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1146 |
|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1147 |
| multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1148 |
| multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1149 |
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1150 |
o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1151 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1152 |
o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1153 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1154 |
o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1155 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1156 |
$ hg tlog --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1157 |
@ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1158 |
| Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1159 |
| semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1160 |
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1161 |
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1162 |
| o b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1163 |
|/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1164 |
| semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1165 |
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1166 |
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1167 |
| o ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1168 |
| | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1169 |
| | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1170 |
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1171 |
| | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1172 |
| x 4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1173 |
|/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1174 |
| semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1175 |
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1176 |
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1177 |
| Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1178 |
| multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1179 |
| multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1180 |
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1181 |
o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1182 |
| Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1183 |
| semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1184 |
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1185 |
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1186 |
| x 9bd10a0775e4 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1187 |
|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1188 |
| multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1189 |
| json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1190 |
o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1191 |
| Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1192 |
| semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1193 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1194 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1195 |
| x 0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1196 |
| | Predecessors: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1197 |
| | semi-colon: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1198 |
| | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1199 |
| | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1200 |
| | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1201 |
| | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1202 |
| | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1203 |
| | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1204 |
| x 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1205 |
|/ Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1206 |
| semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1207 |
| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1208 |
| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1209 |
| Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1210 |
| multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1211 |
| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1212 |
o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1213 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1214 |
$ hg up --hidden 4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1215 |
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
|
1216 |
$ 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
|
1217 |
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
|
1218 |
$ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1219 |
o eceed8f98ffc |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1220 |
| Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1221 |
| semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1222 |
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1223 |
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1224 |
| o 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1225 |
| | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1226 |
| | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1227 |
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1228 |
| | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1229 |
o | b18bc8331526 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1230 |
|/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1231 |
| semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1232 |
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1233 |
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1234 |
o dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1235 |
| Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1236 |
| semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1237 |
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1238 |
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1239 |
| @ 9bd10a0775e4 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1240 |
|/ 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
|
1241 |
| multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1242 |
| multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1243 |
| 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
|
1244 |
o f897c6137566 |
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 |
o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1247 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1248 |
Test templates with pruned commits |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1249 |
================================== |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1250 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1251 |
Test setup |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1252 |
---------- |
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 |
$ hg init $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1255 |
$ cd $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1256 |
$ mkcommit ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1257 |
$ mkcommit A0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1258 |
$ hg debugobsolete --record-parent `getid "."` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1259 |
obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1260 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1261 |
Check output |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1262 |
------------ |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1263 |
|
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1264 |
$ hg up "desc(A0)" --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1265 |
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
|
1266 |
$ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1267 |
@ 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1268 |
| |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1269 |
o ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1270 |