Mercurial > hg
annotate tests/test-obsmarker-template.t @ 51168:a9e00554b3e4 stable
procutil: move stdin assignment outside of try-finally block
There is an stdin variable in the global scope of this module. And in the
`finally` block of this try-finally statement we're checking `if stdin is not
None`. Let's make sure we don't confuse code check tools into thinking we want
to use global stdin by moving this line of code outside of `try`.
This was caught by pytype 2023.11.21 on Python 3.11.2.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 02 Dec 2023 15:10:28 -0300 |
parents | f8f2ecdde4b5 |
children | e68fe567a780 |
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 |
47020
ba6881c6a178
rewriteutil: check for divergence
Martin von Zweigbergk <martinvonz@google.com>
parents:
45765
diff
changeset
|
14 > evolution.allowdivergence=true |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
15 > [templates] |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
16 > 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
|
17 > obsfateverb = "{obsfateverb(successors, markers)}" |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
18 > 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
|
19 > 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
|
20 > 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
|
21 > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 > [alias] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 > tlog = log -G -T '{node|short}\ |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
24 > \n Predecessors: {predecessors}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
25 > \n semi-colon: {join(predecessors, "; ")}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
26 > \n json: {predecessors|json}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
27 > \n map: {join(predecessors % "{rev}:{node}", " ")}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
28 > \n Successors: {successorssets}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
29 > \n multi-line: {join(successorssets, "\n multi-line: ")}\ |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
30 > \n json: {successorssets|json}\n' |
34576
50b46054b869
test: rename obsfate template alias
Boris Feld <boris.feld@octobus.net>
parents:
34575
diff
changeset
|
31 > 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
|
32 > 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
|
33 > 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
|
34 > EOF |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 Test templates on amended commit |
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 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 Test setup |
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 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 $ hg init $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 $ cd $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 $ 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
|
47 $ 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
|
48 $ 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
|
49 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 $ hg log --hidden -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
51 @ changeset: 3:d004c8f274b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
58 | x changeset: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 | 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
|
62 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 | 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
|
68 | obsolete: rewritten using amend as 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 $ hg up 'desc(A0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
80 updated to 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
|
81 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 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
|
84 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 o d004c8f274b9 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
86 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
87 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
89 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
90 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
91 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
92 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
94 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
95 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
96 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
97 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
98 | Successors: 3:d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
99 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
100 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
102 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
103 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
104 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
105 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
106 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
107 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
108 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
109 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
110 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
111 o d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
112 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
113 | @ 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
114 |/ 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
|
115 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
116 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
117 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
118 $ hg fatelogkw |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
119 o d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
120 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
121 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
122 |/ 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
|
123 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
124 |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
125 |
45765
ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents:
45676
diff
changeset
|
126 $ hg log -G --config command-templates.log= |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
127 o changeset: 3:d004c8f274b9 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
128 | tag: tip |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
129 | parent: 0:ea207398892e |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
130 | user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
131 | 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
|
132 | summary: A2 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
133 | |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
134 | @ changeset: 1:471f378eab4c |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
135 |/ user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
136 | 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
|
137 | 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
|
138 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
139 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
140 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
141 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
142 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
|
143 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
144 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
145 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
146 $ hg log -G -T "default" |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
147 o changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
148 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
149 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
150 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
151 | 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
|
152 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
153 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
154 | @ changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
155 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
156 | 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
|
157 | 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
|
158 | summary: A0 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
159 | |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
160 o changeset: 0:ea207398892e |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
161 user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
162 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
|
163 summary: ROOT |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
164 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 $ hg up 'desc(A1)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
167 updated to 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
|
168 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 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
|
171 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 o d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
173 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
174 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
176 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
177 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
178 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
179 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 | @ a468dc9b3633 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
181 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
182 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
183 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
184 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
185 | Successors: 3:d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
186 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
187 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
189 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
190 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
191 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
192 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
193 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
194 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
195 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
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 |
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 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
203 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 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
|
205 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 o d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
208 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
209 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
211 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
212 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
213 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
214 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 | @ a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
216 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
217 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
219 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
220 | Successors: 3:d004c8f274b9 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
221 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
222 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
224 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
225 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
226 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
227 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
228 | Successors: 2:a468dc9b3633 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
229 | multi-line: 2:a468dc9b3633 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
230 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
232 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
233 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
234 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
235 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
236 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
237 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
238 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
239 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
240 $ hg fatelog --hidden |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
241 o d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
242 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
243 | @ a468dc9b3633 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
244 |/ 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
|
245 | x 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
246 |/ 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
|
247 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
248 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
250 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
|
251 visible. |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 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
|
254 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
255 @ d004c8f274b9 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
256 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
257 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
258 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
259 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
260 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
261 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
262 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
263 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
264 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
265 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
266 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
267 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
268 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
269 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
270 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
271 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
273 @ d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
274 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
275 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
276 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
277 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
278 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
279 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
280 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 | x a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
282 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
283 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
285 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
286 | Successors: 3:d004c8f274b9 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
287 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
288 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
290 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
291 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
292 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
293 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
294 | Successors: 2:a468dc9b3633 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
295 | multi-line: 2:a468dc9b3633 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
296 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
298 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
299 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
300 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
301 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
302 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
303 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
304 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
305 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
306 $ hg fatelog |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
307 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
308 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
309 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
310 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
312 $ hg fatelog --hidden |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
313 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
314 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
315 | x a468dc9b3633 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
316 |/ 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
|
317 | x 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
318 |/ 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
|
319 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
320 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
321 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
322 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
323 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
324 | x a468dc9b3633 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
325 |/ 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
|
326 | x 471f378eab4c |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
327 |/ 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
|
328 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
329 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
330 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
331 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
|
332 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
333 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
334 $ 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
|
335 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
336 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
337 | x a468dc9b3633 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
338 |/ 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
|
339 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
340 |/ 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
|
341 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
342 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
343 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
344 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
345 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
346 | x a468dc9b3633 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
347 |/ 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
|
348 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
349 |/ 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
|
350 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
351 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
352 $ 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
|
353 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
354 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
355 | x a468dc9b3633 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
356 |/ 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
|
357 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
358 |/ 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
|
359 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
360 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
361 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
362 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
363 @ changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
364 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
365 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
366 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
367 | 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
|
368 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
369 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
370 | x changeset: 2:a468dc9b3633 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
371 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
372 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
373 | 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
|
374 | 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
|
375 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
376 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
377 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
378 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
379 | 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
|
380 | 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
|
381 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
382 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
383 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
384 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
385 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
|
386 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
387 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
388 $ hg log -G -T "default" --hidden -v |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
389 @ changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
390 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
391 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
392 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
393 | 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
|
394 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
395 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
396 | A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
397 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
398 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
399 | x changeset: 2:a468dc9b3633 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
400 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
401 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
402 | 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
|
403 | 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
|
404 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
405 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
406 | A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
407 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
408 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
409 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
410 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
411 | 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
|
412 | 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
|
413 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
414 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
415 | A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
416 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
417 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
418 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
419 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
420 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
|
421 files: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
422 description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
423 ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
424 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
425 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 Test templates with splitted commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
427 =================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
428 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 $ hg init $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 $ cd $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 @ changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 # Simulate split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
451 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
|
452 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
459 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
460 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
461 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 @ changeset: 3:f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 o changeset: 2:337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 | x changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 | date: Thu Jan 01 00:00:00 1970 +0000 |
34900
3a3adbcbd3a0
obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
34865
diff
changeset
|
479 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 $ hg up 'obsolete()' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
491 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
492 updated to 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
|
493 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 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
|
496 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 o f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
498 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
499 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
501 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
502 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
503 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
504 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
506 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
507 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
508 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
509 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
510 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
511 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
512 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
513 | @ 471597cad322 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
514 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
515 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
516 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
517 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
518 | Successors: 2:337fec4d2edc 3:f257fde29c7a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
519 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
520 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
522 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
523 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
524 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
525 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
526 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
527 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
528 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
529 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
530 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
531 o f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
532 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
533 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
534 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
535 | @ 471597cad322 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
536 |/ 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
|
537 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
538 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 $ hg up f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 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
|
541 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 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
|
543 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 @ f257fde29c7a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
546 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
547 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
548 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
549 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
550 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
551 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
552 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 o 337fec4d2edc |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
554 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
555 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
556 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
557 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
558 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
559 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
560 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
562 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
563 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
564 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
565 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
566 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
567 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
568 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
569 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 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
|
571 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 @ f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
574 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
575 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
577 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
578 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
579 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
580 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
582 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
583 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
585 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
586 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
587 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
588 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 | x 471597cad322 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
590 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
591 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
592 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
593 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
594 | Successors: 2:337fec4d2edc 3:f257fde29c7a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
595 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
596 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
598 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
599 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
600 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
601 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
602 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
603 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
604 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
605 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
606 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
607 @ f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
608 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
609 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
610 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
611 | x 471597cad322 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
612 |/ 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
|
613 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
614 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
615 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
616 @ f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
617 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
618 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
619 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
620 | x 471597cad322 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
621 |/ 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
|
622 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
623 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
624 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
|
625 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
626 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
627 $ 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
|
628 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
629 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
630 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
631 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
632 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
633 |/ 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
|
634 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
635 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
636 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
637 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
638 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
639 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
640 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
641 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
642 |/ 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
|
643 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
644 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
645 $ 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
|
646 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
647 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
648 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
649 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
650 | x 471597cad322 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
651 |/ 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
|
652 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
653 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
654 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
655 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
656 @ changeset: 3:f257fde29c7a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
657 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
658 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
659 | 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
|
660 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
661 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
662 o changeset: 2:337fec4d2edc |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
663 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
664 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
665 | 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
|
666 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
667 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
668 | x changeset: 1:471597cad322 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
669 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
670 | 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
|
671 | 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
|
672 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
673 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
674 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
675 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
676 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
|
677 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
678 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
679 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
680 Test templates with folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
681 ================================= |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
682 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
683 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
684 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
685 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
686 $ hg init $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
687 $ cd $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
688 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
689 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
690 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
691 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
692 @ changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
693 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
694 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
695 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
696 | summary: B0 |
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 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
699 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
700 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
701 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
702 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
703 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
704 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
705 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
706 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
707 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
708 Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
709 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
710 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
|
711 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
712 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
713 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
714 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
715 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
716 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
717 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
718 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
719 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
720 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
721 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
722 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
723 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
724 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
725 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
726 @ changeset: 3:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
727 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
728 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
729 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
730 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
731 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
732 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
733 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
734 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
735 | | 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
|
736 | | obsolete: rewritten as 3:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
737 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
738 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
739 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
740 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
741 | 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
|
742 | obsolete: rewritten as 3:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
743 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
744 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
747 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
749 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
751 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 $ hg up 'desc(A0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
754 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
755 updated to 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
|
756 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
758 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
|
759 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
761 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
762 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
764 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
765 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
766 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
767 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
768 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
769 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
770 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
771 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
772 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
773 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
774 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
775 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
776 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
777 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
778 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
779 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
780 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
781 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
782 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
783 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
784 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
785 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
786 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
787 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
788 | @ 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
789 |/ 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
|
790 o ea207398892e |
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 $ hg up 'desc(B0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
793 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
794 updated to 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
|
795 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
32879
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 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
|
798 displayed |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
799 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
800 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
801 | 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
|
802 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
803 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
804 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
805 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
806 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
807 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
808 | @ 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
809 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
810 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
811 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
812 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
813 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
814 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
815 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
816 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
817 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
818 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
819 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
820 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
821 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
822 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
823 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
824 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
825 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
826 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
827 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
828 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
829 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
830 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
831 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
832 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
833 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
834 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
835 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
836 | @ 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
837 | | 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
|
838 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
839 |/ 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
|
840 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
841 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
842 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
843 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
|
844 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
845 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
|
846 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
847 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
848 @ eb5a0daa2192 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
849 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
850 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
851 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
852 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
853 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
854 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
855 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
856 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
857 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
858 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
859 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
860 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
861 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
862 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
863 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
864 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
|
865 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
866 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
867 @ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
868 | 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
|
869 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
870 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
871 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
872 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
873 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
874 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
875 | x 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
876 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
877 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
878 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
879 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
880 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
881 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
882 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
883 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
884 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
885 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
886 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
887 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
888 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
889 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
890 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
891 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
892 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
893 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
894 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
895 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
896 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
897 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
898 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
899 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
900 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
901 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
902 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
903 | x 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
904 | | 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
|
905 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
906 |/ 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
|
907 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
908 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
909 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
910 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
911 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
912 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
913 | x 0dec01379d3b |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
914 | | 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
|
915 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
916 |/ 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
|
917 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
918 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
919 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
|
920 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
921 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
922 $ 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
|
923 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
924 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
925 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
926 | | 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
|
927 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
928 |/ 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
|
929 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
930 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
931 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
932 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
933 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
934 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
935 | | 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
|
936 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
937 |/ 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
|
938 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
939 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
940 $ 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
|
941 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
942 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
943 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
944 | | 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
|
945 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
946 |/ 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
|
947 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
948 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
949 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
950 @ changeset: 3:eb5a0daa2192 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
951 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
952 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
953 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
954 | 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
|
955 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
956 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
957 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
958 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
959 | | 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
|
960 | | obsolete: rewritten as 3:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
961 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
962 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
963 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
964 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
965 | 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
|
966 | obsolete: rewritten as 3:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
967 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
968 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
969 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
970 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
971 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
|
972 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
973 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
974 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
975 Test templates with divergence |
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 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
978 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
979 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
980 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
981 $ hg init $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
982 $ cd $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
983 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
984 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
985 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
986 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
987 @ changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
988 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
989 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
990 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
991 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
992 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
993 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
994 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
995 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
996 | 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
|
997 | obsolete: rewritten using amend as 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
998 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
999 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1000 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1001 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1002 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1003 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1004 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1005 $ hg update --hidden 'desc(A0)' |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1006 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1007 updated to 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
|
1008 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1009 $ hg commit --amend -m "A2" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1010 2 new content-divergent changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1011 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1012 @ changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1013 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1014 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1015 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1016 | 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
|
1017 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1018 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1019 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1020 | * changeset: 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1021 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1022 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1023 | 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
|
1024 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1025 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1026 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1027 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1028 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1029 | 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
|
1030 | 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
|
1031 | obsolete: rewritten using amend as 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1032 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1033 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1034 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1035 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1036 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1037 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1038 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1039 $ hg commit --amend -m 'A3' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1040 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1041 @ changeset: 4:019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1042 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1043 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1044 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1045 | 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
|
1046 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1047 | summary: A3 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1048 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1049 | x changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1050 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1051 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1052 | 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
|
1053 | obsolete: rewritten using amend as 4:019fadeab383 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1054 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1055 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1056 | * changeset: 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1057 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1058 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1059 | 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
|
1060 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1061 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1062 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1063 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1064 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1065 | 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
|
1066 | 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
|
1067 | obsolete: rewritten using amend as 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1068 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1069 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1070 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1071 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1072 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1073 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1074 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1075 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1076 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1077 --------------- |
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 $ hg up 'desc(A0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1080 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1081 updated to 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
|
1082 (hidden revision '471f378eab4c' has diverged) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1083 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1084 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
|
1085 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1086 * 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1087 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1088 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1089 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1090 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1091 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1092 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1093 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1094 | * fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1095 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1096 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1097 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1098 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1099 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1100 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1101 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1102 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1103 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1104 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1105 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1106 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1107 | Successors: 2:fdf9bde5129a; 4:019fadeab383 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1108 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1109 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1110 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1111 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1112 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1113 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1114 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1115 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1116 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1117 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1118 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1119 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1120 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1121 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1122 | * fdf9bde5129a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1123 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1124 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1125 |/ 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
|
1126 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1127 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1128 $ hg up 'desc(A1)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1129 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
|
1130 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1131 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
|
1132 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1133 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1134 * 019fadeab383 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1135 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1136 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1137 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1138 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1139 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1140 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1141 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1142 | @ fdf9bde5129a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1143 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1144 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1145 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1146 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1147 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1148 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1149 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1150 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1151 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1152 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1153 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1154 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1155 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1156 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1157 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1158 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1159 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1160 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1161 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1162 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1163 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1164 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1165 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1166 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
|
1167 --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1168 $ hg tlog --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1169 * 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1170 | Predecessors: 3:65b757b745b9 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1171 | semi-colon: 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1172 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1173 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1174 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1175 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1176 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1177 | x 65b757b745b9 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1178 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1179 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1180 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1181 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1182 | Successors: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1183 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1184 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1185 | @ fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1186 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1187 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1188 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1189 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1190 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1191 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1192 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1193 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1194 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1195 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1196 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1197 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1198 | Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1199 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1200 | multi-line: 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1201 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1202 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1203 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1204 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1205 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1206 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1207 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1208 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1209 json: [] |
32879
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 $ hg fatelog --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1212 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1213 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1214 | x 65b757b745b9 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1215 |/ 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
|
1216 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1217 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1218 | x 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1219 |/ 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
|
1220 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1221 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1222 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1223 $ hg fatelogjson --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1224 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1225 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1226 | x 65b757b745b9 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1227 |/ 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
|
1228 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1229 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1230 | x 471f378eab4c |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1231 |/ 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
|
1232 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1233 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1234 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1235 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
|
1236 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1237 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1238 $ 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
|
1239 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1240 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1241 | x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1242 |/ 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
|
1243 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1244 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1245 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1246 |/ 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
|
1247 | 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
|
1248 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1249 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1250 $ hg fatelogkw --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1251 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1252 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1253 | x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1254 |/ 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
|
1255 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1256 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1257 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1258 |/ 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
|
1259 | 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
|
1260 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1261 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1262 $ 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
|
1263 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1264 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1265 | x 65b757b745b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1266 |/ 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
|
1267 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1268 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1269 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1270 |/ 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
|
1271 | 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
|
1272 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1273 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1274 $ 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
|
1275 * changeset: 4:019fadeab383 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1276 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1277 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1278 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1279 | 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
|
1280 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1281 | summary: A3 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1282 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1283 | x changeset: 3:65b757b745b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1284 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1285 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1286 | 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
|
1287 | 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
|
1288 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1289 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1290 | @ changeset: 2:fdf9bde5129a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1291 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1292 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1293 | 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
|
1294 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1295 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1296 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1297 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1298 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1299 | 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
|
1300 | 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
|
1301 | 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
|
1302 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1303 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1304 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1305 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1306 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
|
1307 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1308 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1309 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1310 Test templates with amended + folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1311 =========================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1312 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1313 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1314 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1315 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1316 $ hg init $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1317 $ cd $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1318 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1319 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1320 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1321 $ hg commit --amend -m "B1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1322 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1323 @ changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1324 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1325 | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1326 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1327 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1328 | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1329 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1330 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1331 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1332 | 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
|
1333 | obsolete: rewritten using amend as 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1334 | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1335 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1336 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1337 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1338 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1339 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1340 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1341 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1342 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1343 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1344 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1345 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1346 # Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1347 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1348 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
|
1349 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1350 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1351 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1352 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1353 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1354 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1355 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
1356 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1357 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1358 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1359 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
1360 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1361 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1362 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1363 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1364 @ changeset: 4:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1365 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1366 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1367 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1368 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1369 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1370 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1371 | x changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1372 | | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1373 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1374 | | 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
|
1375 | | obsolete: rewritten as 4:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1376 | | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1377 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1378 | | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1379 | |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1380 | | 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
|
1381 | | obsolete: rewritten using amend as 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1382 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1383 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1384 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1385 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1386 | 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
|
1387 | obsolete: rewritten as 4:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1388 | summary: A0 |
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 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1391 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1392 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1393 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1394 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1395 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1396 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1397 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1398 $ hg up 'desc(A0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1399 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1400 updated to 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
|
1401 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1402 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1403 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
|
1404 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1405 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1406 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1407 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1408 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1409 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1410 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1411 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1412 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1413 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1414 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1415 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1416 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1417 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1418 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1419 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1420 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1421 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1422 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1423 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1424 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1425 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1426 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1427 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1428 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1429 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1430 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1431 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1432 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1433 | @ 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1434 |/ 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
|
1435 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1436 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1437 $ hg up 'desc(B0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1438 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1439 updated to 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
|
1440 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1441 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1442 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1443 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1444 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1445 | 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
|
1446 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1447 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1448 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1449 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1450 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1451 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1452 | @ 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1453 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1454 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1455 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1456 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1457 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1458 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1459 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1460 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1461 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1462 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1463 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1464 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1465 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1466 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1467 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1468 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1469 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1470 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1471 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1472 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1473 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1474 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1475 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1476 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1477 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1478 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1479 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1480 | @ 0dec01379d3b |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1481 | | 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
|
1482 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1483 |/ 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
|
1484 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1485 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1486 $ hg up 'desc(B1)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1487 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1488 updated to 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
|
1489 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1490 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1491 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1492 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1493 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1494 | 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
|
1495 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1496 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1497 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1498 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1499 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1500 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1501 | @ b7ea6d14e664 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1502 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1503 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1504 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1505 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1506 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1507 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1508 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1509 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1510 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1511 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1512 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1513 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1514 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1515 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1516 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1517 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1518 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1519 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1520 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1521 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1522 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1523 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1524 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1525 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1526 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1527 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1528 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1529 | @ b7ea6d14e664 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1530 | | 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
|
1531 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1532 |/ 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
|
1533 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1534 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1535 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1536 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
|
1537 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1538 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
|
1539 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1540 @ eb5a0daa2192 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1541 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1542 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1543 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1544 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1545 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1546 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1547 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1548 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1549 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1550 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1551 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1552 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1553 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1554 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1555 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1556 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1557 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1558 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1559 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1560 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1561 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1562 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
|
1563 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1564 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1565 @ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1566 | 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
|
1567 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1568 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1569 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1570 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1571 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1572 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1573 | x b7ea6d14e664 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1574 | | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1575 | | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1576 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1577 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1578 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1579 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1580 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1581 | | x 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1582 | |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1583 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1584 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1585 | | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1586 | | Successors: 3:b7ea6d14e664 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1587 | | multi-line: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1588 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1589 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1590 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1591 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1592 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1593 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1594 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1595 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1596 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1597 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1598 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1599 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1600 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1601 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1602 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1603 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1604 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1605 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1606 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1607 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1608 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1609 | x b7ea6d14e664 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1610 | | 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
|
1611 | | x 0dec01379d3b |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1612 | |/ 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
|
1613 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1614 |/ 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
|
1615 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1616 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1617 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1618 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1619 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1620 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1621 | x b7ea6d14e664 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1622 | | 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
|
1623 | | x 0dec01379d3b |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1624 | |/ 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
|
1625 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1626 |/ 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
|
1627 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1628 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1629 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1630 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
|
1631 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1632 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1633 $ 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
|
1634 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1635 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1636 | x b7ea6d14e664 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1637 | | 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
|
1638 | | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1639 | |/ 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
|
1640 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1641 |/ 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
|
1642 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1643 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1644 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1645 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1646 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1647 | x b7ea6d14e664 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1648 | | 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
|
1649 | | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1650 | |/ 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
|
1651 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1652 |/ 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
|
1653 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1654 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1655 $ 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
|
1656 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1657 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1658 | x b7ea6d14e664 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1659 | | 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
|
1660 | | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1661 | |/ 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
|
1662 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1663 |/ 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
|
1664 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1665 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1666 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1667 @ changeset: 4:eb5a0daa2192 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1668 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1669 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1670 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1671 | 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
|
1672 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1673 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1674 | x changeset: 3:b7ea6d14e664 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1675 | | parent: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1676 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1677 | | 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
|
1678 | | obsolete: rewritten as 4:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1679 | | summary: B1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1680 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1681 | | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1682 | |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1683 | | 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
|
1684 | | 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
|
1685 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1686 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1687 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1688 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1689 | 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
|
1690 | obsolete: rewritten as 4:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1691 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1692 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1693 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1694 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1695 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
|
1696 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1697 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1698 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1699 Test template with pushed and pulled obs markers |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1700 ================================================ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1701 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1702 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1703 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1704 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1705 $ hg init $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1706 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1707 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1708 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1709 $ 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
|
1710 updating to branch default |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1711 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
|
1712 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1713 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1714 @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1715 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1716 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1717 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1718 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1719 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1720 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1721 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1722 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1723 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1724 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1725 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1726 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1727 $ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1728 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1729 @ changeset: 3:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1730 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1731 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1732 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1733 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1734 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1735 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1736 | x changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1737 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1738 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1739 | 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
|
1740 | obsolete: rewritten using amend as 3:7a230b46bf61 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1741 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1742 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1743 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1744 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1745 | 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
|
1746 | obsolete: rewritten using amend as 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1747 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1748 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1749 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1750 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1751 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1752 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1753 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1754 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1755 $ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35010
diff
changeset
|
1756 pulling from $TESTTMP/templates-local-remote-markers-1 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1757 searching for changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1758 adding changesets |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1759 adding manifests |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1760 adding file changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1761 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
|
1762 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
|
1763 obsoleted 1 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38748
diff
changeset
|
1764 new changesets 7a230b46bf61 (1 drafts) |
48687
f8f2ecdde4b5
branchmap: skip obsolete revisions while computing heads
Anton Shestakov <av6@dwimlabs.net>
parents:
47020
diff
changeset
|
1765 (run 'hg heads' to see heads) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1766 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1767 o changeset: 2:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1768 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1769 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1770 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1771 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1772 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1773 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1774 | @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1775 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1776 | 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
|
1777 | obsolete: rewritten using amend as 2:7a230b46bf61 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1778 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1779 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1780 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1781 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1782 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1783 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1784 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1785 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1786 $ hg debugobsolete |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1787 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
|
1788 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
|
1789 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1790 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1791 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1792 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1793 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
|
1794 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1795 o 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1796 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1797 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1798 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1799 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1800 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1801 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1802 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1803 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1804 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1805 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1806 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1807 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1808 | Successors: 2:7a230b46bf61 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1809 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1810 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1811 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1812 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1813 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1814 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1815 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1816 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1817 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1818 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1819 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1820 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1821 o 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1822 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1823 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1824 |/ 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
|
1825 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1826 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1827 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1828 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
|
1829 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1830 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
|
1831 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1832 @ 7a230b46bf61 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1833 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1834 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1835 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1836 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1837 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1838 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1839 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1840 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1841 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1842 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1843 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1844 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1845 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1846 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1847 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1848 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1849 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1850 @ 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1851 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1852 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1853 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1854 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
|
1855 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1856 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1857 @ 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1858 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1859 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1860 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1861 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1862 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1863 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1864 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1865 | x 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1866 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1867 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1868 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1869 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1870 | Successors: 2:7a230b46bf61 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1871 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1872 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1873 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1874 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1875 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1876 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1877 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1878 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1879 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1880 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1881 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1882 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1883 @ 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1884 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1885 | x 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1886 |/ 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
|
1887 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1888 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1889 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1890 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
|
1891 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1892 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1893 $ 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
|
1894 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1895 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1896 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1897 |/ 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
|
1898 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1899 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1900 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1901 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1902 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1903 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1904 |/ 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
|
1905 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1906 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1907 $ 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
|
1908 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1909 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1910 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1911 |/ 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
|
1912 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1913 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1914 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1915 @ changeset: 2:7a230b46bf61 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1916 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1917 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1918 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1919 | 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
|
1920 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1921 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1922 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1923 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1924 | 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
|
1925 | 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
|
1926 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1927 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1928 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1929 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1930 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
|
1931 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1932 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1933 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1934 Test template with obsmarkers cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1935 =================================== |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1936 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1937 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1938 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1939 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1940 $ hg init $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1941 $ cd $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1942 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1943 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1944 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1945 $ hg up -r 0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1946 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
|
1947 $ mkcommit C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1948 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1949 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1950 Create the cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1951 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1952 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
1953 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1954 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1955 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1956 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
1957 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1958 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1959 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
1960 1 new obsolescence markers |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1961 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1962 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1963 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1964 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1965 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1966 @ f897c6137566 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1967 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1968 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1969 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1970 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1971 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1972 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1973 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1974 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1975 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1976 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1977 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1978 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1979 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1980 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1981 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1982 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1983 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1984 @ f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1985 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1986 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1987 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1988 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1989 $ hg up -r "desc(B0)" --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1990 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
1991 updated to 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
|
1992 (hidden revision '0dec01379d3b' is pruned) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1993 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1994 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1995 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1996 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1997 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1998 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1999 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2000 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2001 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2002 | @ 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2003 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2004 | | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2005 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2006 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2007 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2008 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2009 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2010 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2011 | x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2012 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2013 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2014 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2015 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2016 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2017 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2018 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2019 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2020 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2021 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2022 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2023 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2024 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2025 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2026 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2027 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2028 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2029 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2030 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2031 | @ 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2032 | | 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
|
2033 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2034 |/ 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
|
2035 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2036 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2037 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2038 $ hg up -r "desc(A0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2039 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
|
2040 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2041 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2042 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2043 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2044 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2045 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2046 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2047 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2048 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2049 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2050 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2051 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2052 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2053 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2054 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2055 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2056 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2057 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2058 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2059 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2060 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2061 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2062 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2063 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2064 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2065 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2066 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2067 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2068 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2069 | @ 471f378eab4c |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
2070 |/ Obsfate: pruned; |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2071 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2072 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2073 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2074 $ hg up -r "desc(ROOT)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2075 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
|
2076 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2077 o f897c6137566 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2078 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2079 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2080 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2081 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2082 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2083 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2084 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2085 @ ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2086 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2087 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2088 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2089 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2090 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2091 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2092 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2093 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2094 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2095 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2096 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2097 @ ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2098 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2099 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2100 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2101 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2102 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2103 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2104 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2105 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2106 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2107 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2108 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2109 | x 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2110 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2111 | | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2112 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2113 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2114 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2115 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2116 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2117 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2118 | x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2119 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2120 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2121 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2122 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2123 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2124 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2125 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2126 @ ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2127 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2128 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2129 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2130 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2131 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2132 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2133 json: [] |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2134 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2135 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
|
2136 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2137 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2138 $ 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
|
2139 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2140 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2141 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2142 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2143 | | 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
|
2144 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2145 |/ 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
|
2146 @ ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2147 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2148 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2149 o f897c6137566 |
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 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2152 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2153 | | 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
|
2154 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2155 |/ 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
|
2156 @ ea207398892e |
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 $ 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
|
2159 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2160 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2161 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2162 | | 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
|
2163 | | 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
|
2164 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2165 |/ 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
|
2166 @ ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2167 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2168 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2169 o changeset: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2170 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2171 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2172 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2173 | 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
|
2174 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2175 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2176 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2177 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2178 | | 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
|
2179 | | obsolete: rewritten as 3:f897c6137566 |
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
2180 | | obsolete: rewritten as 1:471f378eab4c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2181 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2182 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2183 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2184 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2185 | 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
|
2186 | obsolete: rewritten as 2:0dec01379d3b |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2187 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2188 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2189 @ changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2190 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2191 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
|
2192 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2193 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2194 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2195 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
|
2196 ================================================= |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2197 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2198 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2199 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2200 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2201 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2202 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2203 | 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
|
2204 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2205 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2206 @ changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2207 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2208 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
|
2209 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2210 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2211 $ hg up |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2212 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
|
2213 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2214 Create a commit with three files |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2215 $ touch A B C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2216 $ 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
|
2217 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2218 Split it |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2219 $ hg up 3 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2220 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
|
2221 $ touch A |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2222 $ 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
|
2223 created new head |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2224 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2225 $ touch B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2226 $ 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
|
2227 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2228 $ touch C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2229 $ 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
|
2230 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2231 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2232 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2233 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2234 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2235 | 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
|
2236 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2237 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2238 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2239 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2240 | 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
|
2241 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2242 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2243 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2244 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2245 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2246 | 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
|
2247 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2248 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2249 | o changeset: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2250 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2251 | 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
|
2252 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2253 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2254 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2255 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2256 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2257 | 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
|
2258 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2259 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2260 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2261 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2262 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
|
2263 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2264 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2265 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
2266 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
2267 obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2268 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2269 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2270 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2271 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2272 | 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
|
2273 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2274 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2275 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2276 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2277 | 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
|
2278 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2279 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2280 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2281 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2282 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2283 | 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
|
2284 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2285 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2286 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2287 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2288 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2289 | 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
|
2290 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2291 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2292 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2293 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2294 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
|
2295 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2296 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2297 Diverge one of the splitted commit |
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 up 6 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2300 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
|
2301 $ hg commit --amend -m "Add only B" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
2302 1 new orphan changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2303 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2304 $ hg up 6 --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2305 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
|
2306 $ hg commit --amend -m "Add B only" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
2307 4 new content-divergent changesets |
33275
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 log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2310 @ changeset: 9:0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2311 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2312 | parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2313 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2314 | 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
|
2315 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2316 | summary: Add B only |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2317 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2318 | * changeset: 8:b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2319 |/ parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2320 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2321 | 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
|
2322 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2323 | summary: Add only B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2324 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2325 | * changeset: 7:ba2ed02b0c9a |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2326 | | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2327 | | 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
|
2328 | | instability: orphan, content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2329 | | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2330 | | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2331 | x changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2332 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2333 | 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
|
2334 | 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
|
2335 | 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
|
2336 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2337 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2338 * changeset: 5:dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2339 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2340 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2341 | 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
|
2342 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2343 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2344 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2345 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2346 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2347 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2348 | 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
|
2349 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2350 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2351 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2352 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2353 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
|
2354 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2355 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2356 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2357 Check templates |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2358 --------------- |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2359 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2360 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2361 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2362 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2363 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2364 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2365 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2366 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2367 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2368 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2369 | * b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2370 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2371 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2372 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2373 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2374 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2375 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2376 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2377 | * ba2ed02b0c9a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2378 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2379 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2380 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2381 | | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2382 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2383 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2384 | | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2385 | x 4a004186e638 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2386 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2387 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2388 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2389 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2390 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2391 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2392 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2393 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2394 * dd800401bd8c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2395 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2396 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2397 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2398 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2399 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2400 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2401 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2402 o f897c6137566 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2403 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2404 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2405 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2406 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2407 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2408 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2409 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2410 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2411 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2412 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2413 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2414 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2415 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2416 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2417 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2418 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2419 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2420 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2421 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2422 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2423 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2424 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2425 | x 4a004186e638 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2426 |/ 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
|
2427 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2428 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2429 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2430 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2431 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2432 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2433 $ hg tlog --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2434 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2435 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2436 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2437 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2438 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2439 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2440 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2441 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2442 | * b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2443 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2444 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2445 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2446 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2447 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2448 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2449 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2450 | * ba2ed02b0c9a |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2451 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2452 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2453 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2454 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2455 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2456 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2457 | | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2458 | x 4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2459 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2460 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2461 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2462 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2463 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2464 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2465 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2466 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2467 * dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2468 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2469 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2470 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2471 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2472 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2473 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2474 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2475 | x 9bd10a0775e4 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2476 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2477 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2478 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2479 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2480 | Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2481 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2482 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2483 o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2484 | Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2485 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2486 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2487 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2488 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2489 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2490 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2491 | x 0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2492 | | Predecessors: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2493 | | semi-colon: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2494 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2495 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2496 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2497 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2498 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2499 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2500 | x 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2501 |/ Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2502 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2503 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2504 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2505 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2506 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2507 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2508 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2509 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2510 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2511 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2512 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2513 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2514 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2515 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2516 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2517 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2518 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2519 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2520 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2521 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2522 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2523 | x 4a004186e638 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2524 |/ 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
|
2525 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2526 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2527 | x 9bd10a0775e4 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2528 |/ 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
|
2529 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2530 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2531 | x 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2532 | | 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
|
2533 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2534 |/ 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
|
2535 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2536 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2537 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2538 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2539 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2540 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2541 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2542 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2543 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2544 | x 4a004186e638 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
2545 |/ 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
|
2546 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2547 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2548 | x 9bd10a0775e4 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2549 |/ 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
|
2550 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2551 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2552 | x 0dec01379d3b |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2553 | | 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
|
2554 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2555 |/ 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
|
2556 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2557 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2558 $ hg up --hidden 4 |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2559 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2560 updated to 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
|
2561 (hidden revision '9bd10a0775e4' has diverged) |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2562 $ 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
|
2563 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
|
2564 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2565 * eceed8f98ffc |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2566 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2567 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2568 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2569 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2570 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2571 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2572 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2573 | * 0b997eb7ceee |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2574 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2575 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2576 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2577 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2578 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2579 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2580 | | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2581 * | b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2582 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2583 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2584 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2585 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2586 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2587 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2588 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2589 * dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2590 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2591 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2592 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2593 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2594 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2595 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2596 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2597 | @ 9bd10a0775e4 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2598 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2599 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2600 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2601 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2602 | Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2603 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2604 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2605 | 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
|
2606 o f897c6137566 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2607 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2608 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2609 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2610 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2611 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2612 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2613 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2614 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2615 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2616 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2617 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2618 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2619 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2620 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2621 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2622 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2623 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2624 * eceed8f98ffc |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2625 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2626 | * 0b997eb7ceee |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2627 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2628 * | b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2629 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2630 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2631 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2632 | @ 9bd10a0775e4 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2633 |/ 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
|
2634 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2635 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2636 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2637 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2638 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
|
2639 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2640 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2641 $ 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
|
2642 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2643 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2644 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2645 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2646 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2647 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2648 | x ba2ed02b0c9a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2649 | | 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
|
2650 | x 4a004186e638 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2651 |/ 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
|
2652 | 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
|
2653 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2654 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2655 | @ 9bd10a0775e4 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2656 |/ 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
|
2657 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2658 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2659 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2660 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2661 | | 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
|
2662 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2663 |/ 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
|
2664 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2665 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2666 $ hg fatelogkw --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2667 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2668 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2669 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2670 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2671 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2672 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2673 | x ba2ed02b0c9a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2674 | | 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
|
2675 | x 4a004186e638 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2676 |/ 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
|
2677 | 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
|
2678 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2679 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2680 | @ 9bd10a0775e4 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2681 |/ 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
|
2682 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2683 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2684 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2685 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2686 | | 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
|
2687 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2688 |/ 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
|
2689 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2690 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2691 $ 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
|
2692 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2693 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2694 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2695 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2696 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2697 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2698 | x ba2ed02b0c9a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2699 | | 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
|
2700 | x 4a004186e638 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2701 |/ 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
|
2702 | 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
|
2703 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2704 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2705 | @ 9bd10a0775e4 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2706 |/ 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
|
2707 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2708 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2709 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2710 | | 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
|
2711 | | 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
|
2712 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2713 |/ 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
|
2714 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2715 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2716 $ 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
|
2717 * changeset: 10:eceed8f98ffc |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2718 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2719 | parent: 8:b18bc8331526 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2720 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2721 | 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
|
2722 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2723 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2724 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2725 | * changeset: 9:0b997eb7ceee |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2726 | | parent: 5:dd800401bd8c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2727 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2728 | | 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
|
2729 | | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2730 | | summary: Add B only |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2731 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2732 * | changeset: 8:b18bc8331526 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2733 |/ parent: 5:dd800401bd8c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2734 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2735 | 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
|
2736 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2737 | summary: Add only B |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2738 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2739 | x changeset: 7:ba2ed02b0c9a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2740 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2741 | | 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
|
2742 | | 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
|
2743 | | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2744 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2745 | x changeset: 6:4a004186e638 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2746 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2747 | 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
|
2748 | 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
|
2749 | 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
|
2750 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2751 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2752 * changeset: 5:dd800401bd8c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2753 | parent: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2754 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2755 | 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
|
2756 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2757 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2758 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2759 | @ changeset: 4:9bd10a0775e4 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2760 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2761 | 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
|
2762 | 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
|
2763 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2764 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2765 o changeset: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2766 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2767 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2768 | 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
|
2769 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2770 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2771 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2772 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2773 | | 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
|
2774 | | obsolete: rewritten as 3:f897c6137566 |
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
2775 | | obsolete: rewritten as 1:471f378eab4c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2776 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2777 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2778 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2779 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2780 | 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
|
2781 | obsolete: rewritten as 2:0dec01379d3b |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2782 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2783 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2784 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2785 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2786 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
|
2787 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2788 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2789 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2790 Test templates with pruned commits |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2791 ================================== |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2792 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2793 Test setup |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2794 ---------- |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2795 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2796 $ hg init $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2797 $ cd $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2798 $ mkcommit ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2799 $ mkcommit A0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2800 $ hg debugobsolete --record-parent `getid "."` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
2801 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
2802 obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2803 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2804 Check output |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2805 ------------ |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2806 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2807 $ hg up "desc(A0)" --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2808 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
|
2809 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2810 @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2811 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2812 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2813 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2814 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2815 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2816 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2817 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2818 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2819 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2820 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2821 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2822 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2823 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2824 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2825 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2826 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2827 @ 471f378eab4c |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
2828 | 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
|
2829 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2830 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2831 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
|
2832 =========================================== |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2833 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2834 Test setup |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2835 ---------- |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2836 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2837 $ 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
|
2838 $ cd $TESTTMP/multiple-local-prune |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2839 $ mkcommit ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2840 $ mkcommit A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2841 $ hg commit --amend -m "A1" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2842 $ hg debugobsolete --record-parent `getid "."` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
2843 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2844 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2845 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2846 $ hg up -r "desc(A0)" --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2847 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2848 updated to 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
|
2849 (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
|
2850 $ hg commit --amend -m "A2" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2851 $ hg debugobsolete --record-parent `getid "."` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
2852 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2853 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2854 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2855 Check output |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2856 ------------ |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2857 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2858 $ hg up "desc(A0)" --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2859 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2860 updated to 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
|
2861 (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
|
2862 $ hg tlog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2863 @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2864 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2865 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2866 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2867 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2868 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2869 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2870 | json: [] |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2871 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2872 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2873 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2874 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2875 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2876 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2877 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2878 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2879 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2880 # 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
|
2881 $ hg fatelog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2882 @ 471f378eab4c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2883 | Obsfate: pruned; |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2884 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2885 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
2886 $ hg fatelog --hidden |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2887 x 65b757b745b9 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2888 | 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
|
2889 | x fdf9bde5129a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2890 |/ 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
|
2891 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2892 |/ 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
|
2893 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2894 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2895 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
|
2896 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2897 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2898 $ 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
|
2899 x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2900 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2901 | x fdf9bde5129a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2902 |/ Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2903 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2904 |/ 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
|
2905 | 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
|
2906 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2907 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2908 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2909 x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2910 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2911 | x fdf9bde5129a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2912 |/ Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2913 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2914 |/ 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
|
2915 | 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
|
2916 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2917 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2918 $ 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
|
2919 x 65b757b745b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2920 | 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
|
2921 | x fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2922 |/ 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
|
2923 | @ 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2924 |/ 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
|
2925 | 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
|
2926 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2927 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2928 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2929 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2930 x changeset: 3:65b757b745b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2931 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2932 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2933 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2934 | 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
|
2935 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2936 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2937 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2938 | x changeset: 2:fdf9bde5129a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2939 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2940 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2941 | 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
|
2942 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2943 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2944 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2945 | @ changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2946 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2947 | 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
|
2948 | 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
|
2949 | 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
|
2950 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2951 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2952 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2953 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2954 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
|
2955 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2956 |
41722
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2957 Check that {negrev} shows usable negative revisions despite hidden commits |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2958 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2959 $ hg log -G -T "{negrev}\n" |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2960 @ -3 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2961 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2962 o -4 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2963 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2964 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2965 $ hg log -G -T "{negrev}\n" --hidden |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2966 x -1 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2967 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2968 | x -2 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2969 |/ |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2970 | @ -3 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2971 |/ |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2972 o -4 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2973 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2974 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2975 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
|
2976 ============================================== |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2977 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2978 $ 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
|
2979 $ 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
|
2980 $ mkcommit ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2981 $ echo 42 >> a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2982 $ echo 43 >> b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2983 $ hg commit -A -m "A0" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2984 adding a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2985 adding b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2986 $ hg log --hidden -G |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2987 @ changeset: 1:471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2988 | tag: tip |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2989 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2990 | 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
|
2991 | summary: A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2992 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2993 o changeset: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2994 user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2995 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
|
2996 summary: ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2997 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2998 # Simulate split |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2999 $ hg up -r "desc(ROOT)" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3000 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
|
3001 $ echo 42 >> a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3002 $ hg commit -A -m "A1" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3003 adding a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3004 created new head |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3005 $ echo 43 >> b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3006 $ hg commit -A -m "A2" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3007 adding b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3008 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
3009 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3010 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3011 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3012 # Simulate prune |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3013 $ hg debugobsolete --record-parent `getid "."` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
3014 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3015 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3016 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3017 $ hg log --hidden -G |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3018 @ changeset: 3:0d0ef4bdf70e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3019 | tag: tip |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3020 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3021 | 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
|
3022 | obsolete: pruned |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3023 | summary: A2 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3024 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3025 o changeset: 2:617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3026 | parent: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3027 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3028 | 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
|
3029 | summary: A1 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3030 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3031 | x changeset: 1:471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3032 |/ user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3033 | 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
|
3034 | 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
|
3035 | summary: A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3036 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3037 o changeset: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3038 user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3039 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
|
3040 summary: ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3041 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3042 Check templates |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3043 --------------- |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3044 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3045 $ hg up 'desc("A0")' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
3046 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
3047 updated to hidden changeset 471597cad322 |
41152
191fac9ff9d3
obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
39707
diff
changeset
|
3048 (hidden revision '471597cad322' was rewritten as: 617adc3a144c) |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3049 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3050 # 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
|
3051 $ hg fatelog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3052 o 617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3053 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3054 | @ 471597cad322 |
41152
191fac9ff9d3
obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
39707
diff
changeset
|
3055 |/ Obsfate: rewritten as 2:617adc3a144c 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
|
3056 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3057 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3058 $ hg up -r 'desc("A2")' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
3059 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
3060 updated to 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
|
3061 (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
|
3062 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3063 $ hg fatelog --hidden |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3064 @ 0d0ef4bdf70e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3065 | 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
|
3066 o 617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3067 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3068 | x 471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3069 |/ 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
|
3070 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3071 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3072 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3073 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
|
3074 ----------------------------------- |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3075 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3076 $ 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
|
3077 @ 0d0ef4bdf70e |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3078 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3079 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3080 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3081 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3082 |/ 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
|
3083 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3084 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3085 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3086 @ 0d0ef4bdf70e |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3087 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3088 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3089 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3090 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3091 |/ 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
|
3092 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3093 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3094 $ 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
|
3095 @ 0d0ef4bdf70e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3096 | 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
|
3097 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3098 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3099 | x 471597cad322 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3100 |/ 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
|
3101 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3102 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3103 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3104 @ changeset: 3:0d0ef4bdf70e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3105 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3106 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3107 | 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
|
3108 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3109 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3110 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3111 o changeset: 2:617adc3a144c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3112 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3113 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3114 | 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
|
3115 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3116 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3117 | x changeset: 1:471597cad322 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3118 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3119 | 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
|
3120 | 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
|
3121 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3122 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3123 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3124 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3125 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
|
3126 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3127 |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3128 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3129 Test metadata encoding (issue5754) |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3130 ================================== |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3131 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3132 $ hg init $TESTTMP/metadata-encoding |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3133 $ cd $TESTTMP/metadata-encoding |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3134 $ cat <<'EOF' >> .hg/hgrc |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3135 > [extensions] |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3136 > amend = |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3137 > EOF |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39480
diff
changeset
|
3138 $ "$PYTHON" <<'EOF' |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3139 > with open('test1', 'wb') as f: |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3140 > f.write(b't\xe8st1') and None |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3141 > with open('test2', 'wb') as f: |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3142 > f.write(b't\xe8st2') and None |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3143 > EOF |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3144 $ mkcommit ROOT |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3145 $ ( HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0 ) |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3146 $ echo 42 >> A0 |
38747
2b7ce7b55514
test-obsmarker-template: add missing HGENCODING=latin-1
Yuya Nishihara <yuya@tcha.org>
parents:
38707
diff
changeset
|
3147 $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`" |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3148 $ HGENCODING=latin-1 hg amend -m "A2" \ |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3149 > --config devel.user.obsmarker="`cat test2`" |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3150 $ mkcommit B0 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3151 $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`" |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41722
diff
changeset
|
3152 1 new obsolescence markers |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3153 obsoleted 1 changesets |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3154 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3155 metadata should be stored in UTF-8, and debugobsolete doesn't decode it to |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3156 local encoding since the command is supposed to show unmodified content: |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3157 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3158 $ HGENCODING=latin-1 hg debugobsolete |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3159 5f66a482f0bb2fcaccfc215554ad5eb9f40b50f5 718c0d00cee1429bdb73064e0d88908c601507a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'note': 't\xc3\xa8st2', 'operation': 'amend', 'user': 'test'} |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3160 718c0d00cee1429bdb73064e0d88908c601507a8 1132562159b35bb27e1d6b80c80ee94a1659a4da 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 't\xc3\xa8st2'} |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3161 8f82db6f991db367fdbb3b6dba5e187ecc3ebd96 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 't\xc3\xa8st2'} |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3162 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3163 metadata should be converted back to local encoding when displaying: |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3164 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3165 $ HGENCODING=latin-1 hg fatelog --hidden |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3166 @ 8f82db6f991d |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3167 | Obsfate: pruned by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3168 o 1132562159b3 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3169 | |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3170 | x 718c0d00cee1 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3171 |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3172 | x 5f66a482f0bb |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3173 |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000); |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3174 o ea207398892e |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3175 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3176 $ HGENCODING=utf-8 hg fatelog --hidden |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3177 @ 8f82db6f991d |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3178 | Obsfate: pruned by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3179 o 1132562159b3 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3180 | |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3181 | x 718c0d00cee1 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3182 |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3183 | x 5f66a482f0bb |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3184 |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000); |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3185 o ea207398892e |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3186 |
41722
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3187 $ hg log -G -T "{negrev}\n" |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3188 @ -1 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3189 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3190 o -2 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3191 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3192 o -5 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3193 |