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

author	Pulkit Goyal <7895pulkit@gmail.com>
	Thu, 16 Apr 2020 22:51:09 +0530
branch	stable
changeset 44729	26ce8e751503
parent 42893	34a46d48d24e
child 45675	59ab71498bee
permissions	-rw-r--r--