mercurial: tests/test-obsmarker-template.t@e8a7c1a0565a (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)}"
33994 38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 33993 diff changeset	17	> 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	18	> 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})")}")}"
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	19	> obsfate = "{obsfateverb}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	20	> [alias]
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	21	> tlog = log -G -T '{node\|short}\
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	> {if(predecessors, "\n Predecessors: {predecessors}")}\
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	23	> {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	24	> {if(predecessors, "\n json: {predecessors\|json}")}\
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	25	> {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	26	> {if(successorssets, "\n Successors: {successorssets}")}\
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	27	> {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	28	> {if(successorssets, "\n json: {successorssets\|json}")}\n'
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	29	> fatelog = log -G -T '{node\|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfate}"} \n" )}'
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	30	> fatelogjson = log -G -T '{node\|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers\|json}\n")}'
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	> EOF
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	32
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	Test templates on amended commit
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
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	38
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	$ hg init $TESTTMP/templates-local-amend
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	$ cd $TESTTMP/templates-local-amend
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	41	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	42	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	43	$ echo 42 >> A0
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	44	$ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	45	$ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0"
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	46
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	$ hg log --hidden -G
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	48	@ changeset: 3:d004c8f274b9
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	\|
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	55	\| x changeset: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	56	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	67	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	70
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	71	Check templates
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	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	74	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	75
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	76	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	77	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	78	o d004c8f274b9
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	79	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	80	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	81	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	82	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	83	\| @ 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	84	\|/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	85	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	86	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	87	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	88
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	89	$ hg fatelog -q --traceback
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	90	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	91	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	92	\| @ 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	93	\|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, 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	94	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	95
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	96	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	97	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	98	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	99	\| @ 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	100	\|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, 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	101	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	102
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	103	$ hg fatelog -v
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	104	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	105	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	106	\| @ 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	107	\|/ Obsfate: rewritten as 3:d004c8f274b9 by test1, 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	108	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	109
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	110	$ hg up 'desc(A1)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	111	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	112
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	113	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	114	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	115	o d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	116	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	117	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	118	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	119	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	120	\| @ a468dc9b3633
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	121	\|/ Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	122	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	123	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	124	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	125
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	126	$ hg fatelog -v
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	127	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	128	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	129	\| @ a468dc9b3633
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	130	\|/ Obsfate: rewritten 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	131	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	132
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	133	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	134	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	135	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	136	o d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	137	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	138	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	139	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	140	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	141	\| @ a468dc9b3633
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	142	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	143	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	144	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	145	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	146	\| Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	147	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	148	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	149	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	150	\|/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	151	\| multi-line: 2:a468dc9b3633
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	152	\| json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	153	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	154
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	155	$ hg fatelog --hidden -q
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	156	o d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	157	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	158	\| @ a468dc9b3633
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	159	\|/ Obsfate: rewritten 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	160	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	161	\|/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (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	162	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	163
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	164
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	165	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	166	visible.
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	167	$ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	168	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	169	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	170	@ d004c8f274b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	171	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	172	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	173
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	174	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	175	@ d004c8f274b9
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	176	\| Predecessors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	177	\| semi-colon: 2:a468dc9b3633
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	178	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	179	\| map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	180	\| x a468dc9b3633
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	181	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	182	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	183	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	184	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	185	\| Successors: 3:d004c8f274b9
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	186	\| multi-line: 3:d004c8f274b9
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	187	\| json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	188	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	189	\|/ Successors: 2:a468dc9b3633
e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	190	\| multi-line: 2:a468dc9b3633
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	191	\| json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	192	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	193
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	194	$ hg fatelog -v
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	195	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	196	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	197	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	198
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	199
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	200	$ hg fatelog -v --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	201	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	202	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	203	\| x a468dc9b3633
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	204	\|/ Obsfate: rewritten 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	205	\| x 471f378eab4c
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33997 diff changeset	206	\|/ Obsfate: rewritten as 2:a468dc9b3633 by test1 (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	207	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	208
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	209	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	210	@ d004c8f274b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	211	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	212	\| x a468dc9b3633
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	213	\|/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	214	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	215	\|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	216	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	217
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	218	Test templates with splitted commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	219	===================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	220
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	221	$ hg init $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	222	$ cd $TESTTMP/templates-local-split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	223	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	224	$ echo 42 >> a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	225	$ echo 43 >> b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	226	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	227	adding a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	228	adding b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	229	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	230	@ changeset: 1:471597cad322
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	231	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	232	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	233	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	234	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	235	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	236	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	237	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	238	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	239	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	240
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	241	# Simulate split
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	242	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	243	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	244	$ echo 42 >> a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	245	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	246	adding a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	247	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	248	$ echo 43 >> b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	249	$ hg commit -A -m "A0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	250	adding b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	251	$ 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	252	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	253
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	254	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	255	@ changeset: 3:f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	256	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	257	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	258	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	259	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	260	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	261	o changeset: 2:337fec4d2edc
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	262	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	263	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	264	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	265	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	266	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	267	\| x changeset: 1:471597cad322
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	268	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	269	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	270	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	271	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	272	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	273	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	274	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	275	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	276
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	277	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	278	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	279
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	280	$ hg up 'obsolete()' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	281	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	282
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	283	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	284	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	285	o f257fde29c7a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	286	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	287	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	288	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	289	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	290	o 337fec4d2edc
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	291	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	292	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	293	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	294	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	295	\| @ 471597cad322
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	296	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	297	\| multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	298	\| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	299	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	300
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	301
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	302	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	303	o f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	304	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	305	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	306	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	307	\| @ 471597cad322
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	308	\|/ 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	309	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	310
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	311	$ hg up f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	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	313
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	314	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	315	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	@ f257fde29c7a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	318	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	319	o 337fec4d2edc
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	321	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	322
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	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	324	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	@ f257fde29c7a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	327	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	328	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	329	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	330	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	331	o 337fec4d2edc
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	332	\| Predecessors: 1:471597cad322
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	333	\| semi-colon: 1:471597cad322
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	334	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	335	\| map: 1:471597cad322d1f659bb169751be9133dad92ef3
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	336	\| x 471597cad322
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	337	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	338	\| multi-line: 2:337fec4d2edc 3:f257fde29c7a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	339	\| json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	340	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	341
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	342
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	343	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	344	@ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	345	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	346	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	347	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	348	\| x 471597cad322
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	349	\|/ 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	350	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	351
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	352	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	353	@ f257fde29c7a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	354	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	355	o 337fec4d2edc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	356	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	357	\| x 471597cad322
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	358	\|/ 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	359	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	360
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	361	Test templates with folded commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	362	=================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	363
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	364	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	365	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	366
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	$ hg init $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	368	$ cd $TESTTMP/templates-local-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	369	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	370	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	371	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	372	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	373	@ changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	374	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	375	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	376	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	377	\| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	378	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	o changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	382	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	383	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	384	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	385	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	386	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	387	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	388
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	389	Simulate a fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	390	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	391	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	392	$ echo "A0" > A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	393	$ echo "B0" > B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	394	$ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	395	adding A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	396	adding B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	397	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	398	$ 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	399	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	400	$ 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	401	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	402
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	403	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	404	@ changeset: 3:eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	405	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	406	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	407	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	408	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	409	\| summary: C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	410	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	411	\| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	412	\| \| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	413	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	414	\| \| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	415	\| \|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	416	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	417	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	418	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	419	\| summary: A0
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	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	422	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	423	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	424	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	425
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	426	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	427	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	428
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	429	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	430	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	431
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	432	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	433	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	434	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	435	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	436	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	437	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	438	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	439	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	440	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	441	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	442	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	443	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	444
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	445
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	446	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	447	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	448	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	449	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	450	\|/ 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	451	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	452
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	453	$ hg up 'desc(B0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	454	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	455
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	456	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	457	displayed
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	458	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	459	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	460	\| 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	461	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	462	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	463	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	464	\| @ 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	465	\| \| Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	466	\| \| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	467	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	468	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	469	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	470	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	471	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	472	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	473
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	474
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	475	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	476	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	477	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	478	\| @ 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	479	\| \| 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	480	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	481	\|/ 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	482	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	483
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	484	$ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	485	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	486
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	487	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	488	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	489	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	490	@ eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	491	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	492	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	493
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	494	Predecessors template should show both predecessors as we force their display
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	495	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	496	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	497	@ eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	498	\| 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	499	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	500	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	501	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	502	\| x 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	503	\| \| Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	504	\| \| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	505	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	506	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	507	\|/ Successors: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	508	\| multi-line: 3:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	509	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	510	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	511
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	512
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	513	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	514	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	515	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	516	\| x 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	517	\| \| 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	518	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	519	\|/ 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	520	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	521
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	522
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	523	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	524	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	525	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	526	\| x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	527	\| \| 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	528	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	529	\|/ 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	530	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	531
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	532
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	Test templates with divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	==============================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	535
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	536	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	537	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	538
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	539	$ hg init $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	$ cd $TESTTMP/templates-local-divergence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	541	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	542	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	543	$ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	544	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	@ changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	546	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	549	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	550	\| summary: A1
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	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	553	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	554	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	555	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	556	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	557	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	558	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	559	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	560	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	561
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	562	$ hg update --hidden 'desc(A0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	563	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	564	$ hg commit --amend -m "A2"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	565	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	566	@ changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	567	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	568	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	569	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	570	\| 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	571	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	572	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	573	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	574	\| o changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	575	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	576	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	577	\| date: Thu Jan 01 00:00:00 1970 +0000
33688 2194a8723138 evolution: rename divergent to content-divergent Boris Feld <boris.feld@octobus.net> parents: 33667 diff changeset	578	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	579	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	580	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	581	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	582	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	583	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	584	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	585	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	586	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	587	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	588	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	589	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	590
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	591	$ hg commit --amend -m 'A3'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	592	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	593	@ changeset: 4:019fadeab383
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	594	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	595	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	596	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	597	\| 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	598	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	599	\| summary: A3
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	600	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	601	\| x changeset: 3:65b757b745b9
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	602	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	603	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	604	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	605	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	606	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	607	\| o changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	608	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	609	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	610	\| date: Thu Jan 01 00:00:00 1970 +0000
33688 2194a8723138 evolution: rename divergent to content-divergent Boris Feld <boris.feld@octobus.net> parents: 33667 diff changeset	611	\| instability: content-divergent
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	612	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	613	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	614	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	615	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	616	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	617	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	618	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	619	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	620	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	621	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	622	summary: ROOT
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
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	625	Check templates
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
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	629	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	630
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	631	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	632	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	o 019fadeab383
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	634	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	635	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	636	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	637	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	638	\| o fdf9bde5129a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	639	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	640	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	641	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	642	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	643	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	644	\|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	645	\| multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	646	\| multi-line: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	647	\| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	648	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	649
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	650	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	651	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	652	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	653	\| o fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	654	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	655	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	656	\|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten 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	657	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	658
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	659	$ hg up 'desc(A1)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	660	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	661
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	662	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	663	the log
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	664	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	665	o 019fadeab383
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	666	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	667	\| @ fdf9bde5129a
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	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	670
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	671
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	672	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	673	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	674	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	675	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	676	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	677	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	678
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	679	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	680	--hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	681	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	682	o 019fadeab383
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	683	\| Predecessors: 3:65b757b745b9
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	684	\| semi-colon: 3:65b757b745b9
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	685	\| json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	686	\| map: 3:65b757b745b935093c87a2bccd877521cccffcbd
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	687	\| x 65b757b745b9
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	688	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	689	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	690	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	691	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	692	\| Successors: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	693	\| multi-line: 4:019fadeab383
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	694	\| json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	695	\| @ fdf9bde5129a
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	696	\|/ Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	697	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	698	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	699	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	700	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	701	\|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	702	\| multi-line: 2:fdf9bde5129a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	703	\| multi-line: 3:65b757b745b9
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	704	\| json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	705	o ea207398892e
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	708	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	709	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	710	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	711	\| x 65b757b745b9
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	712	\|/ Obsfate: rewritten 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	713	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	714	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	715	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	716	\|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten 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	717	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	718
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	719
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	720	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	721	o 019fadeab383
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	722	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	723	\| x 65b757b745b9
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	724	\|/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	725	\| @ fdf9bde5129a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	726	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	727	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	728	\|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	729	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	730
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	731
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	732	Test templates with amended + folded commit
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	733	===========================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	734
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	735	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	736	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	737
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	738	$ hg init $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	739	$ cd $TESTTMP/templates-local-amend-fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	740	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	741	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	742	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	743	$ hg commit --amend -m "B1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	744	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	745	@ changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	746	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	747	\| parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	748	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	749	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	750	\| summary: B1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	751	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	752	\| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	753	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	754	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	755	\| summary: B0
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 changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	758	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	759	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	760	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	761	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	762	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	763	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	764	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	765	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	766
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	767	# Simulate a fold
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	768	$ hg up -r "desc(ROOT)"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	769	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	770	$ echo "A0" > A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	771	$ echo "B0" > B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	772	$ hg commit -A -m "C0"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	773	adding A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	774	adding B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	775	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	776	$ 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	777	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	778	$ 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	779	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	780
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	781	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	782	@ changeset: 4:eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	783	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	784	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	785	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	786	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	787	\| summary: C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	788	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	789	\| x changeset: 3:b7ea6d14e664
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	790	\| \| parent: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	791	\| \| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	792	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	793	\| \| summary: B1
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	\| \| x changeset: 2:0dec01379d3b
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	796	\| \|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	797	\| \| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	798	\| \| summary: B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	799	\| \|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	800	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	801	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	802	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	803	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	804	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	805	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	806	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	807	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	808	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	809
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	810	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	811	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	812
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	813	$ hg up 'desc(A0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	814	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	815
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	816	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	817	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	818	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	819	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	820	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	821	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	822	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	823	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	824	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	825	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	826	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	827	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	828
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	829
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	830	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	831	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	832	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	833	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	834	\|/ 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	835	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	836
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	837	$ hg up 'desc(B0)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	838	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	839
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	840	Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	841	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	842	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	843	\| 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	844	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	845	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	846	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	847	\| @ 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	848	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	849	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	850	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	851	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	852	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	853	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	854	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	855	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	856
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	857
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	858	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	859	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	860	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	861	\| @ 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	862	\| \| 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	863	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	864	\|/ 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	865	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	866
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	867	$ hg up 'desc(B1)' --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	868	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	869
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	870	Predecessors template should both predecessors as they are visible
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	871	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	872	o eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	873	\| 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	874	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	875	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	876	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	877	\| @ b7ea6d14e664
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	878	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	879	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	880	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	881	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	882	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	883	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	884	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	885	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	886
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	887
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	888	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	889	o eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	890	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	891	\| @ b7ea6d14e664
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	892	\| \| 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	893	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	894	\|/ 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	895	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	896
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	897	$ hg up 'desc(C0)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	898	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	899
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	900	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	901	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	902	@ eb5a0daa2192
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	903	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	904	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	905
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	906
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	907	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	908	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	909	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	910	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	911
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	912	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	913	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	914	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	915	@ eb5a0daa2192
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	916	\| 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	917	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	918	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	919	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	920	\| x b7ea6d14e664
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	921	\| \| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	922	\| \| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	923	\| \| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	924	\| \| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	925	\| \| Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	926	\| \| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	927	\| \| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	928	\| \| x 0dec01379d3b
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	929	\| \|/ Successors: 3:b7ea6d14e664
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	930	\| \| multi-line: 3:b7ea6d14e664
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	931	\| \| json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	932	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	933	\|/ Successors: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	934	\| multi-line: 4:eb5a0daa2192
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	935	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	936	o ea207398892e
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	939	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	940	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	941	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	942	\| x b7ea6d14e664
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	943	\| \| 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	944	\| \| x 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	945	\| \|/ Obsfate: rewritten 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	946	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	947	\|/ 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	948	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	949
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	950
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	951	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	952	@ eb5a0daa2192
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	953	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	954	\| x b7ea6d14e664
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	955	\| \| 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	956	\| \| x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	957	\| \|/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	958	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	959	\|/ 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	960	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	961
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	962
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	963	Test template with pushed and pulled obs markers
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	964	================================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	965
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	966	Test setup
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
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	969	$ hg init $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	970	$ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	971	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	972	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	973	$ 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	974	updating to branch default
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	975	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	976	$ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	977	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	978	@ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	979	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	980	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	981	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	982	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	983	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	984	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	985	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	986	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	987	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	988
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	989	$ cd $TESTTMP/templates-local-remote-markers-1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	990	$ hg commit --amend -m "A1"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	991	$ hg commit --amend -m "A2"
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	992	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	993	@ changeset: 3:7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	994	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	995	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	996	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	997	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	998	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	999	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1000	\| x changeset: 2:fdf9bde5129a
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1001	\|/ parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1002	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1003	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1004	\| summary: A1
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1005	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1006	\| x changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1007	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1008	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1009	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1010	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1011	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1012	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1013	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1014	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1015
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1016	$ cd $TESTTMP/templates-local-remote-markers-2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1017	$ hg pull
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1018	pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1019	searching for changes
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1020	adding changesets
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1021	adding manifests
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1022	adding file changes
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1023	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	1024	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	1025	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1026	(run 'hg heads' to see heads, 'hg merge' to merge)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1027	$ hg log --hidden -G
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1028	o changeset: 2:7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1029	\| tag: tip
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1030	\| parent: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1031	\| user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1032	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1033	\| summary: A2
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1034	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1035	\| @ changeset: 1:471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1036	\|/ user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1037	\| date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1038	\| summary: A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1039	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1040	o changeset: 0:ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1041	user: test
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1042	date: Thu Jan 01 00:00:00 1970 +0000
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1043	summary: ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1044
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1045
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1046	$ hg debugobsolete
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1047	471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1048	fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1049
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1050	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1051	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1052
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1053	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	1054	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1055	o 7a230b46bf61
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1056	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1057	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1058	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1059	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1060	\| @ 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1061	\|/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1062	\| multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1063	\| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1066
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1067	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1068	o 7a230b46bf61
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	\| @ 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1071	\|/ Obsfate: rewritten 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	1072	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1073
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1074	$ hg up 'desc(A2)'
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1075	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	1076
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1077	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	1078	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1079	@ 7a230b46bf61
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1080	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1081	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1082
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1083
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1084	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1085	@ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1086	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1087	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1088
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1089	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	1090	with --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1091	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1092	@ 7a230b46bf61
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1093	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1094	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1095	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1096	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1097	\| x 471f378eab4c
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1098	\|/ Successors: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1099	\| multi-line: 2:7a230b46bf61
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1100	\| json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1101	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1102
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1103
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1104	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1105	@ 7a230b46bf61
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1106	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1107	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1108	\|/ Obsfate: rewritten 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	1109	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1110
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1111
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1112	Test template with obsmarkers cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1113	===================================
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1114
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1115	Test setup
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1116	----------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1117
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1118	$ hg init $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1119	$ cd $TESTTMP/templates-local-cycle
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1120	$ mkcommit ROOT
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1121	$ mkcommit A0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1122	$ mkcommit B0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1123	$ hg up -r 0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1124	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	1125	$ mkcommit C0
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1126	created new head
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1127
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1128	Create the cycle
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	$ 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	1131	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1132	$ 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	1133	obsoleted 1 changesets
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1134	$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1135
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1136	Check templates
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1137	---------------
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1138
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1139	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1140	@ f897c6137566
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1141	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1142	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1143
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1144
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1145	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1146	@ f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1147	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1148	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1149
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1150
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1151	$ hg up -r "desc(B0)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1152	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	1153	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1154	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1155	\| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1156	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1157	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1158	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1159	\| @ 0dec01379d3b
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1160	\| \| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1161	\| \| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1162	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1163	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1164	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1165	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1166	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1167	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1168	\| x 471f378eab4c
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1169	\|/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1170	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1171	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1172	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1173	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1174	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1175	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1176	o ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1177
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1178
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1179	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1180	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1181	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1182	\| @ 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1183	\| \| 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	1184	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1185	\|/ 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	1186	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1187
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1188
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1189	$ hg up -r "desc(A0)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1190	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	1191	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1192	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1193	\| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1194	\| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1195	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1196	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1197	\| @ 471f378eab4c
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1198	\|/
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1199	o ea207398892e
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
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1202	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1203	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1204	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1205	\| @ 471f378eab4c
33996 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 33995 diff changeset	1206	\|/ Obsfate: pruned;
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1207	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1208
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1209
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1210	$ hg up -r "desc(ROOT)" --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1211	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	1212	$ hg tlog
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1213	o f897c6137566
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1214	\|
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1215	@ ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1216
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1217
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1218	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1219	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1220	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1221	@ ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1222
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1223
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1224	$ hg tlog --hidden
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1225	o f897c6137566
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1226	\| Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1227	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1228	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1229	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1230	\| x 0dec01379d3b
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1231	\| \| Predecessors: 1:471f378eab4c
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1232	\| \| semi-colon: 1:471f378eab4c
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1233	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1234	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1235	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1236	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1237	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1238	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1239	\| x 471f378eab4c
32911 7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1240	\|/ Predecessors: 2:0dec01379d3b
7f1d07d2c8f8 templatekw: use common "rev:node" format as the default of predecessors Yuya Nishihara <yuya@tcha.org> parents: 32910 diff changeset	1241	\| semi-colon: 2:0dec01379d3b
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1242	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
32910 498e9dcc5fa9 templatekw: populate all keywords depending on predecessor in map operation Yuya Nishihara <yuya@tcha.org> parents: 32909 diff changeset	1243	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1244	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1245	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1246	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
32879 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1247	@ ea207398892e
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1248
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1249	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	1250	=================================================
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1251
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1252	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1253	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1254	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1255	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1256	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1257	\| 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	1258	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1259	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1260	@ changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1261	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1262	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	1263	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1264
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1265	$ hg up
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1266	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	1267
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1268	Create a commit with three files
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1269	$ touch A B C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1270	$ 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	1271
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1272	Split it
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1273	$ hg up 3
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1274	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	1275	$ touch A
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1276	$ 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	1277	created new head
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1278
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1279	$ touch B
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1280	$ 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	1281
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1282	$ touch C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1283	$ 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	1284
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1285	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1286	@ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1287	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1288	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1289	\| 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	1290	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1291	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1292	o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1293	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1294	\| 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	1295	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1296	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1297	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1298	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1299	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1300	\| 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	1301	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1302	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1303	\| o changeset: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1304	\|/ user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1305	\| 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	1306	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1307	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1308	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1309	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1310	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1311	\| 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	1312	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1313	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1314	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1315	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1316	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	1317	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1318
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1319	$ 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	1320	obsoleted 1 changesets
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1321	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1322	@ changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1323	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1324	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1325	\| 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	1326	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1327	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1328	o changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1329	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1330	\| 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	1331	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1332	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1333	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1334	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1335	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1336	\| 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	1337	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1338	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1339	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1340	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1341	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1342	\| 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	1343	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1344	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1345	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1346	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1347	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	1348	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1349
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1350	Diverge one of the splitted commit
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1351
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1352	$ hg up 6
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1353	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	1354	$ 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	1355
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1356	$ hg up 6 --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1357	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	1358	$ 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	1359
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1360	$ hg log -G
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1361	@ changeset: 9:0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1362	\| tag: tip
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1363	\| parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1364	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1365	\| 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	1366	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1367	\| summary: Add B only
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1368	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1369	\| o changeset: 8:b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1370	\|/ parent: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1371	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1372	\| 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	1373	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1374	\| summary: Add only B
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1375	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1376	\| o changeset: 7:ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1377	\| \| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1378	\| \| 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	1379	\| \| instability: orphan, content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1380	\| \| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1381	\| \|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1382	\| x changeset: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1383	\|/ user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1384	\| 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	1385	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1386	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1387	o changeset: 5:dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1388	\| parent: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1389	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1390	\| 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	1391	\| instability: content-divergent
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1392	\| summary: Add A,B,C
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1393	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1394	o changeset: 3:f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1395	\| parent: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1396	\| user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1397	\| 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	1398	\| summary: C0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1399	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1400	o changeset: 0:ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1401	user: test
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1402	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	1403	summary: ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1404
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1405
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1406	Check templates
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1407	---------------
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1408
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1409	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1410	@ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1411	\| Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1412	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1413	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1414	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1415	\| o b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1416	\|/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1417	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1418	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1419	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1420	\| o ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1421	\| \|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1422	\| x 4a004186e638
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1423	\|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1424	\| multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1425	\| multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1426	\| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1427	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1428	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1429	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1430	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1431	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1432
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1433	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1434	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1435	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1436	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1437	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1438	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1439	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1440	\| x 4a004186e638
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1441	\|/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten 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	1442	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1443	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1444	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1445	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1446	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1447
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1448	$ hg tlog --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1449	@ 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1450	\| Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1451	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1452	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1453	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1454	\| o b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1455	\|/ Predecessors: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1456	\| semi-colon: 6:4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1457	\| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1458	\| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1459	\| o ba2ed02b0c9a
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1460	\| \| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1461	\| \| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1462	\| \| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1463	\| \| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1464	\| x 4a004186e638
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1465	\|/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1466	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1467	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1468	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1469	\| Successors: 8:b18bc8331526; 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1470	\| multi-line: 8:b18bc8331526
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1471	\| multi-line: 9:0b997eb7ceee
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1472	\| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1473	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1474	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1475	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1476	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1477	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1478	\| x 9bd10a0775e4
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1479	\|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1480	\| multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1481	\| json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1482	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1483	\| Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1484	\| semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1485	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1486	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1487	\| x 0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1488	\| \| Predecessors: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1489	\| \| semi-colon: 1:471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1490	\| \| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1491	\| \| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1492	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1493	\| \| multi-line: 3:f897c6137566
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1494	\| \| multi-line: 1:471f378eab4c
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1495	\| \| json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1496	\| x 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1497	\|/ Predecessors: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1498	\| semi-colon: 2:0dec01379d3b
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1499	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1500	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1501	\| Successors: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1502	\| multi-line: 2:0dec01379d3b
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1503	\| json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1504	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1505
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1506	$ hg fatelog --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1507	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1508	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1509	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1510	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1511	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1512	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1513	\| x 4a004186e638
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1514	\|/ Obsfate: rewritten as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten 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	1515	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1516	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1517	\| x 9bd10a0775e4
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1518	\|/ 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	1519	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1520	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1521	\| x 0dec01379d3b
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1522	\| \| 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	1523	\| x 471f378eab4c
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1524	\|/ 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	1525	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1527	$ hg fatelogjson --hidden
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1528	@ 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1529	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1530	\| o b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1531	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1532	\| o ba2ed02b0c9a
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1533	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1534	\| x 4a004186e638
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1535	\|/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1536	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1537	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1538	\| x 9bd10a0775e4
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1539	\|/ 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	1540	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1541	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1542	\| x 0dec01379d3b
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1543	\| \| 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	1544	\| x 471f378eab4c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1545	\|/ 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	1546	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1547
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1548	$ hg up --hidden 4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1549	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	1550	$ 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	1551	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	1552	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1553	o eceed8f98ffc
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1554	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1555	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1556	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1557	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1558	\| o 0b997eb7ceee
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1559	\| \| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1560	\| \| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1561	\| \| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1562	\| \| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1563	o \| b18bc8331526
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1564	\|/ Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1565	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1566	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1567	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1568	o dd800401bd8c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1569	\| Predecessors: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1570	\| semi-colon: 4:9bd10a0775e4
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1571	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1572	\| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1573	\| @ 9bd10a0775e4
33276 89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1574	\|/ 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	1575	\| multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1576	\| multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
89796a25d4bb template: add successors template Boris Feld <boris.feld@octobus.net> parents: 33275 diff changeset	1577	\| 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	1578	o f897c6137566
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1579	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1580	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1581
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1582
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1583	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1584	o eceed8f98ffc
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1585	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1586	\| o 0b997eb7ceee
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1587	\| \|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1588	o \| b18bc8331526
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1589	\|/
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1590	o dd800401bd8c
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1591	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1592	\| @ 9bd10a0775e4
33995 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 33994 diff changeset	1593	\|/ Obsfate: split as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split 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	1594	o f897c6137566
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1595	\|
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1596	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1597
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1598	Test templates with pruned commits
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1599	==================================
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1600
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1601	Test setup
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1602	----------
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1603
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1604	$ hg init $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1605	$ cd $TESTTMP/templates-local-prune
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1606	$ mkcommit ROOT
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1607	$ mkcommit A0
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1608	$ 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	1609	obsoleted 1 changesets
33275 4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1610
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1611	Check output
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
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1614	$ hg up "desc(A0)" --hidden
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1615	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	1616	$ hg tlog
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1617	@ 471f378eab4c
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1618	\|
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1619	o ea207398892e
4cf60d5894b5 template: add tests for more complex cases Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	1620
33912 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1621	$ hg fatelog
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1622	@ 471f378eab4c
33996 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 33995 diff changeset	1623	\| 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	1624	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1625
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1626	$ hg fatelog -v
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1627	@ 471f378eab4c
33996 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 33995 diff changeset	1628	\| 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	1629	o ea207398892e
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33773 diff changeset	1630
33997 d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1631	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	1632	===========================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1633
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1634	Test setup
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1635	----------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1636
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1637	$ 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	1638	$ cd $TESTTMP/multiple-local-prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1639	$ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1640	$ mkcommit A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1641	$ hg commit --amend -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1642	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1643	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1644
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1645	$ 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	1646	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	1647	$ hg commit --amend -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1648	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1649	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1650
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1651	Check output
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1652	------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1653
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1654	$ hg up "desc(A0)" --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1655	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	1656	$ hg tlog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1657	@ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1658	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1659	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1660
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1661	# 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	1662	$ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1663	@ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1664	\| Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1665	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1666
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1667	$ hg fatelog -v --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1668	x 65b757b745b9
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1669	\| 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	1670	\| x fdf9bde5129a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1671	\|/ 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	1672	\| @ 471f378eab4c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1673	\|/ Obsfate: rewritten as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten as 3:65b757b745b9 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	1674	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1675
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1676
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1677	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	1678	==============================================
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1679
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1680	$ 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	1681	$ 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	1682	$ mkcommit ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1683	$ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1684	$ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1685	$ hg commit -A -m "A0"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1686	adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1687	adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1688	$ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1689	@ changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1690	\| tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1691	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1692	\| 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	1693	\| summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1694	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1695	o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1696	user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1697	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	1698	summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1699
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1700	# Simulate split
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1701	$ hg up -r "desc(ROOT)"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1702	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	1703	$ echo 42 >> a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1704	$ hg commit -A -m "A1"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1705	adding a
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1706	created new head
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1707	$ echo 43 >> b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1708	$ hg commit -A -m "A2"
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1709	adding b
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1710	$ 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	1711	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1712
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1713	# Simulate prune
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1714	$ hg debugobsolete --record-parent `getid "."`
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1715	obsoleted 1 changesets
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1716
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1717	$ hg log --hidden -G
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1718	@ changeset: 3:0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1719	\| tag: tip
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1720	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1721	\| 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	1722	\| summary: A2
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1723	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1724	o changeset: 2:617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1725	\| parent: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1726	\| user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1727	\| 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	1728	\| summary: A1
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1729	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1730	\| x changeset: 1:471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1731	\|/ user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1732	\| 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	1733	\| summary: A0
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1734	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1735	o changeset: 0:ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1736	user: test
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1737	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	1738	summary: ROOT
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1739
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1740	Check templates
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1741	---------------
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1742
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1743	$ hg up 'desc("A0")' --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1744	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	1745
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1746	# 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	1747	$ hg fatelog
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1748	o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1749	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1750	\| @ 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1751	\|/ Obsfate: pruned;
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1752	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1753
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1754	$ 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	1755	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	1756
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1757	$ hg fatelog --hidden
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1758	@ 0d0ef4bdf70e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1759	\| 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	1760	o 617adc3a144c
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1761	\|
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1762	\| x 471597cad322
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1763	\|/ 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	1764	o ea207398892e
d0f1e3d3ef4d test: add more obsmarker tests for pruning scenarios Boris Feld <boris.feld@octobus.net> parents: 33996 diff changeset	1765

author	Saurabh Singh <singhsrb@fb.com>
	Fri, 01 Sep 2017 12:34:36 -0700
changeset 34085	e8a7c1a0565a
parent 33997	d0f1e3d3ef4d
child 34286	ecc96506c49d
permissions	-rw-r--r--