mercurial: tests/test-obsmarker-template.t@6f53a53245a2 (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
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	67	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	70	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	71	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	72
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	73	Check templates
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	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	76	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	77
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	78	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	79	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	80	o d004c8f274b9
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	81	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	82	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	83	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	84	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	85	\| @ 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	86	\|/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	87	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	88	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	89	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	90
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	91	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	92	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	93	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	94	\| @ 471f378eab4c
34578 794018ed8af0 test: use current user in the multi-user amend scenario Boris Feld <boris.feld@octobus.net> parents: 34577 diff changeset	95	\|/ 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	96	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	97
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	98
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	99	$ hg fatelogkw
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	100	o d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	101	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	102	\| @ 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	103	\|/ 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	104	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	105
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	106	$ hg up 'desc(A1)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	107	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	108
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	109	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	110	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	111	o d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	112	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	113	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	114	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	115	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	116	\| @ a468dc9b3633
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	117	\|/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	118	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	119	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	120	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	121
34577 3c1bb8a4275d test: cleanup verbosity variant from fatelog test Boris Feld <boris.feld@octobus.net> parents: 34576 diff changeset	122	$ hg fatelog
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	123	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	124	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	125	\| @ a468dc9b3633
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	126	\|/ 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	127	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	128
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	129	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	130	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	131	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	132	o d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	133	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	134	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	135	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	136	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	137	\| @ a468dc9b3633
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	138	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	139	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	140	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	141	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	142	\| Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	143	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	144	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	145	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	146	\|/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	147	\| multi-line: 2:a468dc9b3633
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	148	\| json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	149	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	150
34577 3c1bb8a4275d test: cleanup verbosity variant from fatelog test Boris Feld <boris.feld@octobus.net> parents: 34576 diff changeset	151	$ hg fatelog --hidden
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	152	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	153	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	154	\| @ a468dc9b3633
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	155	\|/ 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	156	\| x 471f378eab4c
34578 794018ed8af0 test: use current user in the multi-user amend scenario Boris Feld <boris.feld@octobus.net> parents: 34577 diff changeset	157	\|/ 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	158	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	159
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	160
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	161	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	162	visible.
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	163	$ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	164	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	165	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	166	@ d004c8f274b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	167	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	168	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	169
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	170	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	171	@ d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	172	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	173	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	174	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	175	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	176	\| x a468dc9b3633
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	177	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	178	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	179	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	180	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	181	\| Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	182	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	183	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	184	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	185	\|/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	186	\| multi-line: 2:a468dc9b3633
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	187	\| json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	188	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	189
34577 3c1bb8a4275d test: cleanup verbosity variant from fatelog test Boris Feld <boris.feld@octobus.net> parents: 34576 diff changeset	190	$ hg fatelog
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	191	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	192	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	193	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	194
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	195
34577 3c1bb8a4275d test: cleanup verbosity variant from fatelog test Boris Feld <boris.feld@octobus.net> parents: 34576 diff changeset	196	$ hg fatelog --hidden
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	197	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	198	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	199	\| x a468dc9b3633
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	200	\|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	201	\| x 471f378eab4c
34578 794018ed8af0 test: use current user in the multi-user amend scenario Boris Feld <boris.feld@octobus.net> parents: 34577 diff changeset	202	\|/ 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	203	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	204
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	205	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	206	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	207	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	208	\| x a468dc9b3633
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	209	\|/ 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	210	\| x 471f378eab4c
34578 794018ed8af0 test: use current user in the multi-user amend scenario Boris Feld <boris.feld@octobus.net> parents: 34577 diff changeset	211	\|/ 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	212	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	213
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	214
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	215	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	216	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	217
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	218	$ 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	219	@ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	220	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	221	\| x a468dc9b3633
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	222	\|/ 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	223	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	224	\|/ 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	225	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	226
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	227	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	228	@ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	229	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	230	\| x a468dc9b3633
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	231	\|/ 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	232	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	233	\|/ 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	234	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	235
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	236	$ 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	237	@ d004c8f274b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	238	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	239	\| x a468dc9b3633
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	240	\|/ 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	241	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	242	\|/ 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	243	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	244
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	245	Test templates with splitted commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	246	===================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	247
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	248	$ hg init $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	249	$ cd $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	250	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	251	$ echo 42 >> a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	252	$ echo 43 >> b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	253	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	254	adding a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	255	adding b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	256	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	257	@ changeset: 1:471597cad322
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	258	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	259	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	260	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	261	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	262	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	263	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	264	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	265	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	266	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	267
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	268	# Simulate split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	269	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	270	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	271	$ echo 42 >> a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	272	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	273	adding a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	274	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	275	$ echo 43 >> b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	276	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	277	adding b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	278	$ 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	279	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	280
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	281	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	282	@ changeset: 3:f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	283	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	284	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	285	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	286	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	287	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	288	o changeset: 2:337fec4d2edc
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	289	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	290	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	291	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	292	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	293	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	294	\| x changeset: 1:471597cad322
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	295	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	296	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	297	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	298	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	299	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	300	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	301	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	302	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	303
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	304	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	305	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	306
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	307	$ hg up 'obsolete()' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	308	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	309
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	310	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	311	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	o f257fde29c7a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	313	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	314	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	315	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	316	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	o 337fec4d2edc
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	318	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	319	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	321	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	322	\| @ 471597cad322
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	323	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	324	\| multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	325	\| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	327
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	328
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	329	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	330	o f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	331	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	332	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	333	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	334	\| @ 471597cad322
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	335	\|/ 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	336	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	337
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	338	$ hg up f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	339	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	340
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	341	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	342	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	343	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	344	@ f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	345	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	346	o 337fec4d2edc
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	347	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	348	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	349
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	350	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	351	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	352	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	353	@ f257fde29c7a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	354	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	355	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	356	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	357	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	358	o 337fec4d2edc
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	359	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	360	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	361	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	362	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	363	\| x 471597cad322
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	364	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	365	\| multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	366	\| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	368
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	369
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	370	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	371	@ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	372	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	373	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	374	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	375	\| x 471597cad322
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	376	\|/ 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	377	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	378
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	379	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	380	@ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	381	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	382	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	383	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	384	\| x 471597cad322
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	385	\|/ 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	386	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	387
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	388	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	389	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	390
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	391	$ 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	392	@ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	393	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	394	o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	395	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	396	\| x 471597cad322
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	397	\|/ 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	398	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	399
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	400	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	401	@ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	402	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	403	o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	404	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	405	\| x 471597cad322
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	406	\|/ 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	407	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	408
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	409	$ 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	410	@ f257fde29c7a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	411	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	412	o 337fec4d2edc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	413	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	414	\| x 471597cad322
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	415	\|/ 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	416	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	417
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	418
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	419	Test templates with folded commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	420	=================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	421
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	422	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	423	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	424
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	425	$ hg init $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	426	$ cd $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	427	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	428	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	429	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	430	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	431	@ changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	432	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	433	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	434	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	435	\| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	436	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	437	o changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	438	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	439	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	440	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	441	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	442	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	443	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	444	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	445	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	446
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	447	Simulate a fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	448	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	449	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	450	$ echo "A0" > A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	451	$ echo "B0" > B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	452	$ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	453	adding A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	454	adding B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	455	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	456	$ 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	457	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	458	$ 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	459	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	460
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	461	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	462	@ changeset: 3:eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	463	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	464	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	465	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	466	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	467	\| summary: C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	468	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	469	\| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	470	\| \| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	471	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	472	\| \| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	473	\| \|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	474	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	475	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	476	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	477	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	478	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	479	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	480	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	481	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	482	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	483
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	484	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	485	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	486
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	487	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	488	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	489
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	490	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	491	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	492	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	493	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	494	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	495	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	496	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	497	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	498	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	499	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	500	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	501	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	502
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	503
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	504	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	505	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	506	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	507	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	508	\|/ 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	509	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	510
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	511	$ hg up 'desc(B0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	512	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	513
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	514	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	515	displayed
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	516	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	517	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	518	\| 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	519	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	520	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	521	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	522	\| @ 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	523	\| \| Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	524	\| \| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	525	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	526	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	527	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	528	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	529	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	531
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	532
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	533	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	534	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	535	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	536	\| @ 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	537	\| \| 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	538	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	539	\|/ 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	540	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	541
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	542	$ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	543	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	544
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	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	546	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	@ eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	549	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	550	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	551
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	552	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	553	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	554	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	555	@ eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	556	\| 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	557	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	558	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	559	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	560	\| x 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	561	\| \| Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	562	\| \| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	563	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	564	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	565	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	566	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	567	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	568	o ea207398892e
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	571	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	572	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	573	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	574	\| x 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	575	\| \| 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	576	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	577	\|/ 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	578	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	579
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	580
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	581	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	582	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	583	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	584	\| x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	585	\| \| 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	586	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	587	\|/ 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	588	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	589
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	590	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	591	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	592
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	593	$ 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	594	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	595	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	596	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	597	\| \| 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	598	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	599	\|/ 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	600	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	601
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	602	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	603	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	604	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	605	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	606	\| \| 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	607	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	608	\|/ 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	609	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	610
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	611	$ 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	612	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	613	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	614	\| x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	615	\| \| 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	616	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	617	\|/ 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	618	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	619
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	620
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	621	Test templates with divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	622	==============================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	623
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	624	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	625	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	626
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	627	$ hg init $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	$ cd $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	629	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	630	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	631	$ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	632	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	@ changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	634	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	635	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	636	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	637	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	638	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	639	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	640	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	641	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	642	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	643	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	644	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	645	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	646	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	647	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	648	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	649
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	650	$ hg update --hidden 'desc(A0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	651	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	652	$ hg commit --amend -m "A2"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	653	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	654	@ changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	655	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	656	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	657	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	658	\| 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	659	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	660	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	661	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	662	\| o changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	663	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	664	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	665	\| 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	666	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	667	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	668	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	669	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	670	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	671	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	672	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	673	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	674	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	675	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	676	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	677	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	678
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	679	$ hg commit --amend -m 'A3'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	680	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	681	@ changeset: 4:019fadeab383
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	682	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	683	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	684	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	685	\| 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	686	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	687	\| summary: A3
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	688	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	689	\| x changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	690	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	691	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	692	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	693	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	694	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	695	\| o changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	696	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	697	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	698	\| 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	699	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	700	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	701	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	702	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	703	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	704	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	705	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	706	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	707	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	708	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	709	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	710	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	711
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	712
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	713	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	714	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	715
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	716	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	717	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	718
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	719	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	720	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	721	o 019fadeab383
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	722	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	723	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	724	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	725	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	726	\| o fdf9bde5129a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	727	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	728	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	729	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	730	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	731	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	732	\|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	733	\| multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	734	\| multi-line: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	735	\| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	736	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	737
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	738	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	739	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	740	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	741	\| o fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	742	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	743	\| @ 471f378eab4c
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	744	\|/ 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	745	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	746
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	747	$ hg up 'desc(A1)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	748	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	749
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	750	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	751	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	752	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	753	o 019fadeab383
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	754	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	755	\| @ fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	756	\|/
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	757	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	758
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	759
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	760	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	761	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	762	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	763	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	764	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	765	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	766
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	767	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	768	--hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	769	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	770	o 019fadeab383
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	771	\| Predecessors: 3:65b757b745b9
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	772	\| semi-colon: 3:65b757b745b9
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	773	\| json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	774	\| map: 3:65b757b745b935093c87a2bccd877521cccffcbd
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	775	\| x 65b757b745b9
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	776	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	777	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	778	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	779	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	780	\| Successors: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	781	\| multi-line: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	782	\| json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	783	\| @ fdf9bde5129a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	784	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	785	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	786	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	787	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	788	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	789	\|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	790	\| multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	791	\| multi-line: 3:65b757b745b9
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	792	\| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	793	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	794
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	795
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	796	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	797	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	798	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	799	\| x 65b757b745b9
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	800	\|/ 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	801	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	802	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	803	\| x 471f378eab4c
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	804	\|/ 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	805	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	806
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	807
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	808	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	809	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	810	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	811	\| x 65b757b745b9
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	812	\|/ 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	813	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	814	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	815	\| x 471f378eab4c
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	816	\|/ 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	817	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	818
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	819
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	820	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	821	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	822
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	823	$ 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	824	o 019fadeab383
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	825	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	826	\| x 65b757b745b9
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	827	\|/ 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	828	\| @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	829	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	830	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	831	\|/ 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	832	\| 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	833	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	834
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	835	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	836	o 019fadeab383
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	837	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	838	\| x 65b757b745b9
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	839	\|/ 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	840	\| @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	841	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	842	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	843	\|/ 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	844	\| 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	845	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	846
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	847	$ 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	848	o 019fadeab383
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	849	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	850	\| x 65b757b745b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	851	\|/ 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	852	\| @ fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	853	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	854	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	855	\|/ 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	856	\| 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	857	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	858
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	859
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	860	Test templates with amended + folded commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	861	===========================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	862
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	863	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	864	----------
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	$ hg init $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	867	$ cd $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	868	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	869	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	870	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	871	$ hg commit --amend -m "B1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	872	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	873	@ changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	874	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	875	\| parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	876	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	877	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	878	\| summary: B1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	879	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	880	\| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	881	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	882	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	883	\| summary: B0
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	o changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	886	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	887	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	888	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	889	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	890	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	891	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	892	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	893	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	894
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	895	# Simulate a fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	896	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	897	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	898	$ echo "A0" > A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	899	$ echo "B0" > B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	900	$ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	901	adding A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	902	adding B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	903	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	904	$ 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	905	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	906	$ 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	907	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	908
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	909	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	910	@ changeset: 4:eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	911	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	912	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	913	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	914	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	915	\| summary: C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	916	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	917	\| x changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	918	\| \| parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	919	\| \| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	920	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	921	\| \| summary: B1
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	\| \| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	924	\| \|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	925	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	926	\| \| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	927	\| \|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	928	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	929	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	930	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	931	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	932	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	933	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	934	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	935	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	936	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	937
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	938	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	939	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	940
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	941	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	942	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	943
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	944	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	945	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	946	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	947	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	948	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	949	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	950	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	951	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	952	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	953	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	954	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	955	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	956
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	957
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	958	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	959	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	960	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	961	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	962	\|/ 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	963	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	964
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	965	$ hg up 'desc(B0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	966	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	967
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	968	Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	969	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	970	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	971	\| 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	972	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	973	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	974	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	975	\| @ 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	976	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	977	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	978	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	979	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	980	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	981	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	982	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	983	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	984
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	985
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	986	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	987	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	988	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	989	\| @ 0dec01379d3b
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	990	\| \| 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	991	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	992	\|/ 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	993	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	994
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	995	$ hg up 'desc(B1)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	996	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	997
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	998	Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	999	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1000	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1001	\| 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	1002	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1003	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1004	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1005	\| @ b7ea6d14e664
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1006	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1007	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1008	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1009	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1010	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1011	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1012	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1013	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1014
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1015
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1016	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1017	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1018	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1019	\| @ b7ea6d14e664
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1020	\| \| 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	1021	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1022	\|/ 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	1023	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1024
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1025	$ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1026	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	1027
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1028	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	1029	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1030	@ eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1031	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1032	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1033
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1034
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1035	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1036	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1037	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1038	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1039
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1040	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	1041	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1042	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1043	@ eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1044	\| 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	1045	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1046	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1047	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1048	\| x b7ea6d14e664
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1049	\| \| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1050	\| \| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1051	\| \| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1052	\| \| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1053	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1054	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1055	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1056	\| \| x 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1057	\| \|/ Successors: 3:b7ea6d14e664
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1058	\| \| multi-line: 3:b7ea6d14e664
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1059	\| \| json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1060	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1061	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1062	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1063	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1064	o ea207398892e
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1067	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1068	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1069	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1070	\| x b7ea6d14e664
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1071	\| \| 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	1072	\| \| x 0dec01379d3b
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1073	\| \|/ 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	1074	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1075	\|/ 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	1076	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1077
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1078
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1079	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1080	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1081	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1082	\| x b7ea6d14e664
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1083	\| \| 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	1084	\| \| x 0dec01379d3b
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	1085	\| \|/ 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	1086	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1087	\|/ 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	1088	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1089
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1090
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1091	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	1092	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1093
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1094	$ 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	1095	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1096	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1097	\| x b7ea6d14e664
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1098	\| \| 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	1099	\| \| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1100	\| \|/ 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	1101	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1102	\|/ 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	1103	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1104
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1105	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1106	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1107	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1108	\| x b7ea6d14e664
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1109	\| \| 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	1110	\| \| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1111	\| \|/ 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	1112	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1113	\|/ 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	1114	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1115
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1116	$ 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	1117	@ eb5a0daa2192
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1118	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1119	\| x b7ea6d14e664
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1120	\| \| 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	1121	\| \| x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1122	\| \|/ 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	1123	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1124	\|/ 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	1125	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1126
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1127
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1128	Test template with pushed and pulled obs markers
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1129	================================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1130
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1131	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1132	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1133
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1134	$ hg init $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1135	$ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1136	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1137	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1138	$ 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	1139	updating to branch default
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1140	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	1141	$ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1142	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1143	@ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1144	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1145	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1146	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1147	\| summary: A0
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	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1150	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1151	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1152	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1153
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1154	$ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1155	$ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1156	$ hg commit --amend -m "A2"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1157	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1158	@ changeset: 3:7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1159	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1160	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1161	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1162	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1163	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1164	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1165	\| x changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1166	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1167	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1168	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1169	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1170	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1171	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1172	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1173	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1174	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1175	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1176	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1177	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1178	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1179	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1180
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1181	$ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1182	$ hg pull
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1183	pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1184	searching for changes
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1185	adding changesets
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1186	adding manifests
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1187	adding file changes
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1188	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	1189	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	1190	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	1191	new changesets 7a230b46bf61
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1192	(run 'hg heads' to see heads, 'hg merge' to merge)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1193	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1194	o changeset: 2:7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1195	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1196	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1197	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1198	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1199	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1200	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1201	\| @ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1202	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1203	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1204	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1205	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1206	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1207	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1208	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1209	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1210
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1211
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1212	$ hg debugobsolete
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	1213	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	1214	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	1215
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1216	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1217	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1218
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1219	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	1220	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1221	o 7a230b46bf61
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1222	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1223	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1224	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1225	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1226	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1227	\|/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1228	\| multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1229	\| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1230	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1231
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1232
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1233	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1234	o 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1235	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1236	\| @ 471f378eab4c
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1237	\|/ 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	1238	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1239
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1240	$ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1241	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	1242
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1243	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	1244	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1245	@ 7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1246	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1247	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1248
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1249
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1250	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1251	@ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1252	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1253	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1254
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1255	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	1256	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1257	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1258	@ 7a230b46bf61
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1259	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1260	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1261	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1262	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1263	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1264	\|/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1265	\| multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1266	\| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1267	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1268
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1269
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1270	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1271	@ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1272	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1273	\| x 471f378eab4c
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1274	\|/ 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	1275	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1276
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1277
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1278	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	1279	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1280
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1281	$ 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	1282	@ 7a230b46bf61
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1283	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1284	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1285	\|/ 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	1286	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1287
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1288	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1289	@ 7a230b46bf61
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1290	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1291	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1292	\|/ 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	1293	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1294
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1295	$ 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	1296	@ 7a230b46bf61
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	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1299	\|/ 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	1300	o ea207398892e
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
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1303	Test template with obsmarkers cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1304	===================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1305
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1306	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1307	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1308
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1309	$ hg init $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1310	$ cd $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1311	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1312	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1313	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1314	$ hg up -r 0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1315	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	1316	$ mkcommit C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1317	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1318
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1319	Create the cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1320
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1321	$ 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	1322	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1323	$ 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	1324	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1325	$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1326
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1327	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1328	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1329
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1330	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1331	@ f897c6137566
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1332	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1333	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1334
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1335
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1336	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1337	@ f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1338	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1339	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1340
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1341
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1342	$ hg up -r "desc(B0)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1343	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	1344	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1345	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1346	\| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1347	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1348	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1349	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1350	\| @ 0dec01379d3b
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1351	\| \| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1352	\| \| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1353	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1354	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1355	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1356	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1357	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1358	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1359	\| x 471f378eab4c
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1360	\|/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1361	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1362	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1363	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1364	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1365	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1366	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1367	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1368
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1369
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1370	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1371	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1372	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1373	\| @ 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1374	\| \| 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	1375	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1376	\|/ 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	1377	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1378
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1379
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1380	$ hg up -r "desc(A0)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1381	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	1382	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1383	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1384	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1385	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1386	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1387	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1388	\| @ 471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1389	\|/
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1390	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1391
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1392
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1393	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1394	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1395	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1396	\| @ 471f378eab4c
33996 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 33995 diff changeset	1397	\|/ Obsfate: pruned;
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1398	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1399
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1400
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1401	$ hg up -r "desc(ROOT)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1402	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	1403	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1404	o f897c6137566
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1405	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1406	@ ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1407
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1408
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1409	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1410	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1411	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1412	@ ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1413
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1414
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1415	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1416	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1417	\| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1418	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1419	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1420	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1421	\| x 0dec01379d3b
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1422	\| \| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1423	\| \| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1424	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1425	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1426	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1427	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1428	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1429	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1430	\| x 471f378eab4c
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1431	\|/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1432	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1433	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1434	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1435	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1436	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1437	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1438	@ ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1439
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1440
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1441	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	1442	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1443
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1444	$ 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	1445	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1446	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1447	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1448	\| \| Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1449	\| \| 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	1450	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1451	\|/ 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	1452	@ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1453
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1454	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1455	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1456	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1457	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1458	\| \| Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1459	\| \| 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	1460	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1461	\|/ 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	1462	@ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1463
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1464	$ 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	1465	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1466	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1467	\| x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1468	\| \| 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	1469	\| \| 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	1470	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1471	\|/ 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	1472	@ ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1473
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1474
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1475	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	1476	=================================================
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1477
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1478	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1479	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1480	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1481	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1482	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1483	\| 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	1484	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1485	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1486	@ changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1487	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1488	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	1489	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1490
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1491	$ hg up
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1492	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	1493
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1494	Create a commit with three files
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1495	$ touch A B C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1496	$ 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	1497
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1498	Split it
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1499	$ hg up 3
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1500	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	1501	$ touch A
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1502	$ 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	1503	created new head
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1504
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1505	$ touch B
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1506	$ 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	1507
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1508	$ touch C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1509	$ 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	1510
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1511	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1512	@ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1513	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1514	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1515	\| 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	1516	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1517	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1518	o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1519	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1520	\| 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	1521	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1522	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1523	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1524	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1525	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1526	\| 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	1527	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1528	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1529	\| o changeset: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1530	\|/ user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1531	\| 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	1532	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1533	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1534	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1535	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1536	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1537	\| 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	1538	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1539	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1540	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1541	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1542	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	1543	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1544
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1545	$ 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	1546	obsoleted 1 changesets
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1547	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1548	@ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1549	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1550	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1551	\| 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	1552	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1553	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1554	o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1555	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1556	\| 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	1557	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1558	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1559	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1560	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1561	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1562	\| 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	1563	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1564	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1565	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1566	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1567	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1568	\| 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	1569	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1570	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1571	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1572	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1573	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	1574	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1575
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1576	Diverge one of the splitted commit
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1577
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1578	$ hg up 6
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1579	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	1580	$ 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	1581
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1582	$ hg up 6 --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1583	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	1584	$ 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	1585
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1586	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1587	@ changeset: 9:0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1588	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1589	\| parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1590	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1591	\| 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	1592	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1593	\| summary: Add B only
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1594	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1595	\| o changeset: 8:b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1596	\|/ parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1597	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1598	\| 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	1599	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1600	\| summary: Add only B
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1601	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1602	\| o changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1603	\| \| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1604	\| \| 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	1605	\| \| instability: orphan, content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1606	\| \| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1607	\| \|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1608	\| x changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1609	\|/ user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1610	\| 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	1611	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1612	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1613	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1614	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1615	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1616	\| 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	1617	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1618	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1619	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1620	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1621	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1622	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1623	\| 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	1624	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1625	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1626	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1627	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1628	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	1629	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1630
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1631
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1632	Check templates
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1633	---------------
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1634
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1635	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1636	@ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1637	\| Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1638	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1639	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1640	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1641	\| o b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1642	\|/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1643	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1644	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1645	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1646	\| o ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1647	\| \|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1648	\| x 4a004186e638
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1649	\|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1650	\| multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1651	\| multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1652	\| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1653	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1654	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1655	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1656	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1657	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1658
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1659	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1660	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1661	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1662	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1663	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1664	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1665	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1666	\| x 4a004186e638
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1667	\|/ 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	1668	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1669	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1670	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1671	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1672	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1673
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1674	$ hg tlog --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1675	@ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1676	\| Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1677	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1678	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1679	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1680	\| o b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1681	\|/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1682	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1683	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1684	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1685	\| o ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1686	\| \| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1687	\| \| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1688	\| \| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1689	\| \| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1690	\| x 4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1691	\|/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1692	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1693	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1694	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1695	\| Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1696	\| multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1697	\| multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1698	\| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1699	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1700	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1701	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1702	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1703	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1704	\| x 9bd10a0775e4
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1705	\|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1706	\| multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1707	\| json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1708	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1709	\| Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1710	\| semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1711	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1712	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1713	\| x 0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1714	\| \| Predecessors: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1715	\| \| semi-colon: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1716	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1717	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1718	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1719	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1720	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1721	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1722	\| x 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1723	\|/ Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1724	\| semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1725	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1726	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1727	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1728	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1729	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1730	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1731
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1732	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1733	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1734	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1735	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1736	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1737	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1738	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1739	\| x 4a004186e638
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1740	\|/ 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	1741	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1742	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1743	\| x 9bd10a0775e4
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1744	\|/ 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	1745	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1746	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1747	\| x 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1748	\| \| 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	1749	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1750	\|/ 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	1751	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1752
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1753	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1754	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1755	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1756	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1757	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1758	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1759	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1760	\| x 4a004186e638
34286 ecc96506c49d obsmarker: track operation by default Martin von Zweigbergk <martinvonz@google.com> parents: 34085 diff changeset	1761	\|/ 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	1762	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1763	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1764	\| x 9bd10a0775e4
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1765	\|/ 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	1766	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1767	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1768	\| x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1769	\| \| 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	1770	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1771	\|/ 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	1772	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1773
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1774	$ hg up --hidden 4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1775	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	1776	$ 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	1777	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	1778	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1779	o eceed8f98ffc
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1780	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1781	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1782	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1783	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1784	\| o 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1785	\| \| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1786	\| \| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1787	\| \| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1788	\| \| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1789	o \| b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1790	\|/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1791	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1792	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1793	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1794	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1795	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1796	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1797	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1798	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1799	\| @ 9bd10a0775e4
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1800	\|/ 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	1801	\| multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1802	\| multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1803	\| 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	1804	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1805	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1806	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1807
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1808
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1809	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1810	o eceed8f98ffc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1811	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1812	\| o 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1813	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1814	o \| b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1815	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1816	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1817	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1818	\| @ 9bd10a0775e4
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1819	\|/ 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	1820	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1821	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1822	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1823
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1824	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	1825	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1826
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1827	$ 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	1828	o eceed8f98ffc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1829	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1830	\| o 0b997eb7ceee
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1831	\| \|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1832	o \| b18bc8331526
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1833	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1834	\| x ba2ed02b0c9a
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1835	\| \| 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	1836	\| x 4a004186e638
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1837	\|/ 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	1838	\| 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	1839	o dd800401bd8c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1840	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1841	\| @ 9bd10a0775e4
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1842	\|/ 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	1843	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1844	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1845	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1846	\| \| Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1847	\| \| 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	1848	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1849	\|/ 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	1850	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1851
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1852	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1853	o eceed8f98ffc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1854	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1855	\| o 0b997eb7ceee
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1856	\| \|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1857	o \| b18bc8331526
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1858	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1859	\| x ba2ed02b0c9a
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1860	\| \| 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	1861	\| x 4a004186e638
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1862	\|/ 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	1863	\| 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	1864	o dd800401bd8c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1865	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1866	\| @ 9bd10a0775e4
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1867	\|/ 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	1868	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1869	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1870	\| x 0dec01379d3b
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1871	\| \| Obsfate: rewritten as 3:f897c6137566
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1872	\| \| 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	1873	\| x 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1874	\|/ 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	1875	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1876
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1877	$ 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	1878	o eceed8f98ffc
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1879	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1880	\| o 0b997eb7ceee
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1881	\| \|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1882	o \| b18bc8331526
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1883	\|/
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1884	\| x ba2ed02b0c9a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1885	\| \| 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	1886	\| x 4a004186e638
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1887	\|/ 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	1888	\| 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	1889	o dd800401bd8c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1890	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1891	\| @ 9bd10a0775e4
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1892	\|/ 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	1893	o f897c6137566
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1894	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1895	\| x 0dec01379d3b
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1896	\| \| 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	1897	\| \| 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	1898	\| x 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1899	\|/ 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	1900	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1901
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1902	Test templates with pruned commits
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1903	==================================
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1904
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1905	Test setup
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
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1908	$ hg init $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1909	$ cd $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1910	$ mkcommit ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1911	$ mkcommit A0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1912	$ 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	1913	obsoleted 1 changesets
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1914
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1915	Check output
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1916	------------
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	$ hg up "desc(A0)" --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1919	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	1920	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1921	@ 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1922	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1923	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1924
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1925	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1926	@ 471f378eab4c
33996 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 33995 diff changeset	1927	\| 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	1928	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1929
33997 d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1930	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	1931	===========================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1932
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1933	Test setup
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1934	----------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1935
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1936	$ 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	1937	$ cd $TESTTMP/multiple-local-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1938	$ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1939	$ mkcommit A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1940	$ hg commit --amend -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1941	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1942	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1943
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1944	$ 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	1945	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	1946	$ hg commit --amend -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1947	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1948	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1949
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1950	Check output
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1951	------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1952
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1953	$ hg up "desc(A0)" --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1954	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	1955	$ hg tlog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1956	@ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1957	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1958	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1959
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1960	# 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	1961	$ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1962	@ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1963	\| Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1964	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1965
34577 3c1bb8a4275d test: cleanup verbosity variant from fatelog test Boris Feld <boris.feld@octobus.net> parents: 34576 diff changeset	1966	$ hg fatelog --hidden
33997 d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1967	x 65b757b745b9
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1968	\| 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	1969	\| x fdf9bde5129a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1970	\|/ 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	1971	\| @ 471f378eab4c
34287 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34286 diff changeset	1972	\|/ 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	1973	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1974
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1975	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	1976	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1977
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1978	$ 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	1979	x 65b757b745b9
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1980	\| Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1981	\| x fdf9bde5129a
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1982	\|/ Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1983	\| @ 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1984	\|/ 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	1985	\| 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	1986	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1987
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1988	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1989	x 65b757b745b9
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1990	\| Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1991	\| x fdf9bde5129a
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1992	\|/ Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1993	\| @ 471f378eab4c
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	1994	\|/ 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	1995	\| 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	1996	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1997
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	1998	$ 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	1999	x 65b757b745b9
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2000	\| 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	2001	\| x fdf9bde5129a
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2002	\|/ 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	2003	\| @ 471f378eab4c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2004	\|/ 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	2005	\| 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	2006	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2007
33997 d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2008
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2009	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	2010	==============================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2011
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2012	$ 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	2013	$ 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	2014	$ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2015	$ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2016	$ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2017	$ hg commit -A -m "A0"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2018	adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2019	adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2020	$ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2021	@ changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2022	\| tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2023	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2024	\| 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	2025	\| summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2026	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2027	o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2028	user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2029	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	2030	summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2031
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2032	# Simulate split
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2033	$ hg up -r "desc(ROOT)"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2034	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	2035	$ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2036	$ hg commit -A -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2037	adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2038	created new head
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2039	$ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2040	$ hg commit -A -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2041	adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2042	$ 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	2043	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2044
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2045	# Simulate prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2046	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2047	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2048
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2049	$ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2050	@ changeset: 3:0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2051	\| tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2052	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2053	\| 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	2054	\| summary: A2
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2055	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2056	o changeset: 2:617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2057	\| parent: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2058	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2059	\| 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	2060	\| summary: A1
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2061	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2062	\| x changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2063	\|/ user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2064	\| 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	2065	\| summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2066	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2067	o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2068	user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2069	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	2070	summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2071
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2072	Check templates
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2073	---------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2074
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2075	$ hg up 'desc("A0")' --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2076	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	2077
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2078	# 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	2079	$ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2080	o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2081	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2082	\| @ 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2083	\|/ Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2084	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2085
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2086	$ 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	2087	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	2088
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2089	$ hg fatelog --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2090	@ 0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2091	\| 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	2092	o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2093	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2094	\| x 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2095	\|/ 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	2096	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	2097
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2098
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2099	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	2100	-----------------------------------
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2101
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2102	$ 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	2103	@ 0d0ef4bdf70e
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	2104	\| Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2105	o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2106	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2107	\| x 471597cad322
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	2108	\|/ 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	2109	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2110
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2111	$ hg fatelogkw --hidden
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2112	@ 0d0ef4bdf70e
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	2113	\| Obsfate: pruned
34848 6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2114	o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2115	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2116	\| x 471597cad322
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	2117	\|/ 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	2118	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2119
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2120	$ 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	2121	@ 0d0ef4bdf70e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2122	\| 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	2123	o 617adc3a144c
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2124	\|
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2125	\| x 471597cad322
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2126	\|/ 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	2127	o ea207398892e
6a6371d2970e test: test obfate template keyword in test-obsmarker-template.t Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	2128

author	Boris Feld <boris.feld@octobus.net>
	Mon, 09 Oct 2017 15:34:26 +0200
changeset 34851	6f53a53245a2
parent 34850	62a4ccf9784a
child 34852	d45236f3d38e
permissions	-rw-r--r--