Mercurial > hg
annotate tests/test-obsmarker-template.t @ 46065:56a5ea353182
test-extension: flush diagnostic message to stabilize chg output
Since chg server may create new file object for the attached stdout,
procutil.stdout is not ui.fout and the buffered procutil.stdout data wouldn't
be flushed at all. That's why test-extension.t passes without modification
on Python 2.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Mon, 07 Dec 2020 20:12:36 +0900 |
parents | ed84a4d48910 |
children | ba6881c6a178 |
rev | line source |
---|---|
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 This test file test the various templates related to obsmarkers. |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 Global setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 ============ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 $ . $TESTDIR/testlib/obsmarker-common.sh |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 $ cat >> $HGRCPATH <<EOF |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 > [ui] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 > interactive = true |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 > [phases] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 > publish=False |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 > [experimental] |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
13 > evolution=true |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
14 > [templates] |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
35010
b81ad5b78a81
obsfate: makes successorsetverb takes the markers as argument
Boris Feld <boris.feld@octobus.net>
parents:
34961
diff
changeset
|
16 > obsfateverb = "{obsfateverb(successors, markers)}" |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
17 > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" |
33994
38f08eaba6b0
template: compute user in obsfateusers
Boris Feld <boris.feld@octobus.net>
parents:
33993
diff
changeset
|
18 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
19 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
34576
50b46054b869
test: rename obsfate template alias
Boris Feld <boris.feld@octobus.net>
parents:
34575
diff
changeset
|
20 > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 > [alias] |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 > tlog = log -G -T '{node|short}\ |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
23 > \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
|
24 > \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
|
25 > \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
|
26 > \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
|
27 > \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
|
28 > \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
|
29 > \n json: {successorssets|json}\n' |
34576
50b46054b869
test: rename obsfate template alias
Boris Feld <boris.feld@octobus.net>
parents:
34575
diff
changeset
|
30 > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
31 > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
32 > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 > EOF |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 Test templates on amended commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 ================================ |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 ---------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 $ hg init $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 $ cd $TESTTMP/templates-local-amend |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 $ echo 42 >> A0 |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
46 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
34575
dc91580a0a88
obsolete: add a devel.user.obsmarker
Boris Feld <boris.feld@octobus.net>
parents:
34287
diff
changeset
|
47 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 $ hg log --hidden -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
50 @ changeset: 3:d004c8f274b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
57 | x changeset: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
34900
3a3adbcbd3a0
obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
34865
diff
changeset
|
61 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 |
34900
3a3adbcbd3a0
obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
34865
diff
changeset
|
67 | obsolete: rewritten using amend as 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 $ hg up 'desc(A0)' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
78 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
|
79 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
|
80 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 Predecessors template should show current revision as it is the working copy |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 o d004c8f274b9 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
85 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
86 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
88 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
89 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
90 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
91 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
93 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
94 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
95 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
96 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
97 | Successors: 3:d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
98 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
99 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 o ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
101 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
102 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
103 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
104 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
105 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
106 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
107 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
108 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
109 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
110 o d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
111 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
112 | @ 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
113 |/ 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
|
114 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
115 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
116 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
117 $ hg fatelogkw |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
118 o d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
119 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
120 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
121 |/ 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
|
122 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
123 |
34852
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
124 |
45765
ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents:
45676
diff
changeset
|
125 $ 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
|
126 o changeset: 3:d004c8f274b9 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
127 | tag: tip |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
128 | parent: 0:ea207398892e |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
129 | user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
130 | 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
|
131 | summary: A2 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
132 | |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
133 | @ changeset: 1:471f378eab4c |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
134 |/ user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
135 | 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
|
136 | 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
|
137 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
138 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
139 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
140 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
141 date: Thu Jan 01 00:00:00 1970 +0000 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
142 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
143 |
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 $ hg log -G -T "default" |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
146 o changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
147 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
148 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
149 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
150 | 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
|
151 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
152 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
153 | @ changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
154 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
155 | 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
|
156 | 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
|
157 | summary: A0 |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
158 | |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
159 o changeset: 0:ea207398892e |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
160 user: test |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
161 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
|
162 summary: ROOT |
d45236f3d38e
log: add obsfate by default in changeset printer
Boris Feld <boris.feld@octobus.net>
parents:
34851
diff
changeset
|
163 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 $ 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
|
165 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
|
166 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
|
167 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 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
|
170 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 o d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
172 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
173 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
175 | 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
|
176 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
177 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
178 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 | @ a468dc9b3633 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
180 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
181 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
182 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
183 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
184 | Successors: 3:d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
185 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
186 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 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
|
188 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
189 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
190 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
191 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
192 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
193 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
194 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
195 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
196 $ hg fatelog |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
197 o d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
198 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
199 | @ a468dc9b3633 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
200 |/ 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
|
201 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
202 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 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
|
204 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 o d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
207 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
208 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
210 | 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
|
211 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
212 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
213 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 | @ a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
215 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
216 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
218 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
219 | Successors: 3:d004c8f274b9 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
220 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
221 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 | 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
|
223 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
224 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
225 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
226 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
227 | Successors: 2:a468dc9b3633 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
228 | multi-line: 2:a468dc9b3633 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
229 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 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
|
231 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
232 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
233 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
234 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
235 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
236 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
237 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
238 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
239 $ hg fatelog --hidden |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
240 o d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
241 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
242 | @ a468dc9b3633 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
243 |/ 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
|
244 | x 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
245 |/ 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
|
246 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
247 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
248 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 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
|
250 visible. |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
251 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
252 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
|
253 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
254 @ d004c8f274b9 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
255 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
256 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
257 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
258 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
259 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
260 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
261 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
262 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
|
263 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
264 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
265 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
266 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
267 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
268 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
269 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
270 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
271 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
272 @ d004c8f274b9 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
273 | Predecessors: 2:a468dc9b3633 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
274 | semi-colon: 2:a468dc9b3633 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
275 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
276 | 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
|
277 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
278 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
279 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 | x a468dc9b3633 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
281 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
282 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
284 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
285 | Successors: 3:d004c8f274b9 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
286 | multi-line: 3:d004c8f274b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
287 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 | 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
|
289 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
290 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
291 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
292 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
293 | Successors: 2:a468dc9b3633 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
33997
diff
changeset
|
294 | multi-line: 2:a468dc9b3633 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
295 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 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
|
297 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
298 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
299 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
300 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
301 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
302 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
303 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
304 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
305 $ hg fatelog |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
306 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
307 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
308 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
309 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
311 $ hg fatelog --hidden |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
312 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
313 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
314 | x a468dc9b3633 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
315 |/ 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
|
316 | x 471f378eab4c |
34578
794018ed8af0
test: use current user in the multi-user amend scenario
Boris Feld <boris.feld@octobus.net>
parents:
34577
diff
changeset
|
317 |/ 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
|
318 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
319 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
320 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
321 @ d004c8f274b9 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
322 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
323 | x a468dc9b3633 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
324 |/ 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
|
325 | x 471f378eab4c |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
326 |/ 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
|
327 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
328 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
329 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
330 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
|
331 ----------------------------------- |
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 $ 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
|
334 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
335 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
336 | x a468dc9b3633 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
337 |/ 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
|
338 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
339 |/ 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
|
340 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
341 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
342 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
343 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
344 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
345 | x a468dc9b3633 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
346 |/ 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
|
347 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
348 |/ 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
|
349 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
350 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
351 $ 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
|
352 @ d004c8f274b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
353 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
354 | x a468dc9b3633 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
355 |/ 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
|
356 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
357 |/ 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
|
358 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
359 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
360 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
361 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
362 @ changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
363 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
364 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
365 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
366 | 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
|
367 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
368 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
369 | x changeset: 2:a468dc9b3633 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
370 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
371 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
372 | 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
|
373 | 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
|
374 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
375 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
376 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
377 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
378 | 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
|
379 | 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
|
380 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
381 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
382 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
383 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
384 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
|
385 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
386 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
387 $ hg log -G -T "default" --hidden -v |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
388 @ changeset: 3:d004c8f274b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
389 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
390 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
391 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
392 | 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
|
393 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
394 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
395 | A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
396 | |
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 | x changeset: 2:a468dc9b3633 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
399 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
400 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
401 | 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
|
402 | 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
|
403 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
404 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
405 | A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
406 | |
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 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
409 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
410 | 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
|
411 | 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
|
412 | files: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
413 | description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
414 | A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
415 | |
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 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
418 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
419 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
|
420 files: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
421 description: |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
422 ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
423 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
424 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 Test templates with splitted commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 =================================== |
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 $ hg init $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 $ cd $TESTTMP/templates-local-split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
431 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
432 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
433 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
436 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
437 @ changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
438 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
439 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
440 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
441 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
442 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
443 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
444 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
445 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
446 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
447 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
448 # Simulate split |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
449 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
450 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
|
451 $ echo 42 >> a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
452 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
453 adding a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
454 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
455 $ echo 43 >> b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
456 $ hg commit -A -m "A0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
457 adding b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
458 $ 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
|
459 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
460 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
461 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
462 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
463 @ changeset: 3:f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
464 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
465 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
466 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
467 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 o changeset: 2:337fec4d2edc |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
470 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
471 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 | x changeset: 1:471597cad322 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 | 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
|
478 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 --------------- |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 $ hg up 'obsolete()' --hidden |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
490 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
|
491 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
|
492 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 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
|
495 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 o f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
497 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
498 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
500 | 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
|
501 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
502 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
503 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
505 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
506 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
508 | 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
|
509 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
510 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
511 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 | @ 471597cad322 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
513 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
514 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
515 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
516 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
517 | Successors: 2:337fec4d2edc 3:f257fde29c7a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
518 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
519 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 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
|
521 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
522 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
523 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
524 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
525 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
526 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
527 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
528 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
529 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
530 o f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
531 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
532 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
533 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
534 | @ 471597cad322 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
535 |/ 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
|
536 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
537 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 $ hg up f257fde29c7a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 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
|
540 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 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
|
542 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 @ f257fde29c7a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
545 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
546 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
547 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
548 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
549 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
550 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
551 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 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
|
553 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
554 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
555 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
556 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
557 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
558 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
559 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 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
|
561 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
562 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
563 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
564 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
565 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
566 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
567 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
568 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 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
|
570 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 @ f257fde29c7a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
573 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
574 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
576 | 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
|
577 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
578 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
579 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 o 337fec4d2edc |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
581 | Predecessors: 1:471597cad322 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
582 | semi-colon: 1:471597cad322 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
584 | 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
|
585 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
586 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
587 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 | 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
|
589 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
590 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
591 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
592 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
593 | Successors: 2:337fec4d2edc 3:f257fde29c7a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
594 | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
595 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 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
|
597 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
598 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
599 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
600 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
601 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
602 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
603 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
604 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
605 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
606 @ f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
607 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
608 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
609 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
610 | x 471597cad322 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
611 |/ 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
|
612 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
613 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
614 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
615 @ f257fde29c7a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
616 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
617 o 337fec4d2edc |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
618 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
619 | x 471597cad322 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
620 |/ 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
|
621 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
622 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
623 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
|
624 ----------------------------------- |
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 $ 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
|
627 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
628 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
629 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
630 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
631 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
632 |/ 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
|
633 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
634 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
635 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
636 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
637 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
638 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
639 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
640 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
641 |/ 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
|
642 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
643 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
644 $ 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
|
645 @ f257fde29c7a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
646 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
647 o 337fec4d2edc |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
648 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
649 | x 471597cad322 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
650 |/ 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
|
651 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
652 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
653 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
654 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
655 @ changeset: 3:f257fde29c7a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
656 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
657 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
658 | 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
|
659 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
660 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
661 o changeset: 2:337fec4d2edc |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
662 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
663 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
664 | 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
|
665 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
666 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
667 | x changeset: 1:471597cad322 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
668 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
669 | 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
|
670 | 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
|
671 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
672 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
673 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
674 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
675 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
|
676 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
677 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
678 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
679 Test templates with folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
680 ================================= |
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 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
683 ---------- |
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 $ hg init $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
686 $ cd $TESTTMP/templates-local-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
687 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
688 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
689 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
690 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
691 @ changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
692 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
693 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
694 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
695 | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
696 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
697 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
698 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
699 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
700 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
701 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
702 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
703 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
704 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
705 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
706 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
707 Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
708 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
709 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
|
710 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
711 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
712 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
713 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
714 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
715 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
716 $ 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
|
717 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
718 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
719 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
720 $ 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
|
721 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
722 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
723 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
724 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
725 @ changeset: 3:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
726 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
727 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
728 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
729 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
730 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
731 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
732 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
733 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
734 | | 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
|
735 | | obsolete: rewritten as 3:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
736 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
737 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
738 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
739 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
740 | 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
|
741 | obsolete: rewritten as 3:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
742 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
743 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
744 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
747 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
749 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 --------------- |
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 $ 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
|
753 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
|
754 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
|
755 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
756 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 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
|
758 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
759 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
760 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
761 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
763 | 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
|
764 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
765 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
766 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
768 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
769 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
770 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
771 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
772 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
773 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
774 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
775 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
|
776 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
777 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
778 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
779 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
780 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
781 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
782 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
783 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
784 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
785 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
786 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
787 | @ 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
788 |/ 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
|
789 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
790 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
791 $ 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
|
792 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
|
793 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
|
794 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
795 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
796 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
|
797 displayed |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
798 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
799 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
800 | 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
|
801 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
802 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
803 | 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
|
804 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
805 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
806 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
807 | @ 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
808 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
809 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
810 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
811 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
812 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
813 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
814 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
815 | 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
|
816 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
817 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
818 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
819 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
820 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
821 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
822 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
823 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
|
824 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
825 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
826 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
827 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
828 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
829 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
830 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
831 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
832 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
833 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
834 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
835 | @ 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
836 | | 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
|
837 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
838 |/ 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
|
839 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
840 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
841 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
842 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
843 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
844 Predecessors template should not show predecessors as they are not displayed in |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
845 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
846 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
847 @ eb5a0daa2192 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
848 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
849 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
850 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
851 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
852 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
853 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
854 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
855 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
|
856 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
857 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
858 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
859 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
860 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
861 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
862 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
863 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
|
864 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
865 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
866 @ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
867 | 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
|
868 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
869 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
870 | 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
|
871 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
872 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
873 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
874 | 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
|
875 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
876 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
877 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
878 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
879 | | Successors: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
880 | | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
881 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
882 | 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
|
883 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
884 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
885 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
886 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
887 | Successors: 3:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
888 | multi-line: 3:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
889 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
890 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
|
891 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
892 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
893 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
894 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
895 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
896 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
897 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
898 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
899 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
900 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
901 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
902 | x 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
903 | | 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
|
904 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
905 |/ 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
|
906 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
907 |
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 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
910 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
911 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
912 | x 0dec01379d3b |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
913 | | 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
|
914 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
915 |/ 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
|
916 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
917 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
918 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
|
919 ----------------------------------- |
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 $ 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
|
922 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
923 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
924 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
925 | | 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
|
926 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
927 |/ 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
|
928 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
929 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
930 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
931 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
932 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
933 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
934 | | 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
|
935 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
936 |/ 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
|
937 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
938 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
939 $ 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
|
940 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
941 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
942 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
943 | | 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
|
944 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
945 |/ 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
|
946 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
947 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
948 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
949 @ changeset: 3:eb5a0daa2192 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
950 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
951 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
952 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
953 | 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
|
954 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
955 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
956 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
957 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
958 | | 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
|
959 | | obsolete: rewritten as 3:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
960 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
961 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
962 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
963 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
964 | 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
|
965 | obsolete: rewritten as 3:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
966 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
967 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
968 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
969 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
970 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
|
971 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
972 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
973 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
974 Test templates with divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
975 ============================== |
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 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
978 ---------- |
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 $ hg init $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
981 $ cd $TESTTMP/templates-local-divergence |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
982 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
983 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
984 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
985 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
986 @ changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
987 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
988 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
989 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
990 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
991 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
992 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
993 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
994 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
995 | 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
|
996 | obsolete: rewritten using amend as 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
997 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
998 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
999 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1000 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1001 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1002 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1003 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1004 $ 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
|
1005 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
|
1006 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
|
1007 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1008 $ hg commit --amend -m "A2" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1009 2 new content-divergent changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1010 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1011 @ changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1012 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1013 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1014 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1015 | 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
|
1016 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1017 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1018 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1019 | * changeset: 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1020 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1021 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1022 | 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
|
1023 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1024 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1025 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1026 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1027 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1028 | 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
|
1029 | 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
|
1030 | obsolete: rewritten using amend as 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1031 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1032 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1033 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1034 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1035 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1036 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1037 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1038 $ hg commit --amend -m 'A3' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1039 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1040 @ changeset: 4:019fadeab383 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1041 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1042 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1043 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1044 | 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
|
1045 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1046 | summary: A3 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1047 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1048 | x changeset: 3:65b757b745b9 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1049 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1050 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1051 | 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
|
1052 | obsolete: rewritten using amend as 4:019fadeab383 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1053 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1054 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1055 | * changeset: 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1056 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1057 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1058 | 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
|
1059 | instability: content-divergent |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1060 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1061 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1062 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1063 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1064 | 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
|
1065 | 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
|
1066 | obsolete: rewritten using amend as 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1067 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1068 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1069 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1070 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1071 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1072 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1073 |
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 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1076 --------------- |
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 $ 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
|
1079 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
|
1080 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
|
1081 (hidden revision '471f378eab4c' has diverged) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1082 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1083 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
|
1084 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1085 * 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1086 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1087 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1088 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1089 | 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
|
1090 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1091 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1092 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1093 | * fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1094 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1095 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1096 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1097 | 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
|
1098 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1099 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1100 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1101 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1102 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1103 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1104 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1105 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1106 | Successors: 2:fdf9bde5129a; 4:019fadeab383 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1107 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1108 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1109 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1110 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
|
1111 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1112 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1113 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1114 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1115 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1116 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1117 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1118 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1119 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1120 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1121 | * fdf9bde5129a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1122 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1123 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1124 |/ 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
|
1125 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1126 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1127 $ hg up 'desc(A1)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1128 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
|
1129 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1130 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
|
1131 the log |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1132 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1133 * 019fadeab383 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1134 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1135 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1136 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1137 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1138 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1139 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1140 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1141 | @ fdf9bde5129a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1142 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1143 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1144 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1145 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1146 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1147 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1148 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1149 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
|
1150 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1151 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1152 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1153 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1154 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1155 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1156 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1157 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1158 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1159 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1160 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1161 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1162 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1163 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1164 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1165 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
|
1166 --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1167 $ hg tlog --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1168 * 019fadeab383 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1169 | Predecessors: 3:65b757b745b9 |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1170 | semi-colon: 3:65b757b745b9 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1171 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1172 | 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
|
1173 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1174 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1175 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1176 | x 65b757b745b9 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1177 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1178 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1179 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1180 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1181 | Successors: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1182 | multi-line: 4:019fadeab383 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1183 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1184 | @ fdf9bde5129a |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1185 |/ Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1186 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1187 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1188 | 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
|
1189 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1190 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1191 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1192 | 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
|
1193 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1194 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1195 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1196 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1197 | Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1198 | multi-line: 2:fdf9bde5129a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1199 | multi-line: 3:65b757b745b9 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1200 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1201 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
|
1202 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1203 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1204 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1205 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1206 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1207 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1208 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1209 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1210 $ hg fatelog --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1211 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1212 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1213 | x 65b757b745b9 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1214 |/ 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
|
1215 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1216 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1217 | x 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1218 |/ 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
|
1219 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1220 |
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 $ hg fatelogjson --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1223 * 019fadeab383 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1224 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1225 | x 65b757b745b9 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1226 |/ 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
|
1227 | @ fdf9bde5129a |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1228 |/ |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1229 | x 471f378eab4c |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1230 |/ 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
|
1231 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1232 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1233 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1234 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
|
1235 ----------------------------------- |
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 $ 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
|
1238 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1239 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1240 | x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1241 |/ 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
|
1242 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1243 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1244 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1245 |/ 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
|
1246 | 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
|
1247 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1248 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1249 $ hg fatelogkw --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1250 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1251 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1252 | x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1253 |/ 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
|
1254 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1255 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1256 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1257 |/ 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
|
1258 | 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
|
1259 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1260 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1261 $ 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
|
1262 * 019fadeab383 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1263 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1264 | x 65b757b745b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1265 |/ 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
|
1266 | @ fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1267 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1268 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1269 |/ 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
|
1270 | 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
|
1271 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1272 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1273 $ 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
|
1274 * changeset: 4:019fadeab383 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1275 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1276 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1277 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1278 | 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
|
1279 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1280 | summary: A3 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1281 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1282 | x changeset: 3:65b757b745b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1283 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1284 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1285 | 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
|
1286 | 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
|
1287 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1288 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1289 | @ changeset: 2:fdf9bde5129a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1290 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1291 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1292 | 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
|
1293 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1294 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1295 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1296 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1297 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1298 | 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
|
1299 | 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
|
1300 | 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
|
1301 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1302 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1303 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1304 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1305 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
|
1306 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1307 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1308 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1309 Test templates with amended + folded commit |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1310 =========================================== |
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 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1313 ---------- |
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 $ hg init $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1316 $ cd $TESTTMP/templates-local-amend-fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1317 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1318 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1319 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1320 $ hg commit --amend -m "B1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1321 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1322 @ changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1323 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1324 | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1325 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1326 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1327 | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1328 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1329 | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1330 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1331 | 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
|
1332 | obsolete: rewritten using amend as 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1333 | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1334 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1335 o changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1336 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1337 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1338 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1339 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1340 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1341 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1342 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1343 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1344 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1345 # Simulate a fold |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1346 $ hg up -r "desc(ROOT)" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1347 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
|
1348 $ echo "A0" > A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1349 $ echo "B0" > B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1350 $ hg commit -A -m "C0" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1351 adding A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1352 adding B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1353 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1354 $ 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
|
1355 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1356 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1357 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1358 $ 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
|
1359 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1360 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1361 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1362 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1363 @ changeset: 4:eb5a0daa2192 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1364 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1365 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1366 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1367 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1368 | summary: C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1369 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1370 | x changeset: 3:b7ea6d14e664 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1371 | | parent: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1372 | | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1373 | | 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
|
1374 | | obsolete: rewritten as 4:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1375 | | summary: B1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1376 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1377 | | x changeset: 2:0dec01379d3b |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1378 | |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1379 | | 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
|
1380 | | obsolete: rewritten using amend as 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1381 | | summary: B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1382 | | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1383 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1384 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1385 | 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
|
1386 | obsolete: rewritten as 4:eb5a0daa2192 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1387 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1388 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1389 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1390 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1391 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1392 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1393 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1394 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1395 --------------- |
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 $ 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
|
1398 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
|
1399 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
|
1400 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1401 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1402 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
|
1403 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1404 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1405 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1406 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1407 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1408 | 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
|
1409 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1410 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1411 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1412 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1413 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1414 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1415 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1416 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1417 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1418 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1419 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1420 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
|
1421 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1422 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1423 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1424 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1425 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1426 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1427 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1428 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1429 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1430 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1431 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1432 | @ 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1433 |/ 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
|
1434 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1435 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1436 $ 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
|
1437 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
|
1438 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
|
1439 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1440 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1441 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1442 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1443 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1444 | 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
|
1445 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1446 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1447 | 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
|
1448 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1449 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1450 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1451 | @ 0dec01379d3b |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1452 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1453 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1454 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1455 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1456 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1457 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1458 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1459 | 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
|
1460 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1461 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1462 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1463 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1464 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1465 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1466 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1467 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
|
1468 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1469 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1470 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1471 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1472 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1473 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1474 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1475 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1476 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1477 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1478 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1479 | @ 0dec01379d3b |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1480 | | 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
|
1481 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1482 |/ 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
|
1483 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1484 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1485 $ 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
|
1486 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
|
1487 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
|
1488 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1489 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1490 Predecessors template should both predecessors as they are visible |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1491 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1492 o eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1493 | 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
|
1494 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1495 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1496 | 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
|
1497 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1498 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1499 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1500 | @ b7ea6d14e664 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1501 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1502 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1503 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1504 | | map: |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1505 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1506 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1507 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1508 | 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
|
1509 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1510 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1511 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1512 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1513 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1514 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1515 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1516 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
|
1517 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1518 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1519 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1520 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1521 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1522 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1523 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1524 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1525 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1526 o eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1527 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1528 | @ b7ea6d14e664 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1529 | | 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
|
1530 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1531 |/ 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
|
1532 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1533 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1534 $ hg up 'desc(C0)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1535 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
|
1536 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1537 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
|
1538 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1539 @ eb5a0daa2192 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1540 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1541 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1542 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1543 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1544 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1545 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1546 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1547 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
|
1548 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1549 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1550 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1551 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1552 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1553 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1554 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1555 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1556 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1557 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1558 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1559 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1560 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1561 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
|
1562 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1563 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1564 @ eb5a0daa2192 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1565 | 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
|
1566 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1567 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1568 | 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
|
1569 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1570 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1571 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1572 | x b7ea6d14e664 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1573 | | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1574 | | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1575 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1576 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1577 | | Successors: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1578 | | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1579 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1580 | | 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
|
1581 | |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1582 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1583 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1584 | | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1585 | | Successors: 3:b7ea6d14e664 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1586 | | multi-line: 3:b7ea6d14e664 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1587 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1588 | 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
|
1589 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1590 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1591 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1592 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1593 | Successors: 4:eb5a0daa2192 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1594 | multi-line: 4:eb5a0daa2192 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1595 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1596 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
|
1597 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1598 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1599 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1600 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1601 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1602 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1603 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1604 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1605 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1606 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1607 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1608 | x b7ea6d14e664 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1609 | | 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
|
1610 | | x 0dec01379d3b |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1611 | |/ 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
|
1612 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
1613 |/ 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
|
1614 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1615 |
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 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1618 @ eb5a0daa2192 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1619 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1620 | x b7ea6d14e664 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1621 | | 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
|
1622 | | x 0dec01379d3b |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1623 | |/ 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
|
1624 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1625 |/ 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
|
1626 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1627 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1628 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1629 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
|
1630 ----------------------------------- |
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 $ 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
|
1633 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1634 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1635 | x b7ea6d14e664 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1636 | | 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
|
1637 | | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1638 | |/ 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
|
1639 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1640 |/ 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
|
1641 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1642 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1643 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1644 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1645 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1646 | x b7ea6d14e664 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1647 | | 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
|
1648 | | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1649 | |/ 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
|
1650 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1651 |/ 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
|
1652 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1653 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1654 $ 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
|
1655 @ eb5a0daa2192 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1656 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1657 | x b7ea6d14e664 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1658 | | 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
|
1659 | | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1660 | |/ 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
|
1661 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1662 |/ 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
|
1663 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1664 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1665 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1666 @ changeset: 4:eb5a0daa2192 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1667 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1668 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1669 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1670 | 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
|
1671 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1672 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1673 | x changeset: 3:b7ea6d14e664 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1674 | | parent: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1675 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1676 | | 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
|
1677 | | obsolete: rewritten as 4:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1678 | | summary: B1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1679 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1680 | | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1681 | |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1682 | | 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
|
1683 | | 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
|
1684 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1685 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1686 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1687 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1688 | 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
|
1689 | obsolete: rewritten as 4:eb5a0daa2192 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1690 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1691 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1692 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1693 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1694 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
|
1695 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1696 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1697 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1698 Test template with pushed and pulled obs markers |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1699 ================================================ |
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 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1702 ---------- |
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 $ hg init $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1705 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1706 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1707 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1708 $ 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
|
1709 updating to branch default |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1710 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
|
1711 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1712 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1713 @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1714 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1715 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1716 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1717 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1718 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1719 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1720 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1721 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1722 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1723 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1724 $ cd $TESTTMP/templates-local-remote-markers-1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1725 $ hg commit --amend -m "A1" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1726 $ hg commit --amend -m "A2" |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1727 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1728 @ changeset: 3:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1729 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1730 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1731 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1732 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1733 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1734 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1735 | x changeset: 2:fdf9bde5129a |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1736 |/ parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1737 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1738 | 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
|
1739 | obsolete: rewritten using amend as 3:7a230b46bf61 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1740 | summary: A1 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1741 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1742 | x changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1743 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1744 | 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
|
1745 | obsolete: rewritten using amend as 2:fdf9bde5129a |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1746 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1747 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1748 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1749 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1750 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1751 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1752 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1753 $ cd $TESTTMP/templates-local-remote-markers-2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1754 $ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35010
diff
changeset
|
1755 pulling from $TESTTMP/templates-local-remote-markers-1 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1756 searching for changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1757 adding changesets |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1758 adding manifests |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1759 adding file changes |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1760 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
|
1761 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
|
1762 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
|
1763 new changesets 7a230b46bf61 (1 drafts) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1764 (run 'hg heads' to see heads, 'hg merge' to merge) |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1765 $ hg log --hidden -G |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1766 o changeset: 2:7a230b46bf61 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1767 | tag: tip |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1768 | parent: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1769 | user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1770 | date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1771 | summary: A2 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1772 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1773 | @ changeset: 1:471f378eab4c |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1774 |/ user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1775 | 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
|
1776 | obsolete: rewritten using amend as 2:7a230b46bf61 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1777 | summary: A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1778 | |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1779 o changeset: 0:ea207398892e |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1780 user: test |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1781 date: Thu Jan 01 00:00:00 1970 +0000 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1782 summary: ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1783 |
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 $ hg debugobsolete |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1786 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
|
1787 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
|
1788 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1789 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1790 --------------- |
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 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
|
1793 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1794 o 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1795 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1796 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1797 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1798 | 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
|
1799 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1800 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1801 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1802 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1803 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1804 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1805 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1806 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1807 | Successors: 2:7a230b46bf61 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1808 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1809 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1810 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
|
1811 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1812 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1813 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1814 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1815 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1816 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1817 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1818 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1819 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1820 o 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1821 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1822 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1823 |/ 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
|
1824 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1825 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1826 $ hg up 'desc(A2)' |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1827 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
|
1828 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1829 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
|
1830 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1831 @ 7a230b46bf61 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1832 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1833 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1834 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1835 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1836 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1837 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1838 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1839 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
|
1840 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1841 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1842 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1843 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1844 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1845 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1846 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1847 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1848 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1849 @ 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1850 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1851 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1852 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1853 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
|
1854 with --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1855 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1856 @ 7a230b46bf61 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1857 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1858 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1859 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1860 | 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
|
1861 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1862 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1863 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1864 | 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
|
1865 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1866 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1867 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1868 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1869 | Successors: 2:7a230b46bf61 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1870 | multi-line: 2:7a230b46bf61 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
1871 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1872 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
|
1873 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1874 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1875 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1876 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1877 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1878 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1879 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1880 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1881 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1882 @ 7a230b46bf61 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1883 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1884 | x 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
1885 |/ 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
|
1886 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1887 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1888 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1889 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
|
1890 ----------------------------------- |
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 $ 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
|
1893 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1894 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1895 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1896 |/ 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
|
1897 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1898 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1899 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1900 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1901 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1902 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1903 |/ 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
|
1904 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1905 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1906 $ 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
|
1907 @ 7a230b46bf61 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1908 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1909 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1910 |/ 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
|
1911 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1912 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1913 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1914 @ changeset: 2:7a230b46bf61 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1915 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1916 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1917 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1918 | 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
|
1919 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1920 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1921 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1922 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1923 | 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
|
1924 | 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
|
1925 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1926 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1927 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1928 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1929 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
|
1930 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
1931 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
1932 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1933 Test template with obsmarkers cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1934 =================================== |
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 Test setup |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1937 ---------- |
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 $ hg init $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1940 $ cd $TESTTMP/templates-local-cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1941 $ mkcommit ROOT |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1942 $ mkcommit A0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1943 $ mkcommit B0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1944 $ hg up -r 0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1945 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
|
1946 $ mkcommit C0 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1947 created new head |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1948 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1949 Create the cycle |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1950 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1951 $ 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
|
1952 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1953 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
1954 1 new orphan changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1955 $ 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
|
1956 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
1957 obsoleted 1 changesets |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1958 $ 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
|
1959 1 new obsolescence markers |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1960 |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1961 Check templates |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1962 --------------- |
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 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1965 @ f897c6137566 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1966 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1967 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1968 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1969 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1970 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1971 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1972 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1973 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
|
1974 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1975 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1976 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1977 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1978 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1979 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
1980 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1981 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1982 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1983 @ f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1984 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1985 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1986 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
1987 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1988 $ 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
|
1989 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
|
1990 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
|
1991 (hidden revision '0dec01379d3b' is pruned) |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1992 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1993 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1994 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
1995 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1996 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
1997 | 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
|
1998 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
1999 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2000 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2001 | @ 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2002 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2003 | | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2004 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2005 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2006 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2007 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2008 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2009 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2010 | x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2011 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2012 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2013 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2014 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2015 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2016 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2017 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2018 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
|
2019 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2020 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2021 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2022 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2023 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2024 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2025 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2026 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2027 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2028 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2029 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2030 | @ 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2031 | | 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
|
2032 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2033 |/ 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
|
2034 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2035 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2036 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2037 $ hg up -r "desc(A0)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2038 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
|
2039 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2040 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2041 | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2042 | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2043 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2044 | 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
|
2045 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2046 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2047 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2048 | @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2049 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2050 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2051 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2052 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2053 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2054 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2055 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2056 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
|
2057 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2058 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2059 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2060 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2061 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2062 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2063 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2064 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2065 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2066 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2067 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2068 | @ 471f378eab4c |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
2069 |/ Obsfate: pruned; |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2070 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2071 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2072 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2073 $ hg up -r "desc(ROOT)" --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2074 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
|
2075 $ hg tlog |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2076 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
|
2077 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2078 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2079 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2080 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2081 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2082 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2083 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2084 @ ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2085 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2086 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2087 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2088 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2089 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2090 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2091 json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2092 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2093 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2094 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2095 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2096 @ ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2097 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2098 |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2099 $ hg tlog --hidden |
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2100 o f897c6137566 |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2101 | Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2102 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2103 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2104 | 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
|
2105 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2106 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2107 | json: [] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2108 | x 0dec01379d3b |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2109 | | Predecessors: 1:471f378eab4c |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2110 | | semi-colon: 1:471f378eab4c |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2111 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2112 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2113 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2114 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2115 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2116 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2117 | x 471f378eab4c |
32911
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2118 |/ Predecessors: 2:0dec01379d3b |
7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
Yuya Nishihara <yuya@tcha.org>
parents:
32910
diff
changeset
|
2119 | semi-colon: 2:0dec01379d3b |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2120 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
32910
498e9dcc5fa9
templatekw: populate all keywords depending on predecessor in map operation
Yuya Nishihara <yuya@tcha.org>
parents:
32909
diff
changeset
|
2121 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2122 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2123 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2124 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
32879
1858fc2327ef
template: add predecessors template
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2125 @ ea207398892e |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2126 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2127 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2128 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2129 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2130 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2131 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2132 json: [] |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2133 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2134 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
|
2135 ----------------------------------- |
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 $ 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
|
2138 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2139 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2140 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2141 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2142 | | 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
|
2143 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2144 |/ 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
|
2145 @ ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2146 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2147 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2148 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2149 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2150 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2151 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2152 | | 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
|
2153 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2154 |/ 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
|
2155 @ ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2156 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2157 $ 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
|
2158 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2159 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2160 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2161 | | 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
|
2162 | | 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
|
2163 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2164 |/ 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
|
2165 @ ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2166 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2167 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2168 o changeset: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2169 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2170 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2171 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2172 | 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
|
2173 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2174 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2175 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2176 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2177 | | 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
|
2178 | | obsolete: rewritten as 3:f897c6137566 |
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
2179 | | obsolete: rewritten as 1:471f378eab4c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2180 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2181 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2182 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2183 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2184 | 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
|
2185 | obsolete: rewritten as 2:0dec01379d3b |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2186 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2187 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2188 @ changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2189 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2190 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
|
2191 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2192 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2193 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2194 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
|
2195 ================================================= |
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 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2198 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2199 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2200 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2201 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2202 | 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
|
2203 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2204 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2205 @ changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2206 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2207 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
|
2208 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2209 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2210 $ hg up |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2211 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
|
2212 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2213 Create a commit with three files |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2214 $ touch A B C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2215 $ 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
|
2216 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2217 Split it |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2218 $ hg up 3 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2219 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
|
2220 $ touch A |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2221 $ 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
|
2222 created new head |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2223 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2224 $ touch B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2225 $ 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
|
2226 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2227 $ touch C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2228 $ 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
|
2229 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2230 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2231 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2232 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2233 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2234 | 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
|
2235 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2236 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2237 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2238 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2239 | 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
|
2240 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2241 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2242 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2243 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2244 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2245 | 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
|
2246 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2247 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2248 | o changeset: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2249 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2250 | 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
|
2251 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2252 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2253 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2254 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2255 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2256 | 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
|
2257 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2258 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2259 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2260 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2261 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
|
2262 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2263 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2264 $ 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
|
2265 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
2266 obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2267 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2268 @ changeset: 7:ba2ed02b0c9a |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2269 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2270 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2271 | 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
|
2272 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2273 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2274 o changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2275 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2276 | 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
|
2277 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2278 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2279 o changeset: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2280 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2281 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2282 | 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
|
2283 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2284 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2285 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2286 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2287 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2288 | 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
|
2289 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2290 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2291 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2292 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2293 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
|
2294 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2295 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2296 Diverge one of the splitted commit |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2297 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2298 $ hg up 6 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2299 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
|
2300 $ hg commit --amend -m "Add only B" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
2301 1 new orphan changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2302 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2303 $ hg up 6 --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2304 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
|
2305 $ hg commit --amend -m "Add B only" |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35518
diff
changeset
|
2306 4 new content-divergent changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2307 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2308 $ hg log -G |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2309 @ changeset: 9:0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2310 | tag: tip |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2311 | parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2312 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2313 | 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
|
2314 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2315 | summary: Add B only |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2316 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2317 | * changeset: 8:b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2318 |/ parent: 5:dd800401bd8c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2319 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2320 | 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
|
2321 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2322 | summary: Add only B |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2323 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2324 | * changeset: 7:ba2ed02b0c9a |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2325 | | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2326 | | 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
|
2327 | | instability: orphan, content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2328 | | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2329 | | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2330 | x changeset: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2331 |/ user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2332 | 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
|
2333 | 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
|
2334 | 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
|
2335 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2336 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2337 * changeset: 5:dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2338 | parent: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2339 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2340 | 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
|
2341 | instability: content-divergent |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2342 | summary: Add A,B,C |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2343 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2344 o changeset: 3:f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2345 | parent: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2346 | user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2347 | 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
|
2348 | summary: C0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2349 | |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2350 o changeset: 0:ea207398892e |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2351 user: test |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2352 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
|
2353 summary: ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2354 |
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 Check templates |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2357 --------------- |
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 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2360 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2361 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2362 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2363 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2364 | 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
|
2365 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2366 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2367 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2368 | * b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2369 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2370 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2371 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2372 | 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
|
2373 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2374 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2375 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2376 | * ba2ed02b0c9a |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2377 | | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2378 | | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2379 | | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2380 | | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2381 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2382 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2383 | | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2384 | 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
|
2385 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2386 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2387 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2388 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2389 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2390 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2391 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2392 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2393 * dd800401bd8c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2394 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2395 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2396 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2397 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2398 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2399 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2400 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2401 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
|
2402 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2403 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2404 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2405 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2406 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2407 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2408 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2409 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
|
2410 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2411 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2412 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2413 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2414 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2415 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2416 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2417 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2418 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2419 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2420 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2421 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2422 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2423 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2424 | x 4a004186e638 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2425 |/ 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
|
2426 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2427 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2428 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2429 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2430 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2431 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2432 $ hg tlog --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2433 @ 0b997eb7ceee |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2434 | Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2435 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2436 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2437 | 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
|
2438 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2439 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2440 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2441 | * b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2442 |/ Predecessors: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2443 | semi-colon: 6:4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2444 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2445 | 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
|
2446 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2447 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2448 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2449 | * ba2ed02b0c9a |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2450 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2451 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2452 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2453 | | 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
|
2454 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2455 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2456 | | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2457 | x 4a004186e638 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2458 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2459 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2460 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2461 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2462 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2463 | multi-line: 8:b18bc8331526 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2464 | multi-line: 9:0b997eb7ceee |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2465 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2466 * dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2467 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2468 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2469 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2470 | 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
|
2471 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2472 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2473 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2474 | 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
|
2475 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2476 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2477 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2478 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2479 | Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2480 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2481 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2482 o f897c6137566 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2483 | Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2484 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2485 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2486 | 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
|
2487 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2488 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2489 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2490 | x 0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2491 | | Predecessors: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2492 | | semi-colon: 1:471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2493 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2494 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2495 | | Successors: 3:f897c6137566; 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2496 | | multi-line: 3:f897c6137566 |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2497 | | multi-line: 1:471f378eab4c |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2498 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2499 | x 471f378eab4c |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2500 |/ Predecessors: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2501 | semi-colon: 2:0dec01379d3b |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2502 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2503 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
33276
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2504 | Successors: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2505 | multi-line: 2:0dec01379d3b |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2506 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2507 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
|
2508 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2509 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2510 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2511 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2512 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2513 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2514 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2515 $ hg fatelog --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2516 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2517 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2518 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2519 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2520 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2521 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2522 | x 4a004186e638 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2523 |/ 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
|
2524 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2525 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2526 | x 9bd10a0775e4 |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2527 |/ 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
|
2528 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2529 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2530 | x 0dec01379d3b |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2531 | | 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
|
2532 | x 471f378eab4c |
33995
c35c0f54f420
template: compute dates in obsfatedate
Boris Feld <boris.feld@octobus.net>
parents:
33994
diff
changeset
|
2533 |/ 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
|
2534 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2535 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2536 $ hg fatelogjson --hidden |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2537 @ 0b997eb7ceee |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2538 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2539 | * b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2540 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2541 | * ba2ed02b0c9a |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2542 | | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2543 | x 4a004186e638 |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
2544 |/ 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
|
2545 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2546 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2547 | x 9bd10a0775e4 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2548 |/ 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
|
2549 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2550 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2551 | x 0dec01379d3b |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2552 | | 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
|
2553 | x 471f378eab4c |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2554 |/ 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
|
2555 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2556 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2557 $ hg up --hidden 4 |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
35711
diff
changeset
|
2558 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
|
2559 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
|
2560 (hidden revision '9bd10a0775e4' has diverged) |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2561 $ 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
|
2562 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
|
2563 $ hg tlog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2564 * eceed8f98ffc |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2565 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2566 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2567 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2568 | 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
|
2569 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2570 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2571 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2572 | * 0b997eb7ceee |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2573 | | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2574 | | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2575 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2576 | | 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
|
2577 | | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2578 | | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2579 | | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2580 * | b18bc8331526 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2581 |/ Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2582 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2583 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2584 | 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
|
2585 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2586 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2587 | json: [] |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2588 * dd800401bd8c |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2589 | Predecessors: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2590 | semi-colon: 4:9bd10a0775e4 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2591 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2592 | 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
|
2593 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2594 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2595 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2596 | @ 9bd10a0775e4 |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2597 |/ Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2598 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2599 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2600 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2601 | 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
|
2602 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2603 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
89796a25d4bb
template: add successors template
Boris Feld <boris.feld@octobus.net>
parents:
33275
diff
changeset
|
2604 | 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
|
2605 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
|
2606 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2607 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2608 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2609 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2610 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2611 | multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2612 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2613 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
|
2614 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2615 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2616 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2617 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2618 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2619 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2620 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2621 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2622 $ hg fatelog |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2623 * eceed8f98ffc |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2624 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2625 | * 0b997eb7ceee |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2626 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2627 * | b18bc8331526 |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2628 |/ |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2629 * dd800401bd8c |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2630 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2631 | @ 9bd10a0775e4 |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2632 |/ 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
|
2633 o f897c6137566 |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2634 | |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2635 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2636 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2637 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
|
2638 ----------------------------------- |
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 $ 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
|
2641 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2642 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2643 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2644 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2645 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2646 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2647 | x ba2ed02b0c9a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2648 | | 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
|
2649 | x 4a004186e638 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2650 |/ 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
|
2651 | 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
|
2652 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2653 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2654 | @ 9bd10a0775e4 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2655 |/ 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
|
2656 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2657 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2658 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2659 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2660 | | 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
|
2661 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2662 |/ 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
|
2663 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2664 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2665 $ hg fatelogkw --hidden |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2666 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2667 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2668 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2669 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2670 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2671 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2672 | x ba2ed02b0c9a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2673 | | 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
|
2674 | x 4a004186e638 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2675 |/ 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
|
2676 | 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
|
2677 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2678 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2679 | @ 9bd10a0775e4 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2680 |/ 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
|
2681 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2682 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2683 | x 0dec01379d3b |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2684 | | Obsfate: rewritten as 3:f897c6137566 |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2685 | | 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
|
2686 | x 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2687 |/ 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
|
2688 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2689 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2690 $ 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
|
2691 * eceed8f98ffc |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2692 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2693 | * 0b997eb7ceee |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2694 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2695 * | b18bc8331526 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2696 |/ |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2697 | x ba2ed02b0c9a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2698 | | 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
|
2699 | x 4a004186e638 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2700 |/ 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
|
2701 | 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
|
2702 * dd800401bd8c |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2703 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2704 | @ 9bd10a0775e4 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2705 |/ 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
|
2706 o f897c6137566 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2707 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2708 | x 0dec01379d3b |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2709 | | 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
|
2710 | | 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
|
2711 | x 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2712 |/ 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
|
2713 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2714 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2715 $ 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
|
2716 * changeset: 10:eceed8f98ffc |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2717 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2718 | parent: 8:b18bc8331526 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2719 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2720 | 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
|
2721 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2722 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2723 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2724 | * changeset: 9:0b997eb7ceee |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2725 | | parent: 5:dd800401bd8c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2726 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2727 | | 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
|
2728 | | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2729 | | summary: Add B only |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2730 | | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2731 * | changeset: 8:b18bc8331526 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2732 |/ parent: 5:dd800401bd8c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2733 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2734 | 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
|
2735 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2736 | summary: Add only B |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2737 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2738 | x changeset: 7:ba2ed02b0c9a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2739 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2740 | | 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
|
2741 | | 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
|
2742 | | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2743 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2744 | x changeset: 6:4a004186e638 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2745 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2746 | 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
|
2747 | 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
|
2748 | 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
|
2749 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2750 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
2751 * changeset: 5:dd800401bd8c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2752 | parent: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2753 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2754 | 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
|
2755 | instability: content-divergent |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2756 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2757 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2758 | @ changeset: 4:9bd10a0775e4 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2759 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2760 | 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
|
2761 | 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
|
2762 | summary: Add A,B,C |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2763 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2764 o changeset: 3:f897c6137566 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2765 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2766 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2767 | 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
|
2768 | summary: C0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2769 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2770 | x changeset: 2:0dec01379d3b |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2771 | | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2772 | | 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
|
2773 | | obsolete: rewritten as 3:f897c6137566 |
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
2774 | | obsolete: rewritten as 1:471f378eab4c |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2775 | | summary: B0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2776 | | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2777 | x changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2778 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2779 | 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
|
2780 | obsolete: rewritten as 2:0dec01379d3b |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2781 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2782 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2783 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2784 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2785 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
|
2786 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2787 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2788 |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2789 Test templates with pruned commits |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2790 ================================== |
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 Test setup |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2793 ---------- |
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 $ hg init $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2796 $ cd $TESTTMP/templates-local-prune |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2797 $ mkcommit ROOT |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2798 $ mkcommit A0 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2799 $ 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
|
2800 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33276
diff
changeset
|
2801 obsoleted 1 changesets |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2802 |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2803 Check output |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2804 ------------ |
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 $ hg up "desc(A0)" --hidden |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2807 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
|
2808 $ hg tlog |
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2809 @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2810 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2811 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2812 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2813 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2814 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2815 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2816 | json: [] |
33275
4cf60d5894b5
template: add tests for more complex cases
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
2817 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
|
2818 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2819 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2820 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2821 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2822 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2823 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2824 json: [] |
33912
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2825 $ hg fatelog |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2826 @ 471f378eab4c |
33996
98fa777cd7a1
template: better prune support in obsfate
Boris Feld <boris.feld@octobus.net>
parents:
33995
diff
changeset
|
2827 | 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
|
2828 o ea207398892e |
e278d6d2d7d2
template: add minimal obsfate template function
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
2829 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2830 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
|
2831 =========================================== |
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 Test setup |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2834 ---------- |
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 $ 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
|
2837 $ cd $TESTTMP/multiple-local-prune |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2838 $ mkcommit ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2839 $ mkcommit A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2840 $ hg commit --amend -m "A1" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2841 $ 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
|
2842 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2843 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2844 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2845 $ 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
|
2846 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
|
2847 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
|
2848 (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
|
2849 $ hg commit --amend -m "A2" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2850 $ 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
|
2851 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2852 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2853 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2854 Check output |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2855 ------------ |
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 $ 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
|
2858 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
|
2859 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
|
2860 (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
|
2861 $ hg tlog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2862 @ 471f378eab4c |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2863 | Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2864 | semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2865 | json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2866 | map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2867 | Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2868 | multi-line: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2869 | json: [] |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2870 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
|
2871 Predecessors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2872 semi-colon: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2873 json: [] |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2874 map: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2875 Successors: |
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2876 multi-line: |
45676
f95b23283760
templatekw: make {successorssets} always return a list (issue6342)
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
45675
diff
changeset
|
2877 json: [] |
45675
59ab71498bee
tests: test output of {predecessors}, {successorssets} for non-obsolete csets
Aay Jay Chan <aayjaychan@itopia.com.hk>
parents:
42893
diff
changeset
|
2878 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2879 # 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
|
2880 $ hg fatelog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2881 @ 471f378eab4c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2882 | Obsfate: pruned; |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2883 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2884 |
34577
3c1bb8a4275d
test: cleanup verbosity variant from fatelog test
Boris Feld <boris.feld@octobus.net>
parents:
34576
diff
changeset
|
2885 $ hg fatelog --hidden |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2886 x 65b757b745b9 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2887 | 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
|
2888 | x fdf9bde5129a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2889 |/ 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
|
2890 | @ 471f378eab4c |
34287
7cdc8c5a481a
templates: introduce a obsfateoperation() function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34286
diff
changeset
|
2891 |/ 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
|
2892 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2893 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2894 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
|
2895 ----------------------------------- |
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 $ 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
|
2898 x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2899 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2900 | x fdf9bde5129a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2901 |/ Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2902 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2903 |/ 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
|
2904 | 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
|
2905 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2906 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2907 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2908 x 65b757b745b9 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2909 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2910 | x fdf9bde5129a |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2911 |/ Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2912 | @ 471f378eab4c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
2913 |/ 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
|
2914 | 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
|
2915 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2916 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2917 $ 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
|
2918 x 65b757b745b9 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2919 | 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
|
2920 | x fdf9bde5129a |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2921 |/ 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
|
2922 | @ 471f378eab4c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2923 |/ 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
|
2924 | 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
|
2925 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
2926 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2927 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2928 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2929 x changeset: 3:65b757b745b9 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2930 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2931 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2932 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2933 | 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
|
2934 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2935 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2936 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2937 | x changeset: 2:fdf9bde5129a |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2938 |/ parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2939 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2940 | 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
|
2941 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2942 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2943 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2944 | @ changeset: 1:471f378eab4c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2945 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2946 | 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
|
2947 | 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
|
2948 | 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
|
2949 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2950 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2951 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2952 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2953 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
|
2954 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2955 |
41722
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2956 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
|
2957 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2958 $ hg log -G -T "{negrev}\n" |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2959 @ -3 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2960 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2961 o -4 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2962 |
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 $ hg log -G -T "{negrev}\n" --hidden |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2965 x -1 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2966 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2967 | x -2 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2968 |/ |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2969 | @ -3 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2970 |/ |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2971 o -4 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
2972 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
2973 |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2974 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
|
2975 ============================================== |
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 $ 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
|
2978 $ 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
|
2979 $ mkcommit ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2980 $ echo 42 >> a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2981 $ echo 43 >> b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2982 $ hg commit -A -m "A0" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2983 adding a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2984 adding b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2985 $ hg log --hidden -G |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2986 @ changeset: 1:471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2987 | tag: tip |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2988 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2989 | 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
|
2990 | summary: A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2991 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2992 o changeset: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2993 user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2994 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
|
2995 summary: ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2996 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2997 # Simulate split |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2998 $ hg up -r "desc(ROOT)" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
2999 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
|
3000 $ echo 42 >> a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3001 $ hg commit -A -m "A1" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3002 adding a |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3003 created new head |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3004 $ echo 43 >> b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3005 $ hg commit -A -m "A2" |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3006 adding b |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3007 $ 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
|
3008 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3009 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3010 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3011 # Simulate prune |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3012 $ 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
|
3013 1 new obsolescence markers |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3014 obsoleted 1 changesets |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3015 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3016 $ hg log --hidden -G |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3017 @ changeset: 3:0d0ef4bdf70e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3018 | tag: tip |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3019 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3020 | 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
|
3021 | obsolete: pruned |
33997
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3022 | summary: A2 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3023 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3024 o changeset: 2:617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3025 | parent: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3026 | user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3027 | 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
|
3028 | summary: A1 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3029 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3030 | x changeset: 1:471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3031 |/ user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3032 | 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
|
3033 | 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
|
3034 | summary: A0 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3035 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3036 o changeset: 0:ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3037 user: test |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3038 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
|
3039 summary: ROOT |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3040 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3041 Check templates |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3042 --------------- |
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 $ 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
|
3045 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
|
3046 updated to hidden changeset 471597cad322 |
41152
191fac9ff9d3
obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
39707
diff
changeset
|
3047 (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
|
3048 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3049 # 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
|
3050 $ hg fatelog |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3051 o 617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3052 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3053 | @ 471597cad322 |
41152
191fac9ff9d3
obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
39707
diff
changeset
|
3054 |/ 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
|
3055 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3056 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3057 $ 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
|
3058 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
|
3059 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
|
3060 (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
|
3061 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3062 $ hg fatelog --hidden |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3063 @ 0d0ef4bdf70e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3064 | 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
|
3065 o 617adc3a144c |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3066 | |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3067 | x 471597cad322 |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3068 |/ 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
|
3069 o ea207398892e |
d0f1e3d3ef4d
test: add more obsmarker tests for pruning scenarios
Boris Feld <boris.feld@octobus.net>
parents:
33996
diff
changeset
|
3070 |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3071 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3072 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
|
3073 ----------------------------------- |
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 $ 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
|
3076 @ 0d0ef4bdf70e |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3077 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3078 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3079 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3080 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3081 |/ 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
|
3082 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3083 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3084 $ hg fatelogkw --hidden |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3085 @ 0d0ef4bdf70e |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3086 | Obsfate: pruned |
34848
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3087 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3088 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3089 | x 471597cad322 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
3090 |/ 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
|
3091 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3092 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3093 $ 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
|
3094 @ 0d0ef4bdf70e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3095 | 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
|
3096 o 617adc3a144c |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3097 | |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3098 | x 471597cad322 |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3099 |/ 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
|
3100 o ea207398892e |
6a6371d2970e
test: test obfate template keyword in test-obsmarker-template.t
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
3101 |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3102 $ hg log -G -T "default" --hidden |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3103 @ changeset: 3:0d0ef4bdf70e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3104 | tag: tip |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3105 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3106 | 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
|
3107 | obsolete: pruned |
34853
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3108 | summary: A2 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3109 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3110 o changeset: 2:617adc3a144c |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3111 | parent: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3112 | user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3113 | 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
|
3114 | summary: A1 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3115 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3116 | x changeset: 1:471597cad322 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3117 |/ user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3118 | 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
|
3119 | 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
|
3120 | summary: A0 |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3121 | |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3122 o changeset: 0:ea207398892e |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3123 user: test |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3124 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
|
3125 summary: ROOT |
962f7df21a73
obsfate: add obsfate to default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34852
diff
changeset
|
3126 |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3127 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3128 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
|
3129 ================================== |
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 $ 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
|
3132 $ 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
|
3133 $ 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
|
3134 > [extensions] |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3135 > amend = |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3136 > EOF |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39480
diff
changeset
|
3137 $ "$PYTHON" <<'EOF' |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3138 > 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
|
3139 > 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
|
3140 > 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
|
3141 > 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
|
3142 > EOF |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3143 $ mkcommit ROOT |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3144 $ ( 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
|
3145 $ echo 42 >> A0 |
38747
2b7ce7b55514
test-obsmarker-template: add missing HGENCODING=latin-1
Yuya Nishihara <yuya@tcha.org>
parents:
38707
diff
changeset
|
3146 $ 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
|
3147 $ 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
|
3148 > --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
|
3149 $ mkcommit B0 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3150 $ 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
|
3151 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
|
3152 obsoleted 1 changesets |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3153 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3154 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
|
3155 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
|
3156 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3157 $ 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
|
3158 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
|
3159 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
|
3160 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
|
3161 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3162 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
|
3163 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3164 $ 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
|
3165 @ 8f82db6f991d |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3166 | 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
|
3167 o 1132562159b3 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3168 | |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3169 | x 718c0d00cee1 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3170 |/ 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
|
3171 | x 5f66a482f0bb |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3172 |/ 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
|
3173 o ea207398892e |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3174 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3175 $ 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
|
3176 @ 8f82db6f991d |
38707
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3177 | 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
|
3178 o 1132562159b3 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3179 | |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3180 | x 718c0d00cee1 |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3181 |/ 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
|
3182 | x 5f66a482f0bb |
38748
18df1c6c080f
test-obsmarker-template: run mkcommit in subshell to isolate envvars
Yuya Nishihara <yuya@tcha.org>
parents:
38747
diff
changeset
|
3183 |/ 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
|
3184 o ea207398892e |
6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
37920
diff
changeset
|
3185 |
41722
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3186 $ hg log -G -T "{negrev}\n" |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3187 @ -1 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3188 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3189 o -2 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3190 | |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3191 o -5 |
37b33c34bf4f
templatekw: add a {negrev} keyword
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
41152
diff
changeset
|
3192 |