mercurial: tests/test-obsmarker-template.t@962f7df21a73 (annotated)

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

author	Boris Feld <boris.feld@octobus.net>
	Fri, 06 Oct 2017 17:53:36 +0200
changeset 34853	962f7df21a73
parent 34852	d45236f3d38e
child 34865	a0100f34e20b
permissions	-rw-r--r--