Mercurial > evolve
annotate tests/test-evolve-templates.t @ 2497:1e9b86ed78c9
template: make the template definition more manageable
Readable config is readable
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 29 May 2017 17:10:45 +0200 |
parents | 5ed8af9c4a21 |
children | b765650b37ee |
rev | line source |
---|---|
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 This test file test the various templates for precursors and successors. |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 Global setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 ============ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 $ . $TESTDIR/testlib/common.sh |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 $ cat >> $HGRCPATH <<EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 > [ui] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 > interactive = true |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 > [phases] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 > publish=False |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 > [extensions] |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 > evolve = |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 > [alias] |
2497
1e9b86ed78c9
template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2496
diff
changeset
|
15 > tlog = log -G -T '{node|short}\ |
1e9b86ed78c9
template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2496
diff
changeset
|
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
1e9b86ed78c9
template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2496
diff
changeset
|
17 > \n Successors: {successors}\ |
1e9b86ed78c9
template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2496
diff
changeset
|
18 > \n Fate: {obsfate_quiet}\n' |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 > EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 Test templates on amended commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 ================================ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 ---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 $ hg init $TESTTMP/templates-local-amend |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 $ cd $TESTTMP/templates-local-amend |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 $ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 $ echo 42 >> A0 |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
32 $ hg amend -m "A1" |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
33 $ hg amend -m "A2" |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 $ hg log --hidden -G |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
35 @ changeset: 4:d004c8f274b9 |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 | date: Thu Jan 01 00:00:00 1970 +0000 |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
40 | summary: A2 |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
41 | |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
42 | x changeset: 3:a468dc9b3633 |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
43 |/ parent: 0:ea207398892e |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
44 | user: test |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
45 | date: Thu Jan 01 00:00:00 1970 +0000 |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
46 | summary: A1 |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 | x changeset: 2:f137d23bb3e1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 | | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 | | summary: temporary amend commit for 471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 | | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 $ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 working directory parent is obsolete! (471f378eab4c) |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
68 (use 'hg evolve' to update to its successor: d004c8f274b9) |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
69 |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
70 Precursors template should show current revision as it is the working copy |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
71 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
72 o d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
73 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
74 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
75 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
76 | @ 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
77 |/ Successors: [d004c8f274b9] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
78 | Fate: superseed as d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
79 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
80 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
81 Fate: |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
82 $ hg up 'desc(A1)' --hidden |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
84 working directory parent is obsolete! (a468dc9b3633) |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
85 (use 'hg evolve' to update to its successor: d004c8f274b9) |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
89 o d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
90 | Precursors: a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
91 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
92 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
93 | @ a468dc9b3633 |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
94 |/ Successors: [d004c8f274b9] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
95 | Fate: superseed as d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
96 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
97 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
98 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 Precursors template should show the precursor as we force its display with |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
100 --hidden |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
102 o d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
103 | Precursors: a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
104 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
105 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
106 | @ a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
107 |/ Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
108 | Successors: [d004c8f274b9] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
109 | Fate: superseed as d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
110 | x f137d23bb3e1 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
111 | | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
112 | | Fate: pruned |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
113 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
114 |/ Successors: [a468dc9b3633] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
115 | Fate: superseed as a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
116 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
117 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
118 Fate: |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
119 |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
120 $ hg up 'desc(A2)' |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
122 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
123 @ d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
124 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
125 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
126 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
127 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
128 Fate: |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
129 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
130 @ d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
131 | Precursors: a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
132 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
133 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
134 | x a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
135 |/ Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
136 | Successors: [d004c8f274b9] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
137 | Fate: superseed as d004c8f274b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
138 | x f137d23bb3e1 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
139 | | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
140 | | Fate: pruned |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
141 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
142 |/ Successors: [a468dc9b3633] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
143 | Fate: superseed as a468dc9b3633 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
144 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
145 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
146 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 Test templates with splitted commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 =================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 $ hg init $TESTTMP/templates-local-split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 $ cd $TESTTMP/templates-local-split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 $ echo 42 >> a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 $ echo 43 >> b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 $ hg commit -A -m "A0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 adding a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 adding b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 @ changeset: 1:471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 > y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 > y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 > n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 > n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 > y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 > y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 > EOF |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 adding a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 adding b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 diff --git a/a b/a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 examine changes to 'a'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 @@ -0,0 +1,1 @@ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 +42 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 record change 1/2 to 'a'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 diff --git a/b b/b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 examine changes to 'b'? [Ynesfdaq?] n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 created new head |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 Done splitting? [yN] n |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 diff --git a/b b/b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 new file mode 100644 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 examine changes to 'b'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 @@ -0,0 +1,1 @@ |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 +43 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 record this change to 'b'? [Ynesfdaq?] y |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 no more change to split |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 @ changeset: 3:f257fde29c7a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 o changeset: 2:337fec4d2edc |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
219 | x changeset: 1:471597cad322 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
220 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
225 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
226 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
227 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
228 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
229 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
232 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
233 $ hg up 'obsolete()' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
234 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 working directory parent is obsolete! (471597cad322) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
237 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
238 Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
239 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
240 o f257fde29c7a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
241 | Precursors: 471597cad322 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
242 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
243 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
244 o 337fec4d2edc |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
245 | Precursors: 471597cad322 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
246 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
247 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
248 | @ 471597cad322 |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
249 |/ Successors: [337fec4d2edc, f257fde29c7a] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
250 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
251 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
252 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
253 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 $ hg up f257fde29c7a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
255 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
256 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
257 Precursors template should not show a precursor as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
258 log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
259 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
260 @ f257fde29c7a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
261 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
262 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
263 o 337fec4d2edc |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
264 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
265 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
266 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
267 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
268 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
269 Precursors template should show the precursor as we force its display with |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
270 --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
272 @ f257fde29c7a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
273 | Precursors: 471597cad322 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
274 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
275 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
276 o 337fec4d2edc |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
277 | Precursors: 471597cad322 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
278 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
279 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
280 | x 471597cad322 |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
281 |/ Successors: [337fec4d2edc, f257fde29c7a] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
282 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
283 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
284 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
285 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 Test templates with folded commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 ============================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 ---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 $ hg init $TESTTMP/templates-local-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 $ cd $TESTTMP/templates-local-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 $ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 $ mkcommit B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 @ changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
304 o changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 2 changesets folded |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 @ changeset: 3:eb5a0daa2192 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 | summary: C0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 | x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 | | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 | | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 | | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
337 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 $ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
344 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
345 working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
350 o eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
351 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
352 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
353 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
354 | @ 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
355 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
356 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
357 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
358 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
359 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 $ hg up 'desc(B0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
361 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
362 working directory parent is obsolete! (0dec01379d3b) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
363 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
364 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 Precursors template should show both precursors as they should be both |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 displayed |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
367 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
368 o eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
369 | Precursors: 0dec01379d3b, 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
370 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
371 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
372 | @ 0dec01379d3b |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
373 | | Successors: [eb5a0daa2192] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
374 | | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
375 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
376 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
377 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
378 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
379 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
380 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
381 $ hg up 'desc(C0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
382 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
383 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 Precursors template should not show precursors as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
385 log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
386 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
387 @ eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
388 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
389 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
390 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
391 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
392 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
393 Precursors template should show both precursors as we force its display with |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
394 --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
395 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
396 @ eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
397 | Precursors: 0dec01379d3b, 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
398 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
399 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
400 | x 0dec01379d3b |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
401 | | Successors: [eb5a0daa2192] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
402 | | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
403 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
404 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
405 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
406 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
407 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
408 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
409 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
410 Test templates with divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
411 ============================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
412 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
413 Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
414 ---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
415 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
416 $ hg init $TESTTMP/templates-local-divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 $ cd $TESTTMP/templates-local-divergence |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
419 $ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
420 $ hg amend -m "A1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
421 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
422 @ changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
423 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
424 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 | summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
428 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 $ hg update --hidden 'desc(A0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 $ hg amend -m "A2" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 2 new divergent changesets |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 @ changeset: 3:65b757b745b9 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 | trouble: divergent |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
452 | summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 | o changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 |/ parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 | trouble: divergent |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 | summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
460 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 |
2487
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
471 $ hg amend -m 'A3' |
590da9c523ae
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
2486
diff
changeset
|
472 |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 $ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 Precursors template should show current revision as it is the working copy |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
483 o 019fadeab383 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
484 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
485 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
486 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
487 | o fdf9bde5129a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
488 |/ Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
489 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
490 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
491 | @ 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
492 |/ Successors: [fdf9bde5129a], [019fadeab383] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
493 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
494 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
495 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
496 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 $ hg up 'desc(A1)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 Precursors template should not show precursors as it's not displayed in the |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 log |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
501 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
502 o 019fadeab383 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
503 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
504 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
505 | @ fdf9bde5129a |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
506 |/ Successors: |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
507 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
508 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
509 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
510 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
511 Precursors template should a precursor as we force its display with --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
513 o 019fadeab383 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
514 | Precursors: 65b757b745b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
515 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
516 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
517 | x 65b757b745b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
518 |/ Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
519 | Successors: [019fadeab383] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
520 | Fate: superseed as 019fadeab383 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
521 | @ fdf9bde5129a |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
522 |/ Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
523 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
524 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
525 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
526 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
527 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
528 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
529 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
530 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 Test templates with amended + folded commit |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 =========================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 ---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
537 $ hg init $TESTTMP/templates-local-amend-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 $ cd $TESTTMP/templates-local-amend-fold |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 $ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 $ mkcommit B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 $ hg amend -m "B1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 @ changeset: 3:b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
546 | parent: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
548 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 | summary: B1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
550 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
551 | x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
556 o changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
558 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
563 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
565 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
566 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
567 2 changesets folded |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 @ changeset: 4:eb5a0daa2192 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 | summary: C0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 | x changeset: 3:b7ea6d14e664 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 | | parent: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 | | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 | | summary: B1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 | | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 | | x changeset: 2:0dec01379d3b |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 | |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 | | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 | | summary: B0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 | | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
595 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
600 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
601 $ hg up 'desc(A0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
603 working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
605 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
606 o eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
607 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
608 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
609 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
610 | @ 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
611 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
612 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
613 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
614 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
615 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
616 $ hg up 'desc(B0)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
617 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 working directory parent is obsolete! (0dec01379d3b) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
621 o eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
622 | Precursors: 0dec01379d3b, 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
623 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
624 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
625 | @ 0dec01379d3b |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
626 | | Successors: [eb5a0daa2192] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
627 | | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
628 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
629 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
630 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
631 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
632 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
633 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
634 $ hg up 'desc(B1)' --hidden |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
635 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
636 working directory parent is obsolete! (b7ea6d14e664) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
637 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
638 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
639 o eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
640 | Precursors: 471f378eab4c, b7ea6d14e664 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
641 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
642 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
643 | @ b7ea6d14e664 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
644 | | Successors: [eb5a0daa2192] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
645 | | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
646 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
647 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
648 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
649 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
650 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
651 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
652 $ hg up 'desc(C0)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
653 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
654 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
655 @ eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
656 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
657 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
658 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
659 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
660 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
661 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
662 @ eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
663 | Precursors: 471f378eab4c, b7ea6d14e664 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
664 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
665 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
666 | x b7ea6d14e664 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
667 | | Precursors: 0dec01379d3b |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
668 | | Successors: [eb5a0daa2192] |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
669 | | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
670 | | x 0dec01379d3b |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
671 | |/ Successors: [b7ea6d14e664] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
672 | | Fate: superseed as b7ea6d14e664 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
673 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
674 |/ Successors: [eb5a0daa2192] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
675 | Fate: superseed as eb5a0daa2192 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
676 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
677 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
678 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
679 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
680 Test template with pushed and pulled obs markers |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
681 ============================================== |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
682 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
683 Test setup |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
684 ---------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
685 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
686 $ hg init $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
687 $ cd $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
688 $ mkcommit ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
689 $ mkcommit A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
690 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
691 updating to branch default |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
692 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
693 $ cd $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
694 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
695 @ changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
696 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
697 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
698 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
699 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
700 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
701 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
702 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
703 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
704 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
705 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
706 $ cd $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
707 $ hg amend -m "A1" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
708 $ hg amend -m "A2" |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
709 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
710 @ changeset: 3:7a230b46bf61 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
711 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
712 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
713 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
714 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
715 | summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
716 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
717 | x changeset: 2:fdf9bde5129a |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
718 |/ parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
719 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
720 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
721 | summary: A1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
722 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
723 | x changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
724 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
725 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
726 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
727 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
728 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
729 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
730 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
731 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
732 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
733 $ cd $TESTTMP/templates-local-remote-markers-2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
734 $ hg pull |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
735 pulling from $TESTTMP/templates-local-remote-markers-1 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
736 searching for changes |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
737 adding changesets |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
738 adding manifests |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
739 adding file changes |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
740 added 1 changesets with 0 changes to 1 files (+1 heads) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
741 2 new obsolescence markers |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
742 (run 'hg heads' to see heads, 'hg merge' to merge) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
743 working directory parent is obsolete! (471f378eab4c) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
744 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 $ hg log --hidden -G |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 o changeset: 2:7a230b46bf61 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
747 | tag: tip |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 | parent: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
749 | user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
751 | summary: A2 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 | @ changeset: 1:471f378eab4c |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
754 |/ user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
755 | date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
756 | summary: A0 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 | |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
758 o changeset: 0:ea207398892e |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
759 user: test |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 date: Thu Jan 01 00:00:00 1970 +0000 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
761 summary: ROOT |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
764 Check templates |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
765 --------------- |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
766 |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
768 o 7a230b46bf61 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
769 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
770 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
771 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
772 | @ 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
773 |/ Successors: [7a230b46bf61] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
774 | Fate: superseed as 7a230b46bf61 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
775 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
776 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
777 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
778 $ hg up 'desc(A2)' |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
779 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
780 $ hg tlog |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
781 @ 7a230b46bf61 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
782 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
783 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
784 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
785 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
786 Fate: |
2486
cd4290f923b7
template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
787 $ hg tlog --hidden |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
788 @ 7a230b46bf61 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
789 | Precursors: 471f378eab4c |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
790 | Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
791 | Fate: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
792 | x 471f378eab4c |
2496
5ed8af9c4a21
template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2495
diff
changeset
|
793 |/ Successors: [7a230b46bf61] |
2495
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
794 | Fate: superseed as 7a230b46bf61 |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
795 o ea207398892e |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
796 Successors: |
0db53f48db2d
template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2494
diff
changeset
|
797 Fate: |