annotate tests/test-obsmarker-template.t @ 37238:684a6a261f30

bundle2: make source a mandatory argument for bundle2.applybundle() (API) Currently all the callers in the core pass the source argument, making it mandatory will help us storing right source value in bundleoperation() class. Differential Revision: https://phab.mercurial-scm.org/D2996
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 31 Mar 2018 14:54:12 +0530
parents 35a0f6f31eef
children ea63a2004d09
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 This test file test the various templates related to obsmarkers.
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
3 Global setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
4 ============
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
5
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
6 $ . $TESTDIR/testlib/obsmarker-common.sh
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 $ cat >> $HGRCPATH <<EOF
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8 > [ui]
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 > interactive = true
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 > [phases]
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 > publish=False
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12 > [experimental]
34865
a0100f34e20b config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
13 > evolution=true
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
14 > [templates]
33996
98fa777cd7a1 template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents: 33995
diff changeset
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
35010
b81ad5b78a81 obsfate: makes successorsetverb takes the markers as argument
Boris Feld <boris.feld@octobus.net>
parents: 34961
diff changeset
16 > obsfateverb = "{obsfateverb(successors, markers)}"
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
17 > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
33994
38f08eaba6b0 template: compute user in obsfateusers
Boris Feld <boris.feld@octobus.net>
parents: 33993
diff changeset
18 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
19 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
34576
50b46054b869 test: rename obsfate template alias
Boris Feld <boris.feld@octobus.net>
parents: 34575
diff changeset
20 > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
21 > [alias]
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
22 > tlog = log -G -T '{node|short}\
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
23 > {if(predecessors, "\n Predecessors: {predecessors}")}\
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
24 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
32909
89610c586fa2 templatekw: reference predecessor node id as {node} in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32879
diff changeset
25 > {if(predecessors, "\n json: {predecessors|json}")}\
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
26 > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
27 > {if(successorssets, "\n Successors: {successorssets}")}\
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
28 > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
29 > {if(successorssets, "\n json: {successorssets|json}")}\n'
34576
50b46054b869 test: rename obsfate template alias
Boris Feld <boris.feld@octobus.net>
parents: 34575
diff changeset
30 > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}'
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
31 > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}'
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
32 > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}'
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
33 > EOF
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
34
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
35 Test templates on amended commit
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
36 ================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
37
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
38 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
39 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
40
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
41 $ hg init $TESTTMP/templates-local-amend
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
42 $ cd $TESTTMP/templates-local-amend
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
43 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
44 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
45 $ echo 42 >> A0
34578
794018ed8af0 test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents: 34577
diff changeset
46 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
34575
dc91580a0a88 obsolete: add a devel.user.obsmarker
Boris Feld <boris.feld@octobus.net>
parents: 34287
diff changeset
47 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
48
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
49 $ hg log --hidden -G
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
50 @ changeset: 3:d004c8f274b9
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
51 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
52 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
53 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
54 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
55 | summary: A2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
56 |
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
57 | x changeset: 2:a468dc9b3633
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 |/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
61 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 | summary: A1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
65 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
66 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
67 | obsolete: rewritten using amend as 2:a468dc9b3633
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
68 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
69 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
70 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
71 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
72 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
73 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
74
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
75 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
76 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
77 $ hg up 'desc(A0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
78 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
79 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
81
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
82 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
83 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
84 o d004c8f274b9
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
85 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
86 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
87 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
88 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
89 | @ 471f378eab4c
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
90 |/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
91 | multi-line: 3:d004c8f274b9
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
92 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
93 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
94
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
95 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
96 o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
97 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
98 | @ 471f378eab4c
34578
794018ed8af0 test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents: 34577
diff changeset
99 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
100 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
101
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
102
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
103 $ hg fatelogkw
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
104 o d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
105 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
106 | @ 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
107 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
108 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
109
34852
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
110
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
111 $ hg log -G --config ui.logtemplate=
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
112 o changeset: 3:d004c8f274b9
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
113 | tag: tip
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
114 | parent: 0:ea207398892e
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
115 | user: test
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
116 | date: Thu Jan 01 00:00:00 1970 +0000
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
117 | summary: A2
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
118 |
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
119 | @ changeset: 1:471f378eab4c
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
120 |/ user: test
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
121 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
122 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
123 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
124 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
125 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
126 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
127 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
128 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
129
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
130
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
131 $ hg log -G -T "default"
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
132 o changeset: 3:d004c8f274b9
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
133 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
134 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
135 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
136 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
137 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
138 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
139 | @ changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
140 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
141 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
142 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
34852
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
143 | summary: A0
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
144 |
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
145 o changeset: 0:ea207398892e
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
146 user: test
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
147 date: Thu Jan 01 00:00:00 1970 +0000
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
148 summary: ROOT
d45236f3d38e log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents: 34851
diff changeset
149
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
150 $ hg up 'desc(A1)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
151 updating to a hidden changeset a468dc9b3633
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
152 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
154
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
155 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
156 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
157 o d004c8f274b9
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
158 | Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
159 | semi-colon: 2:a468dc9b3633
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
160 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
161 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
162 | @ a468dc9b3633
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
163 |/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
164 | multi-line: 3:d004c8f274b9
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
165 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
166 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
167
34577
3c1bb8a4275d test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents: 34576
diff changeset
168 $ hg fatelog
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
169 o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
170 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
171 | @ a468dc9b3633
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
172 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
173 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
174
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
175 Predecessors template should show all the predecessors as we force their display
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
176 with --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
177 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
178 o d004c8f274b9
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
179 | Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
180 | semi-colon: 2:a468dc9b3633
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
181 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
182 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
183 | @ a468dc9b3633
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
184 |/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
185 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
186 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
187 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
188 | Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
189 | multi-line: 3:d004c8f274b9
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
190 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
191 | x 471f378eab4c
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
192 |/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
193 | multi-line: 2:a468dc9b3633
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
194 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
195 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
196
34577
3c1bb8a4275d test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents: 34576
diff changeset
197 $ hg fatelog --hidden
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
198 o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
199 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
200 | @ a468dc9b3633
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
201 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
202 | x 471f378eab4c
34578
794018ed8af0 test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents: 34577
diff changeset
203 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
204 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
205
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
206
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
207 Predecessors template shouldn't show anything as all obsolete commit are not
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
208 visible.
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
209 $ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
210 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
211 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
212 @ d004c8f274b9
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
213 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
214 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
215
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
216 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
217 @ d004c8f274b9
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
218 | Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
219 | semi-colon: 2:a468dc9b3633
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
220 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
221 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
222 | x a468dc9b3633
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
223 |/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
224 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
225 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
226 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
227 | Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
228 | multi-line: 3:d004c8f274b9
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
229 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
230 | x 471f378eab4c
34085
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
231 |/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 33997
diff changeset
232 | multi-line: 2:a468dc9b3633
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
233 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
234 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
235
34577
3c1bb8a4275d test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents: 34576
diff changeset
236 $ hg fatelog
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
237 @ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
238 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
239 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
240
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
241
34577
3c1bb8a4275d test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents: 34576
diff changeset
242 $ hg fatelog --hidden
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
243 @ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
244 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
245 | x a468dc9b3633
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
246 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
247 | x 471f378eab4c
34578
794018ed8af0 test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents: 34577
diff changeset
248 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
249 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
250
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
251 $ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
252 @ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
253 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
254 | x a468dc9b3633
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
255 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
256 | x 471f378eab4c
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
257 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
258 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
259
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
260
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
261 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
262 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
263
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
264 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
265 @ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
266 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
267 | x a468dc9b3633
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
268 |/ Obsfate: rewritten using amend as 3:d004c8f274b9
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
269 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
270 |/ Obsfate: rewritten using amend as 2:a468dc9b3633
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
271 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
272
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
273 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
274 @ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
275 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
276 | x a468dc9b3633
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
277 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
278 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
279 |/ Obsfate: rewritten using amend as 2:a468dc9b3633
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
280 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
281
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
282 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
283 @ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
284 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
285 | x a468dc9b3633
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
286 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
287 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
288 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
289 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
290
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
291
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
292 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
293 @ changeset: 3:d004c8f274b9
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
294 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
295 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
296 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
297 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
298 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
299 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
300 | x changeset: 2:a468dc9b3633
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
301 |/ parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
302 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
303 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
304 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
305 | summary: A1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
306 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
307 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
308 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
309 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
310 | obsolete: rewritten using amend as 2:a468dc9b3633
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
311 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
312 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
313 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
314 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
315 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
316 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
317
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
318 $ hg log -G -T "default" --hidden -v
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
319 @ changeset: 3:d004c8f274b9
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
320 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
321 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
322 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
323 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
324 | files: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
325 | description:
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
326 | A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
327 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
328 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
329 | x changeset: 2:a468dc9b3633
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
330 |/ parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
331 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
332 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
333 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
334 | files: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
335 | description:
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
336 | A1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
337 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
338 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
339 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
340 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
341 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
342 | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
343 | files: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
344 | description:
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
345 | A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
346 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
347 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
348 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
349 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
350 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
351 files: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
352 description:
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
353 ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
354
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
355
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
356 Test templates with splitted commit
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
357 ===================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
358
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
359 $ hg init $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
360 $ cd $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
361 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
362 $ echo 42 >> a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
363 $ echo 43 >> b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
364 $ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
365 adding a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
366 adding b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
367 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
368 @ changeset: 1:471597cad322
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
369 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
370 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
371 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
372 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
373 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
374 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
375 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
376 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
377 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
378
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
379 # Simulate split
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
380 $ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
381 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
382 $ echo 42 >> a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
383 $ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
384 adding a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
385 created new head
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
386 $ echo 43 >> b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
387 $ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
388 adding b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
389 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
390 obsoleted 1 changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
391
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
392 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
393 @ changeset: 3:f257fde29c7a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
394 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
395 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
396 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
397 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
398 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
399 o changeset: 2:337fec4d2edc
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
400 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
401 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
402 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
403 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
404 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
405 | x changeset: 1:471597cad322
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
406 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
407 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
408 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
409 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
410 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
411 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
412 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
413 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
414 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
415
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
416 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
417 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
418
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
419 $ hg up 'obsolete()' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
420 updating to a hidden changeset 471597cad322
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
421 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
422 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
423
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
424 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
425 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
426 o f257fde29c7a
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
427 | Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
428 | semi-colon: 1:471597cad322
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
429 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
430 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
431 o 337fec4d2edc
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
432 | Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
433 | semi-colon: 1:471597cad322
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
435 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
436 | @ 471597cad322
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
437 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
438 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
439 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
440 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
441
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
442
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
443 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
444 o f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
445 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
446 o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
447 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
448 | @ 471597cad322
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
449 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
450 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
451
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
452 $ hg up f257fde29c7a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
453 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
454
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
455 Predecessors template should not show a predecessor as it's not displayed in
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
456 the log
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
458 @ f257fde29c7a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
459 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
460 o 337fec4d2edc
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
461 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
462 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
463
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
464 Predecessors template should show both predecessors as we force their display
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
465 with --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
466 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
467 @ f257fde29c7a
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
468 | Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
469 | semi-colon: 1:471597cad322
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
470 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
471 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
472 o 337fec4d2edc
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
473 | Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
474 | semi-colon: 1:471597cad322
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
475 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
476 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
477 | x 471597cad322
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
478 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
479 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
480 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
481 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
482
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
483
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
484 $ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
485 @ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
486 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
487 o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
488 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
489 | x 471597cad322
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
490 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
491 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
492
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
493 $ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
494 @ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
495 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
496 o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
497 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
498 | x 471597cad322
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
499 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
500 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
501
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
502 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
503 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
504
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
505 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
506 @ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
507 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
508 o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
509 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
510 | x 471597cad322
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
511 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
512 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
513
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
514 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
515 @ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
516 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
517 o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
518 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
519 | x 471597cad322
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
520 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
521 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
522
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
523 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
524 @ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
525 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
526 o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
527 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
528 | x 471597cad322
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
529 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
530 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
531
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
532
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
533 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
534 @ changeset: 3:f257fde29c7a
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
535 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
536 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
537 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
538 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
539 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
540 o changeset: 2:337fec4d2edc
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
541 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
542 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
543 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
544 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
545 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
546 | x changeset: 1:471597cad322
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
547 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
548 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
549 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
550 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
551 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
552 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
553 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
554 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
555 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
556
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
557
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
558 Test templates with folded commit
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
559 =================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
560
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
561 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
562 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
563
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
564 $ hg init $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
565 $ cd $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
566 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
567 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
568 $ mkcommit B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
569 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
570 @ changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
571 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
572 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
573 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
574 | summary: B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
575 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
576 o changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
577 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
578 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
579 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
580 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
581 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
582 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
583 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
584 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
585
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
586 Simulate a fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
587 $ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
588 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
589 $ echo "A0" > A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
590 $ echo "B0" > B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
591 $ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
592 adding A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
593 adding B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
594 created new head
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
595 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
596 obsoleted 1 changesets
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
597 1 new orphan changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
598 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
599 obsoleted 1 changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
600
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
601 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602 @ changeset: 3:eb5a0daa2192
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
603 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
604 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
605 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
606 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
607 | summary: C0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
608 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
609 | x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
610 | | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
611 | | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
612 | | obsolete: rewritten as 3:eb5a0daa2192
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
613 | | summary: B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
614 | |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
615 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
616 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
617 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
618 | obsolete: rewritten as 3:eb5a0daa2192
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
619 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
620 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
621 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
622 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
623 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
624 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
625
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
626 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
627 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
628
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
629 $ hg up 'desc(A0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
630 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
631 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
632 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
633
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
634 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
635 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
636 o eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
637 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
638 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
639 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
640 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
641 | @ 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
642 |/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
643 | multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
644 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
645 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
646
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
647
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
648 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
649 o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
650 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
651 | @ 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
652 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
653 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
654
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
655 $ hg up 'desc(B0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
656 updating to a hidden changeset 0dec01379d3b
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
657 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
658 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
659
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
660 Predecessors template should show both predecessors as they should be both
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
661 displayed
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
662 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
663 o eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
664 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
665 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
666 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
667 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
668 | @ 0dec01379d3b
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
669 | | Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
670 | | multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
671 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
672 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
673 |/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
674 | multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
675 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
676 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
677
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
678
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
679 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
680 o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
681 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
682 | @ 0dec01379d3b
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
683 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
684 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
685 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
686 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
687
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
688 $ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
689 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
690
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
691 Predecessors template should not show predecessors as they are not displayed in
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
692 the log
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
693 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
694 @ eb5a0daa2192
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
695 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
696 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
697
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
698 Predecessors template should show both predecessors as we force their display
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
699 with --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
700 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
701 @ eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
702 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
703 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
704 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
705 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
706 | x 0dec01379d3b
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
707 | | Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
708 | | multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
709 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
710 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
711 |/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
712 | multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
713 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
714 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
715
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
716
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
717 $ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
718 @ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
719 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
720 | x 0dec01379d3b
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
721 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
722 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
723 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
724 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
725
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
726
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
727 $ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
728 @ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
729 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
730 | x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
731 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
732 | x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
733 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
734 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
735
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
736 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
737 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
738
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
739 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
740 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
741 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
742 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
743 | | Obsfate: rewritten as 3:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
744 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
745 |/ Obsfate: rewritten as 3:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
746 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
747
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
748 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
749 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
750 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
751 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
752 | | Obsfate: rewritten as 3:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
753 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
754 |/ Obsfate: rewritten as 3:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
755 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
756
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
757 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
758 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
759 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
760 | x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
761 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
762 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
763 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
764 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
765
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
766 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
767 @ changeset: 3:eb5a0daa2192
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
768 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
769 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
770 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
771 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
772 | summary: C0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
773 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
774 | x changeset: 2:0dec01379d3b
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
775 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
776 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
777 | | obsolete: rewritten as 3:eb5a0daa2192
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
778 | | summary: B0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
779 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
780 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
781 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
782 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
783 | obsolete: rewritten as 3:eb5a0daa2192
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
784 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
785 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
786 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
787 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
788 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
789 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
790
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
791
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
792 Test templates with divergence
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
793 ==============================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
794
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
795 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
796 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
797
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
798 $ hg init $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
799 $ cd $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
800 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
801 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
802 $ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
803 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
804 @ changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
805 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
806 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
807 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
808 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
809 | summary: A1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
810 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
811 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
812 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
813 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
814 | obsolete: rewritten using amend as 2:fdf9bde5129a
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
815 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
816 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
817 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
818 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
819 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
820 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
821
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
822 $ hg update --hidden 'desc(A0)'
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
823 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
824 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
825 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
826 $ hg commit --amend -m "A2"
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
827 2 new content-divergent changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
828 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
829 @ changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
830 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
831 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
832 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
833 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
834 | instability: content-divergent
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
835 | summary: A2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
836 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
837 | * changeset: 2:fdf9bde5129a
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
838 |/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
839 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
840 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
841 | instability: content-divergent
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
842 | summary: A1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
843 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
844 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
845 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
846 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
847 | obsolete: rewritten using amend as 2:fdf9bde5129a
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
848 | obsolete: rewritten using amend as 3:65b757b745b9
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
849 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
850 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
851 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
852 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
853 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
854 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
855
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
856 $ hg commit --amend -m 'A3'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
857 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
858 @ changeset: 4:019fadeab383
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
859 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
860 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
861 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
862 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
863 | instability: content-divergent
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
864 | summary: A3
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
865 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
866 | x changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
867 |/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
868 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
869 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
870 | obsolete: rewritten using amend as 4:019fadeab383
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
871 | summary: A2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
872 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
873 | * changeset: 2:fdf9bde5129a
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
874 |/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
875 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
876 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
877 | instability: content-divergent
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
878 | summary: A1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
879 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
880 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
881 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
882 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
883 | obsolete: rewritten using amend as 2:fdf9bde5129a
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
884 | obsolete: rewritten using amend as 3:65b757b745b9
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
885 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
886 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
887 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
888 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
889 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
890 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
891
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
892
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
893 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
894 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
895
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
896 $ hg up 'desc(A0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
897 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
898 (hidden revision '471f378eab4c' has diverged)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
900
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
901 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
902 $ hg tlog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
903 * 019fadeab383
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
904 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
905 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
906 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
907 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
908 | * fdf9bde5129a
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
909 |/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
910 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
911 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
912 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
913 | @ 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
914 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
915 | multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
916 | multi-line: 4:019fadeab383
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
917 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
918 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
919
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
920 $ hg fatelog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
921 * 019fadeab383
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
922 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
923 | * fdf9bde5129a
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
924 |/
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
925 | @ 471f378eab4c
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
926 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
927 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
928
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
929 $ hg up 'desc(A1)'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
930 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
931
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
932 Predecessors template should not show predecessors as they are not displayed in
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
933 the log
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
934 $ hg tlog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
935 * 019fadeab383
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
936 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
937 | @ fdf9bde5129a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
938 |/
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
939 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
940
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
941
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
942 $ hg fatelog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
943 * 019fadeab383
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
944 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
945 | @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
946 |/
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
947 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
948
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
949 Predecessors template should the predecessors as we force their display with
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
950 --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
951 $ hg tlog --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
952 * 019fadeab383
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
953 | Predecessors: 3:65b757b745b9
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
954 | semi-colon: 3:65b757b745b9
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
955 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
956 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
957 | x 65b757b745b9
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
958 |/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
959 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
960 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
961 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
962 | Successors: 4:019fadeab383
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
963 | multi-line: 4:019fadeab383
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
964 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
965 | @ fdf9bde5129a
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
966 |/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
967 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
968 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
969 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
970 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
971 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
972 | multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
973 | multi-line: 3:65b757b745b9
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
974 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
975 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
976
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
977
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
978 $ hg fatelog --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
979 * 019fadeab383
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
980 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
981 | x 65b757b745b9
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
982 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
983 | @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
984 |/
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
985 | x 471f378eab4c
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
986 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
987 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
988
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
989
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
990 $ hg fatelogjson --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
991 * 019fadeab383
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
992 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
993 | x 65b757b745b9
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
994 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
995 | @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
996 |/
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
997 | x 471f378eab4c
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
998 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
999 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1000
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1001
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1002 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1003 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1004
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1005 $ hg fatelogkw --hidden -q
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1006 * 019fadeab383
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1007 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1008 | x 65b757b745b9
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1009 |/ Obsfate: rewritten using amend as 4:019fadeab383
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1010 | @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1011 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1012 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1013 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1014 | Obsfate: rewritten using amend as 3:65b757b745b9
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1015 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1016
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1017 $ hg fatelogkw --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1018 * 019fadeab383
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1019 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1020 | x 65b757b745b9
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1021 |/ Obsfate: rewritten using amend as 4:019fadeab383
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1022 | @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1023 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1024 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1025 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1026 | Obsfate: rewritten using amend as 3:65b757b745b9
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1027 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1028
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1029 $ hg fatelogkw --hidden -v
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1030 * 019fadeab383
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1031 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1032 | x 65b757b745b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1033 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1034 | @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1035 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1036 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1037 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1038 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1039 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1040
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1041 $ hg log -G -T "default" --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1042 * changeset: 4:019fadeab383
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1043 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1044 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1045 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1046 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1047 | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1048 | summary: A3
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1049 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1050 | x changeset: 3:65b757b745b9
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1051 |/ parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1052 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1053 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1054 | obsolete: rewritten using amend as 4:019fadeab383
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1055 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1056 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1057 | @ changeset: 2:fdf9bde5129a
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1058 |/ parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1059 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1060 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1061 | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1062 | summary: A1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1063 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1064 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1065 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1066 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1067 | obsolete: rewritten using amend as 2:fdf9bde5129a
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1068 | obsolete: rewritten using amend as 3:65b757b745b9
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1069 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1070 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1071 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1072 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1073 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1074 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1075
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1076
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1077 Test templates with amended + folded commit
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1078 ===========================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1079
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1080 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1081 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1082
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1083 $ hg init $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1084 $ cd $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1085 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1086 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1087 $ mkcommit B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1088 $ hg commit --amend -m "B1"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1089 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1090 @ changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1091 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1092 | parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1093 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1094 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1095 | summary: B1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1096 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1097 | x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1098 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1099 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1100 | obsolete: rewritten using amend as 3:b7ea6d14e664
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1101 | summary: B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1102 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1103 o changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1104 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1105 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1106 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1107 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1108 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1109 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1110 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1111 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1112
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1113 # Simulate a fold
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1114 $ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1115 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1116 $ echo "A0" > A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1117 $ echo "B0" > B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1118 $ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1119 adding A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1120 adding B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1121 created new head
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1122 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
1123 obsoleted 1 changesets
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
1124 1 new orphan changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1125 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
1126 obsoleted 1 changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1127
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1128 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1129 @ changeset: 4:eb5a0daa2192
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1130 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1131 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1132 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1133 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1134 | summary: C0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1135 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1136 | x changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1137 | | parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1138 | | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1139 | | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1140 | | obsolete: rewritten as 4:eb5a0daa2192
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1141 | | summary: B1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1142 | |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1143 | | x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1144 | |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1145 | | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1146 | | obsolete: rewritten using amend as 3:b7ea6d14e664
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1147 | | summary: B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1148 | |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1149 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1150 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1151 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1152 | obsolete: rewritten as 4:eb5a0daa2192
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1153 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1154 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1155 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1156 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1157 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1158 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1159
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1160 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1161 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1162
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1163 $ hg up 'desc(A0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
1164 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
1165 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1166 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1167
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1168 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1169 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1170 o eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1171 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1172 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1173 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1174 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1175 | @ 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1176 |/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1177 | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1178 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1179 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1180
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1181
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1182 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1183 o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1184 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1185 | @ 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1186 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1187 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1188
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1189 $ hg up 'desc(B0)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
1190 updating to a hidden changeset 0dec01379d3b
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
1191 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1193
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1194 Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1195 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1196 o eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1197 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1198 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1199 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1200 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1201 | @ 0dec01379d3b
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1202 | | Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1203 | | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1204 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1205 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1206 |/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1207 | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1208 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1209 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1210
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1211
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1212 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1213 o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1214 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1215 | @ 0dec01379d3b
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
1216 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1217 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1218 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1219 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1220
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1221 $ hg up 'desc(B1)' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
1222 updating to a hidden changeset b7ea6d14e664
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
1223 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1224 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1225
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1226 Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1227 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1228 o eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1229 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1230 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1231 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1232 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1233 | @ b7ea6d14e664
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1234 | | Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1235 | | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1236 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1237 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1238 |/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1239 | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1240 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1241 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1242
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1243
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1244 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1245 o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1246 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1247 | @ b7ea6d14e664
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1248 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1249 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1250 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1251 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1252
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1253 $ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1254 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1255
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1256 Predecessors template should show no predecessors as they are both non visible
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1257 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1258 @ eb5a0daa2192
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1259 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1260 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1261
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1262
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1263 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1264 @ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1265 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1266 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1267
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1268 Predecessors template should show all predecessors as we force their display
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1269 with --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1270 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1271 @ eb5a0daa2192
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1272 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1273 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1274 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1275 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1276 | x b7ea6d14e664
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1277 | | Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1278 | | semi-colon: 2:0dec01379d3b
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1279 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1280 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1281 | | Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1282 | | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1283 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1284 | | x 0dec01379d3b
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1285 | |/ Successors: 3:b7ea6d14e664
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1286 | | multi-line: 3:b7ea6d14e664
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1287 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1288 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1289 |/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1290 | multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1291 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1292 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1293
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1294
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1295 $ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1296 @ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1297 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1298 | x b7ea6d14e664
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1299 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1300 | | x 0dec01379d3b
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
1301 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1302 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1303 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1304 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1305
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1306
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1307 $ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1308 @ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1309 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1310 | x b7ea6d14e664
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1311 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1312 | | x 0dec01379d3b
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
1313 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1314 | x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1315 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1316 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1317
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1318
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1319 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1320 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1321
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1322 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1323 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1324 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1325 | x b7ea6d14e664
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1326 | | Obsfate: rewritten as 4:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1327 | | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1328 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1329 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1330 |/ Obsfate: rewritten as 4:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1331 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1332
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1333 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1334 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1335 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1336 | x b7ea6d14e664
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1337 | | Obsfate: rewritten as 4:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1338 | | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1339 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1340 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1341 |/ Obsfate: rewritten as 4:eb5a0daa2192
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1342 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1343
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1344 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1345 @ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1346 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1347 | x b7ea6d14e664
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1348 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1349 | | x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1350 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1351 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1352 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1353 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1354
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1355 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1356 @ changeset: 4:eb5a0daa2192
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1357 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1358 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1359 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1360 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1361 | summary: C0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1362 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1363 | x changeset: 3:b7ea6d14e664
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1364 | | parent: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1365 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1366 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1367 | | obsolete: rewritten as 4:eb5a0daa2192
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1368 | | summary: B1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1369 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1370 | | x changeset: 2:0dec01379d3b
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1371 | |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1372 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1373 | | obsolete: rewritten using amend as 3:b7ea6d14e664
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1374 | | summary: B0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1375 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1376 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1377 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1378 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1379 | obsolete: rewritten as 4:eb5a0daa2192
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1380 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1381 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1382 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1383 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1384 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1385 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1386
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1387
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1388 Test template with pushed and pulled obs markers
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1389 ================================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1390
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1391 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1392 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1393
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1394 $ hg init $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1395 $ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1396 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1397 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1398 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1399 updating to branch default
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1400 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1401 $ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1402 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1403 @ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1404 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1405 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1406 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1407 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1408 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1409 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1410 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1411 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1412 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1413
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1414 $ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1415 $ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1416 $ hg commit --amend -m "A2"
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1417 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1418 @ changeset: 3:7a230b46bf61
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1419 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1420 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1421 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1422 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1423 | summary: A2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1424 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1425 | x changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1426 |/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1427 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1428 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1429 | obsolete: rewritten using amend as 3:7a230b46bf61
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1430 | summary: A1
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1431 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1432 | x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1433 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1434 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1435 | obsolete: rewritten using amend as 2:fdf9bde5129a
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1436 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1437 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1438 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1439 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1440 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1441 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1442
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1443 $ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1444 $ hg pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35010
diff changeset
1445 pulling from $TESTTMP/templates-local-remote-markers-1
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1446 searching for changes
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1447 adding changesets
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1448 adding manifests
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1449 adding file changes
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1450 added 1 changesets with 0 changes to 1 files (+1 heads)
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1451 2 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32911
diff changeset
1452 obsoleted 1 changesets
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34578
diff changeset
1453 new changesets 7a230b46bf61
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1454 (run 'hg heads' to see heads, 'hg merge' to merge)
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1455 $ hg log --hidden -G
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1456 o changeset: 2:7a230b46bf61
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1457 | tag: tip
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1458 | parent: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1459 | user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1460 | date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1461 | summary: A2
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1462 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1463 | @ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1464 |/ user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1465 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1466 | obsolete: rewritten using amend as 2:7a230b46bf61
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1467 | summary: A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1468 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1469 o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1470 user: test
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1471 date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1472 summary: ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1473
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1474
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1475 $ hg debugobsolete
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
1476 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
1477 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1478
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1479 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1480 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1481
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1482 Predecessors template should show current revision as it is the working copy
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1483 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1484 o 7a230b46bf61
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1485 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1486 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1487 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1488 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1489 | @ 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1490 |/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1491 | multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1492 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1493 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1494
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1495
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1496 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1497 o 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1498 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1499 | @ 471f378eab4c
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
1500 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1501 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1502
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1503 $ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1504 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1505
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1506 Predecessors template should show no predecessors as they are non visible
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1507 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1508 @ 7a230b46bf61
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1509 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1510 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1511
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1512
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1513 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1514 @ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1515 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1516 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1517
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1518 Predecessors template should show all predecessors as we force their display
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1519 with --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1520 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1521 @ 7a230b46bf61
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1522 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1523 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1524 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1525 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1526 | x 471f378eab4c
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1527 |/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1528 | multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1529 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1530 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1531
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1532
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1533 $ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1534 @ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1535 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1536 | x 471f378eab4c
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
1537 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1538 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1539
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1540
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1541 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1542 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1543
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1544 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1545 @ 7a230b46bf61
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1546 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1547 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1548 |/ Obsfate: rewritten using amend as 2:7a230b46bf61
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1549 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1550
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1551 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1552 @ 7a230b46bf61
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1553 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1554 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1555 |/ Obsfate: rewritten using amend as 2:7a230b46bf61
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1556 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1557
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1558 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1559 @ 7a230b46bf61
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1560 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1561 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1562 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1563 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1564
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1565 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1566 @ changeset: 2:7a230b46bf61
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1567 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1568 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1569 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1570 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1571 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1572 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1573 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1574 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1575 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1576 | obsolete: rewritten using amend as 2:7a230b46bf61
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1577 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1578 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1579 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1580 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1581 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1582 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1583
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1584
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1585 Test template with obsmarkers cycle
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1586 ===================================
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1587
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1588 Test setup
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1589 ----------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1590
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1591 $ hg init $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1592 $ cd $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1593 $ mkcommit ROOT
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1594 $ mkcommit A0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1595 $ mkcommit B0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1596 $ hg up -r 0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1597 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1598 $ mkcommit C0
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1599 created new head
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1600
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1601 Create the cycle
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1602
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1603 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
1604 obsoleted 1 changesets
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
1605 1 new orphan changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1606 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
1607 obsoleted 1 changesets
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1608 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1609
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1610 Check templates
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1611 ---------------
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1612
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1613 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1614 @ f897c6137566
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1615 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1616 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1617
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1618
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1619 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1620 @ f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1621 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1622 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1623
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1624
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1625 $ hg up -r "desc(B0)" --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
1626 updating to a hidden changeset 0dec01379d3b
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
1627 (hidden revision '0dec01379d3b' is pruned)
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1628 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1629 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1630 o f897c6137566
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1631 | Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1632 | semi-colon: 2:0dec01379d3b
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1633 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1634 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1635 | @ 0dec01379d3b
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1636 | | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1637 | | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1638 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1639 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1640 | | Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1641 | | multi-line: 3:f897c6137566
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1642 | | multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1643 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1644 | x 471f378eab4c
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1645 |/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1646 | semi-colon: 2:0dec01379d3b
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1647 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1648 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1649 | Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1650 | multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1651 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1652 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1653
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1654
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1655 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1656 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1657 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1658 | @ 0dec01379d3b
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1659 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1660 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
1661 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1662 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1663
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1664
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1665 $ hg up -r "desc(A0)" --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1666 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1667 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1668 o f897c6137566
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1669 | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1670 | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1671 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1672 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1673 | @ 471f378eab4c
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1674 |/
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1675 o ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1676
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1677
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1678 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1679 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1680 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1681 | @ 471f378eab4c
33996
98fa777cd7a1 template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents: 33995
diff changeset
1682 |/ Obsfate: pruned;
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1683 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1684
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1685
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1686 $ hg up -r "desc(ROOT)" --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1687 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1688 $ hg tlog
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1689 o f897c6137566
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1690 |
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1691 @ ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1692
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1693
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1694 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1695 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1696 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1697 @ ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1698
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1699
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1700 $ hg tlog --hidden
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1701 o f897c6137566
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1702 | Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1703 | semi-colon: 2:0dec01379d3b
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1704 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1705 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1706 | x 0dec01379d3b
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1707 | | Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1708 | | semi-colon: 1:471f378eab4c
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1709 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1710 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1711 | | Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1712 | | multi-line: 3:f897c6137566
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1713 | | multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1714 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1715 | x 471f378eab4c
32911
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1716 |/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents: 32910
diff changeset
1717 | semi-colon: 2:0dec01379d3b
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1718 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910
498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents: 32909
diff changeset
1719 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1720 | Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1721 | multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1722 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1723 @ ea207398892e
1858fc2327ef template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1724
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1725
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1726 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1727 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1728
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1729 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1730 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1731 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1732 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1733 | | Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1734 | | Obsfate: rewritten as 1:471f378eab4c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1735 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1736 |/ Obsfate: rewritten as 2:0dec01379d3b
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1737 @ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1738
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1739 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1740 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1741 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1742 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1743 | | Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1744 | | Obsfate: rewritten as 1:471f378eab4c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1745 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
1746 |/ Obsfate: rewritten as 2:0dec01379d3b
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1747 @ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1748
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1749 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1750 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1751 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1752 | x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1753 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1754 | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1755 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1756 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1757 @ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1758
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1759 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1760 o changeset: 3:f897c6137566
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1761 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1762 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1763 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1764 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1765 | summary: C0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1766 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1767 | x changeset: 2:0dec01379d3b
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1768 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1769 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1770 | | obsolete: rewritten as 3:f897c6137566
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1771 | | obsolete: rewritten as 1:471f378eab4c
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1772 | | summary: B0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1773 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1774 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1775 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1776 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
1777 | obsolete: rewritten as 2:0dec01379d3b
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1778 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1779 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1780 @ changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1781 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1782 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1783 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
1784
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
1785
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1786 Test template with split + divergence with cycles
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1787 =================================================
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1788
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1789 $ hg log -G
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1790 o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1791 | tag: tip
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1792 | parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1793 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1794 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1795 | summary: C0
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1796 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1797 @ changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1798 user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1799 date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1800 summary: ROOT
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1801
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1802 $ hg up
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1803 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1804
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1805 Create a commit with three files
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1806 $ touch A B C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1807 $ hg commit -A -m "Add A,B,C" A B C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1808
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1809 Split it
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1810 $ hg up 3
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1811 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1812 $ touch A
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1813 $ hg commit -A -m "Add A,B,C" A
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1814 created new head
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1815
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1816 $ touch B
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1817 $ hg commit -A -m "Add A,B,C" B
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1818
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1819 $ touch C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1820 $ hg commit -A -m "Add A,B,C" C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1821
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1822 $ hg log -G
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1823 @ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1824 | tag: tip
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1825 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1826 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1827 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1828 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1829 o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1830 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1831 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1832 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1833 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1834 o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1835 | parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1836 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1837 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1838 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1839 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1840 | o changeset: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1841 |/ user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1842 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1843 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1844 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1845 o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1846 | parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1847 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1848 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1849 | summary: C0
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1850 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1851 o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1852 user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1853 date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1854 summary: ROOT
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1855
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1856 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
1857 obsoleted 1 changesets
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1858 $ hg log -G
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1859 @ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1860 | tag: tip
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1861 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1862 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1863 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1864 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1865 o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1866 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1867 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1868 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1869 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1870 o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1871 | parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1872 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1873 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1874 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1875 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1876 o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1877 | parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1878 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1879 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1880 | summary: C0
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1881 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1882 o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1883 user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1884 date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1885 summary: ROOT
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1886
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1887 Diverge one of the splitted commit
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1888
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1889 $ hg up 6
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1890 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1891 $ hg commit --amend -m "Add only B"
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
1892 1 new orphan changesets
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1893
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1894 $ hg up 6 --hidden
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1895 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1896 $ hg commit --amend -m "Add B only"
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35518
diff changeset
1897 4 new content-divergent changesets
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1898
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1899 $ hg log -G
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1900 @ changeset: 9:0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1901 | tag: tip
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1902 | parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1903 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1904 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
1905 | instability: content-divergent
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1906 | summary: Add B only
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1907 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1908 | * changeset: 8:b18bc8331526
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1909 |/ parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1910 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1911 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
1912 | instability: content-divergent
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1913 | summary: Add only B
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1914 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1915 | * changeset: 7:ba2ed02b0c9a
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1916 | | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1917 | | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
1918 | | instability: orphan, content-divergent
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1919 | | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1920 | |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1921 | x changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1922 |/ user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1923 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1924 | obsolete: rewritten using amend as 8:b18bc8331526
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
1925 | obsolete: rewritten using amend as 9:0b997eb7ceee
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1926 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1927 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1928 * changeset: 5:dd800401bd8c
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1929 | parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1930 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1931 | date: Thu Jan 01 00:00:00 1970 +0000
33688
2194a8723138 evolution: rename divergent to content-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33667
diff changeset
1932 | instability: content-divergent
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1933 | summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1934 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1935 o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1936 | parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1937 | user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1938 | date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1939 | summary: C0
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1940 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1941 o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1942 user: test
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1943 date: Thu Jan 01 00:00:00 1970 +0000
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1944 summary: ROOT
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1945
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1946
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1947 Check templates
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1948 ---------------
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1949
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1950 $ hg tlog
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1951 @ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1952 | Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1953 | semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1954 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1955 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1956 | * b18bc8331526
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1957 |/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1958 | semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1959 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1960 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1961 | * ba2ed02b0c9a
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1962 | |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1963 | x 4a004186e638
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1964 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1965 | multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1966 | multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
1967 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1968 * dd800401bd8c
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1969 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1970 o f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1971 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1972 o ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1973
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1974 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1975 @ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1976 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1977 | * b18bc8331526
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1978 |/
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1979 | * ba2ed02b0c9a
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1980 | |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1981 | x 4a004186e638
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
1982 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1983 * dd800401bd8c
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1984 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1985 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1986 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1987 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
1988
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1989 $ hg tlog --hidden
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1990 @ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1991 | Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1992 | semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1993 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1994 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
1995 | * b18bc8331526
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1996 |/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1997 | semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1998 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
1999 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2000 | * ba2ed02b0c9a
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2001 | | Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2002 | | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2003 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2004 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2005 | x 4a004186e638
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2006 |/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2007 | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2008 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2009 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2010 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2011 | multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2012 | multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2013 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2014 * dd800401bd8c
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2015 | Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2016 | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2017 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2018 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2019 | x 9bd10a0775e4
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2020 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2021 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2022 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2023 o f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2024 | Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2025 | semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2026 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2027 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2028 | x 0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2029 | | Predecessors: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2030 | | semi-colon: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2031 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2032 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2033 | | Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2034 | | multi-line: 3:f897c6137566
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2035 | | multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2036 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2037 | x 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2038 |/ Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2039 | semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2040 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2041 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2042 | Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2043 | multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2044 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2045 o ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2046
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2047 $ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2048 @ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2049 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2050 | * b18bc8331526
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2051 |/
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2052 | * ba2ed02b0c9a
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2053 | |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2054 | x 4a004186e638
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
2055 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2056 * dd800401bd8c
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2057 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2058 | x 9bd10a0775e4
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
2059 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2060 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2061 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2062 | x 0dec01379d3b
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
2063 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2064 | x 471f378eab4c
33995
c35c0f54f420 template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents: 33994
diff changeset
2065 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2066 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2067
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2068 $ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2069 @ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2070 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2071 | * b18bc8331526
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2072 |/
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2073 | * ba2ed02b0c9a
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2074 | |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2075 | x 4a004186e638
34961
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
2076 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2077 * dd800401bd8c
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2078 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2079 | x 9bd10a0775e4
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2080 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2081 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2082 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2083 | x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2084 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2085 | x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2086 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2087 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2088
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2089 $ hg up --hidden 4
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
2090 updating to a hidden changeset 9bd10a0775e4
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
2091 (hidden revision '9bd10a0775e4' has diverged)
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2092 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2093 $ hg rebase -r 7 -d 8 --config extensions.rebase=
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2094 rebasing 7:ba2ed02b0c9a "Add A,B,C"
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2095 $ hg tlog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2096 * eceed8f98ffc
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2097 | Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2098 | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2099 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2100 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2101 | * 0b997eb7ceee
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2102 | | Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2103 | | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2104 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2105 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2106 * | b18bc8331526
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2107 |/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2108 | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2109 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2110 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2111 * dd800401bd8c
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2112 | Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2113 | semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2114 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2115 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2116 | @ 9bd10a0775e4
33276
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2117 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2118 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2119 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
89796a25d4bb template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 33275
diff changeset
2120 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2121 o f897c6137566
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2122 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2123 o ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2124
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2125
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2126 $ hg fatelog
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2127 * eceed8f98ffc
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2128 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2129 | * 0b997eb7ceee
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2130 | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2131 * | b18bc8331526
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2132 |/
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2133 * dd800401bd8c
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2134 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2135 | @ 9bd10a0775e4
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
2136 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2137 o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2138 |
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2139 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2140
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2141 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2142 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2143
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2144 $ hg fatelogkw --hidden -q
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2145 * eceed8f98ffc
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2146 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2147 | * 0b997eb7ceee
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2148 | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2149 * | b18bc8331526
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2150 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2151 | x ba2ed02b0c9a
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2152 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2153 | x 4a004186e638
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2154 |/ Obsfate: rewritten using amend as 8:b18bc8331526
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2155 | Obsfate: rewritten using amend as 9:0b997eb7ceee
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2156 * dd800401bd8c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2157 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2158 | @ 9bd10a0775e4
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2159 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2160 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2161 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2162 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2163 | | Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2164 | | Obsfate: rewritten as 1:471f378eab4c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2165 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2166 |/ Obsfate: rewritten as 2:0dec01379d3b
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2167 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2168
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2169 $ hg fatelogkw --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2170 * eceed8f98ffc
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2171 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2172 | * 0b997eb7ceee
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2173 | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2174 * | b18bc8331526
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2175 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2176 | x ba2ed02b0c9a
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2177 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2178 | x 4a004186e638
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2179 |/ Obsfate: rewritten using amend as 8:b18bc8331526
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2180 | Obsfate: rewritten using amend as 9:0b997eb7ceee
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2181 * dd800401bd8c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2182 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2183 | @ 9bd10a0775e4
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2184 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2185 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2186 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2187 | x 0dec01379d3b
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2188 | | Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2189 | | Obsfate: rewritten as 1:471f378eab4c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2190 | x 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2191 |/ Obsfate: rewritten as 2:0dec01379d3b
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2192 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2193
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2194 $ hg fatelogkw --hidden -v
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2195 * eceed8f98ffc
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2196 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2197 | * 0b997eb7ceee
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2198 | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2199 * | b18bc8331526
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2200 |/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2201 | x ba2ed02b0c9a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2202 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2203 | x 4a004186e638
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2204 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2205 | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000)
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2206 * dd800401bd8c
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2207 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2208 | @ 9bd10a0775e4
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2209 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2210 o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2211 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2212 | x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2213 | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2214 | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2215 | x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2216 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2217 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2218
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2219 $ hg log -G -T "default" --hidden
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2220 * changeset: 10:eceed8f98ffc
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2221 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2222 | parent: 8:b18bc8331526
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2223 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2224 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2225 | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2226 | summary: Add A,B,C
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2227 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2228 | * changeset: 9:0b997eb7ceee
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2229 | | parent: 5:dd800401bd8c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2230 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2231 | | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2232 | | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2233 | | summary: Add B only
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2234 | |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2235 * | changeset: 8:b18bc8331526
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2236 |/ parent: 5:dd800401bd8c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2237 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2238 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2239 | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2240 | summary: Add only B
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2241 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2242 | x changeset: 7:ba2ed02b0c9a
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2243 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2244 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2245 | | obsolete: rewritten using rebase as 10:eceed8f98ffc
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2246 | | summary: Add A,B,C
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2247 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2248 | x changeset: 6:4a004186e638
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2249 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2250 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2251 | obsolete: rewritten using amend as 8:b18bc8331526
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2252 | obsolete: rewritten using amend as 9:0b997eb7ceee
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2253 | summary: Add A,B,C
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2254 |
35508
9b3f95d9783d graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 35393
diff changeset
2255 * changeset: 5:dd800401bd8c
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2256 | parent: 3:f897c6137566
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2257 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2258 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2259 | instability: content-divergent
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2260 | summary: Add A,B,C
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2261 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2262 | @ changeset: 4:9bd10a0775e4
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2263 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2264 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2265 | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2266 | summary: Add A,B,C
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2267 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2268 o changeset: 3:f897c6137566
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2269 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2270 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2271 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2272 | summary: C0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2273 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2274 | x changeset: 2:0dec01379d3b
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2275 | | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2276 | | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2277 | | obsolete: rewritten as 3:f897c6137566
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2278 | | obsolete: rewritten as 1:471f378eab4c
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2279 | | summary: B0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2280 | |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2281 | x changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2282 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2283 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2284 | obsolete: rewritten as 2:0dec01379d3b
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2285 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2286 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2287 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2288 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2289 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2290 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2291
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2292
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2293 Test templates with pruned commits
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2294 ==================================
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2295
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2296 Test setup
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2297 ----------
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2298
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2299 $ hg init $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2300 $ cd $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2301 $ mkcommit ROOT
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2302 $ mkcommit A0
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2303 $ hg debugobsolete --record-parent `getid "."`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33276
diff changeset
2304 obsoleted 1 changesets
33275
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2305
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2306 Check output
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2307 ------------
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2308
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2309 $ hg up "desc(A0)" --hidden
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2310 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2311 $ hg tlog
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2312 @ 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2313 |
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2314 o ea207398892e
4cf60d5894b5 template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
2315
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2316 $ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2317 @ 471f378eab4c
33996
98fa777cd7a1 template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents: 33995
diff changeset
2318 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
33912
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2319 o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents: 33773
diff changeset
2320
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2321 Test templates with multiple pruned commits
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2322 ===========================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2323
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2324 Test setup
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2325 ----------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2326
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2327 $ hg init $TESTTMP/multiple-local-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2328 $ cd $TESTTMP/multiple-local-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2329 $ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2330 $ mkcommit A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2331 $ hg commit --amend -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2332 $ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2333 obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2334
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2335 $ hg up -r "desc(A0)" --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
2336 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
2337 (hidden revision '471f378eab4c' is pruned)
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2338 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2339 $ hg commit --amend -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2340 $ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2341 obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2342
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2343 Check output
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2344 ------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2345
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2346 $ hg up "desc(A0)" --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
2347 updating to a hidden changeset 471f378eab4c
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
2348 (hidden revision '471f378eab4c' is pruned)
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2349 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2350 $ hg tlog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2351 @ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2352 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2353 o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2354
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2355 # todo: the obsfate output is not ideal
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2356 $ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2357 @ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2358 | Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2359 o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2360
34577
3c1bb8a4275d test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents: 34576
diff changeset
2361 $ hg fatelog --hidden
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2362 x 65b757b745b9
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2363 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2364 | x fdf9bde5129a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2365 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2366 | @ 471f378eab4c
34287
7cdc8c5a481a templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents: 34286
diff changeset
2367 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2368 o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2369
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2370 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2371 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2372
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2373 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2374 x 65b757b745b9
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2375 | Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2376 | x fdf9bde5129a
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2377 |/ Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2378 | @ 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2379 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2380 | Obsfate: rewritten using amend as 3:65b757b745b9
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2381 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2382
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2383 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2384 x 65b757b745b9
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2385 | Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2386 | x fdf9bde5129a
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2387 |/ Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2388 | @ 471f378eab4c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2389 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2390 | Obsfate: rewritten using amend as 3:65b757b745b9
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2391 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2392
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2393 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2394 x 65b757b745b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2395 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2396 | x fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2397 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2398 | @ 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2399 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2400 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2401 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2402
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2403
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2404 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2405 x changeset: 3:65b757b745b9
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2406 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2407 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2408 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2409 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2410 | obsolete: pruned
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2411 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2412 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2413 | x changeset: 2:fdf9bde5129a
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2414 |/ parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2415 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2416 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2417 | obsolete: pruned
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2418 | summary: A1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2419 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2420 | @ changeset: 1:471f378eab4c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2421 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2422 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2423 | obsolete: rewritten using amend as 2:fdf9bde5129a
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2424 | obsolete: rewritten using amend as 3:65b757b745b9
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2425 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2426 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2427 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2428 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2429 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2430 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2431
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2432
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2433 Test templates with splitted and pruned commit
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2434 ==============================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2435
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2436 $ hg init $TESTTMP/templates-local-split-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2437 $ cd $TESTTMP/templates-local-split-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2438 $ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2439 $ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2440 $ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2441 $ hg commit -A -m "A0"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2442 adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2443 adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2444 $ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2445 @ changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2446 | tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2447 | user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2448 | date: Thu Jan 01 00:00:00 1970 +0000
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2449 | summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2450 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2451 o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2452 user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2453 date: Thu Jan 01 00:00:00 1970 +0000
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2454 summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2455
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2456 # Simulate split
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2457 $ hg up -r "desc(ROOT)"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2458 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2459 $ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2460 $ hg commit -A -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2461 adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2462 created new head
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2463 $ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2464 $ hg commit -A -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2465 adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2466 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2467 obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2468
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2469 # Simulate prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2470 $ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2471 obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2472
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2473 $ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2474 @ changeset: 3:0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2475 | tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2476 | user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2477 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
2478 | obsolete: pruned
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2479 | summary: A2
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2480 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2481 o changeset: 2:617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2482 | parent: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2483 | user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2484 | date: Thu Jan 01 00:00:00 1970 +0000
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2485 | summary: A1
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2486 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2487 | x changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2488 |/ user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2489 | date: Thu Jan 01 00:00:00 1970 +0000
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34865
diff changeset
2490 | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2491 | summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2492 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2493 o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2494 user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2495 date: Thu Jan 01 00:00:00 1970 +0000
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2496 summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2497
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2498 Check templates
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2499 ---------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2500
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2501 $ hg up 'desc("A0")' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
2502 updating to a hidden changeset 471597cad322
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
2503 (hidden revision '471597cad322' is pruned)
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2504 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2505
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2506 # todo: the obsfate output is not ideal
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2507 $ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2508 o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2509 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2510 | @ 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2511 |/ Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2512 o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2513
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2514 $ hg up -r 'desc("A2")' --hidden
35518
02fdb8c018aa update: support updating to hidden cset if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35508
diff changeset
2515 updating to a hidden changeset 0d0ef4bdf70e
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35709
diff changeset
2516 (hidden revision '0d0ef4bdf70e' is pruned)
33997
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2517 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2518
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2519 $ hg fatelog --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2520 @ 0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2521 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2522 o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2523 |
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2524 | x 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2525 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2526 o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents: 33996
diff changeset
2527
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2528
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2529 Check other fatelog implementations
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2530 -----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2531
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2532 $ hg fatelogkw --hidden -q
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2533 @ 0d0ef4bdf70e
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2534 | Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2535 o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2536 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2537 | x 471597cad322
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2538 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2539 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2540
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2541 $ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2542 @ 0d0ef4bdf70e
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2543 | Obsfate: pruned
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2544 o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2545 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2546 | x 471597cad322
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
2547 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
34848
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2548 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2549
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2550 $ hg fatelogkw --hidden -v
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2551 @ 0d0ef4bdf70e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2552 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2553 o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2554 |
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2555 | x 471597cad322
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2556 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000)
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2557 o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
2558
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2559 $ hg log -G -T "default" --hidden
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2560 @ changeset: 3:0d0ef4bdf70e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2561 | tag: tip
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2562 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2563 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2564 | obsolete: pruned
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2565 | summary: A2
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2566 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2567 o changeset: 2:617adc3a144c
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2568 | parent: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2569 | user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2570 | date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2571 | summary: A1
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2572 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2573 | x changeset: 1:471597cad322
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2574 |/ user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2575 | date: Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
2576 | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
34853
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2577 | summary: A0
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2578 |
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2579 o changeset: 0:ea207398892e
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2580 user: test
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2581 date: Thu Jan 01 00:00:00 1970 +0000
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2582 summary: ROOT
962f7df21a73 obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34852
diff changeset
2583