evolve: tests/test-evolve-obshistory-content-divergent.t@444e664616c7 (annotated)

2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1	This test file test the various messages when accessing obsolete
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	2	revisions.
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	3
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	4	Global setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	5	============
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	6
3885 3df8b6ecce2a tests: extract obshistory setup in a separate file Boris Feld <boris.feld@octobus.net> parents: 3884 diff changeset	7	$ . $TESTDIR/testlib/obshistory_setup.sh
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	8
3891 11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	9	Test output with content-divergence
11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	10	===================================
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	11
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	12	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	14
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	15	$ hg init $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	16	$ cd $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	17	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	18	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	19	$ hg amend -m "A1"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	20	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	21	@ changeset: 2:fdf9bde5129a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	23	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	24	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	\| date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	26	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	31	\| obsolete: reworded using amend as 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	34	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	38
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	$ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	40	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	41	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	42	(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	43	working directory parent is obsolete! (471f378eab4c)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	44	(use 'hg evolve' to update to its successor: fdf9bde5129a)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	45	$ hg amend -m "A2"
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	46	2 new content-divergent changesets
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	@ changeset: 3:65b757b745b9
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	53	\| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	\| summary: A2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	56	\| * changeset: 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\|/ parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	\| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	60	\| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	66	\| obsolete: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	67	\| obsolete: reworded using amend as 3:65b757b745b9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	70	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	71	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	72	date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	73	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	74
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	75	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	76	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	77
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	78	Check that debugobshistory on the divergent revision show both destinations
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	79	$ hg obslog --hidden 471f378eab4c --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	80	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	81	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	82	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	83	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	84	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	85	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	86	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	87	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	88
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	89	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	90	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	91	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	92	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	93	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	94	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	95	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	96
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	97
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	98
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	99	Check that with all option, every changeset is shown
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	100	$ hg obslog --hidden --all 471f378eab4c --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	101	@ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	102	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	103	\| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	104	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	105	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	106	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	107	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	108	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	109	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	110	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	111	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	112	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	113
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	114	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	115	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	116	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	117	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	118	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	119	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	120	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	121
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	122
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	123	$ hg obslog --hidden 471f378eab4c --no-graph -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	124	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	125	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	126	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	127	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	128	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	129	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	130	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	131	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	132	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	133	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	134	],
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	135	"operation": "amend",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	136	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	137	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	138	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	139	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	140	"verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	141	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	142	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	143	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	144	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	145	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	146	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	147	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	148	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	149	],
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	150	"operation": "amend",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	151	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	152	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	153	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	154	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	155	"verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	156	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	157	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	158	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	159	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	160	"shortdescription": "A0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	161	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	162	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	163	Check that debugobshistory on the first diverged revision show the revision
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	164	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	165	$ hg obslog fdf9bde5129a --patch
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	166	* fdf9bde5129a (2) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	167	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	168	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	169	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	170	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	171	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	172	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	173	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	174	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	175	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	176
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	177	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	178	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	179	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	180	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	181	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	182	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	183	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	184
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	185
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	186
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	187	Check that all option show all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	188	$ hg obslog fdf9bde5129a -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	189	@ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	190	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	191	\| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	192	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	193	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	194	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	195	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	196	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	197	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	198	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	199	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	200	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	201
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	202	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	203	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	204	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	205	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	206	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	207	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	208	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	209
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	210
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	211	Check that debugobshistory on the second diverged revision show the revision
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	212	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	213	$ hg obslog 65b757b745b9 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	214	@ 65b757b745b9 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	215	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	216	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	217	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	218	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	219	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	220	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	221	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	222	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	223	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	224
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	225	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	226	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	227	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	228	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	229	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	230	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	231	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	232
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	233
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	234	Check that all option show all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	235	$ hg obslog 65b757b745b9 -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	236	@ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	237	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	238	\| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	239	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	240	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	241	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	242	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	243	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	244	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	245	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	246	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	247	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	248
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	249	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	250	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	251	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	252	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	253	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	254	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	255	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	256
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	257
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	258	Check that debugobshistory on the both diverged revision show a coherent
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	259	graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	260	$ hg obslog '65b757b745b9+fdf9bde5129a' --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	261	@ 65b757b745b9 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	262	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	263	\| * fdf9bde5129a (2) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	264	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	265	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	266	rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	267	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	268	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	269	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	270	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	271	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	272	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	273
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	274	rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	275	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	276	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	277	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	278	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	279	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	280	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	281
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	282
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	283	$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	284	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	285	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	286	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	287	"node": "65b757b745b9",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	288	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	289	"shortdescription": "A2"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	290	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	291	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	292	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	293	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	294	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	295	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	296	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	297	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	298	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	299	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	300	],
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	301	"operation": "amend",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	302	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	303	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	304	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	305	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	306	"verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	307	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	308	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	309	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	310	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	311	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	312	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	313	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	314	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	315	],
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	316	"operation": "amend",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	317	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	318	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	319	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	320	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	321	"verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	322	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	323	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	324	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	325	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	326	"shortdescription": "A0"
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	327	},
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	328	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	329	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	330	"node": "fdf9bde5129a",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	331	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	332	"shortdescription": "A1"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	333	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	334	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	335	$ hg update 471f378eab4c
3663 54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	336	abort: hidden revision '471f378eab4c' has diverged!
54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	337	(use --hidden to access hidden revisions)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	338	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	339	$ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	340	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	341	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	342	(hidden revision '471f378eab4c' has diverged)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	343	working directory parent is obsolete! (471f378eab4c)
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3115 diff changeset	344	(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)

author	Martin von Zweigbergk <martinvonz@google.com>
	Tue, 12 Mar 2019 09:44:05 -0700
changeset 4452	444e664616c7
parent 3891	11b775fddda8
child 3909	f7afd3a158e3
child 4918	f16274729530
permissions	-rw-r--r--