evolve: tests/test-evolve-obshistory-content-divergent.t@2aa2a8780a10 (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
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	31	\| obsolete: reworded as 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
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	41	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	42	(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	43	$ hg amend -m "A2"
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	44	2 new divergent changesets
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	45	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	46	@ changeset: 3:65b757b745b9
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	\| date: Thu Jan 01 00:00:00 1970 +0000
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	51	\| trouble: divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| summary: A2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	\|
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	54	\| o changeset: 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	\|/ parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	56	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\| date: Thu Jan 01 00:00:00 1970 +0000
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	58	\| trouble: divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	\| date: Thu Jan 01 00:00:00 1970 +0000
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	64	\| obsolete: reworded as fdf9bde5129a
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	65	\| obsolete: reworded as 65b757b745b9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	67	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	70	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	71	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	72
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	73	Actual test
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
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	76	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	77	$ 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	78	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	79	rewritten(description) as 65b757b745b9 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	80	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	81	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	82	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	83	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	84	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	85	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	86
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	87	rewritten(description) as fdf9bde5129a 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	88	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	89	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	90	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	91	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	92	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	93	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	94
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	95
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	96
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	97	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	98	$ 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	99	@ 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	100	\|
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	101	\| o 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	102	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	103	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	104	rewritten(description) as 65b757b745b9 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	105	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	106	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	107	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	108	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	109	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	110	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	111
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	112	rewritten(description) as fdf9bde5129a 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	113	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	114	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	115	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	116	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	117	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	118	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	119
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	120
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	121	$ 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	122	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	123	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	124	"markers": [
2342 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	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	127	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	128	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	129	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	130	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	131	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	132	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	133	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	134	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	135	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	136	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	137	"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	138	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	139	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	140	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	141	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	142	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	143	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	144	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	145	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	146	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	147	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	148	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	149	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	150	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	151	"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	152	}
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	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	155	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	156	"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	157	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	158	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	159	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	160	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	161	$ hg obslog fdf9bde5129a --patch
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	162	o 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	163	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	164	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	165	rewritten(description) as 65b757b745b9 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	166	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	167	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	168	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	169	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	170	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	171	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	172
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	173	rewritten(description) as fdf9bde5129a 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	174	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	175	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	176	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	177	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	178	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	179	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	180
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	181
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	182
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	183	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	184	$ 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	185	@ 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	186	\|
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	187	\| o 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	188	\|/
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	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	190	rewritten(description) as 65b757b745b9 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	191	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	192	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	193	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	194	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	195	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	196	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	197
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	198	rewritten(description) as fdf9bde5129a 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	199	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	200	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	201	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	202	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	203	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	204	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	205
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	206
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	207	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	208	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	209	$ 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	210	@ 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	211	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	212	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	213	rewritten(description) as 65b757b745b9 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	214	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	215	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	216	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	217	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	218	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	219	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	220
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	221	rewritten(description) as fdf9bde5129a 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	222	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	223	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	224	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	225	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	226	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	227	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	228
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	229
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	230	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	231	$ 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	232	@ 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	233	\|
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	234	\| o 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	235	\|/
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	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	237	rewritten(description) as 65b757b745b9 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	238	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	239	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	240	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	241	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	242	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	243	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	244
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	245	rewritten(description) as fdf9bde5129a 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	246	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	247	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	248	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	249	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	250	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	251	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	252
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	253
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	254	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	255	graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	256	$ 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	257	@ 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	258	\|
3930 d00f0c369bc7 test-compat: merge mercurial-4.5 into mercurial-4.4 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3924 diff changeset	259	\| o 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	260	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	261	x 471f378eab4c (1) A0
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	262	rewritten(description) as 65b757b745b9 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	263	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	264	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	265	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	266	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	267	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	268	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	269
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	270	rewritten(description) as fdf9bde5129a 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	271	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	272	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	273	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	274	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	275	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	276	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	277
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	278
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	279	$ 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	280	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	281	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	282	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	283	"node": "65b757b745b9",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	284	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	285	"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	286	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	287	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	288	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	289	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	290	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	291	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	292	0 (glob)
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	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	295	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	296	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	297	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	298	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	299	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	300	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	301	"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	302	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	303	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	304	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	305	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	306	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	307	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	308	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	309	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	310	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	311	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	312	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	313	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	314	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	315	"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	316	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	317	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	318	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	319	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	320	"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	321	},
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	322	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	323	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	324	"node": "fdf9bde5129a",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	325	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	326	"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	327	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	328	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	329	$ hg update 471f378eab4c
3924 f3713d41b85b test-compat: merge mercurial-4.6 into mercurial-4.5 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3909 diff changeset	330	abort: hidden revision '471f378eab4c'!
f3713d41b85b test-compat: merge mercurial-4.6 into mercurial-4.5 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3909 diff changeset	331	(use --hidden to access hidden revisions; diverged)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	332	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	333	$ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	334	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	335	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	336	(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 14 Sep 2018 10:51:44 +0200
branch	mercurial-4.3
changeset 4114	2aa2a8780a10
parent 3936	537fd9a86c06
permissions	-rw-r--r--