evolve: tests/test-evolve-obshistory.t@85cdce113c2c (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
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	7	$ . $TESTDIR/testlib/common.sh
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	8	$ cat >> $HGRCPATH <<EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	9	> [ui]
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	10	> interactive = true
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	11	> [phases]
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	12	> publish=False
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	> [extensions]
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	14	> evolve =
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	15	> [experimental]
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	16	> evolution.effect-flags = yes
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	17	> EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	18
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	19	Test output on amended commit
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	20	=============================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	21
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	23	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	24
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	$ hg init $TESTTMP/local-amend
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	26	$ cd $TESTTMP/local-amend
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	$ echo 42 >> A0
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	30	$ hg amend -m "A1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	31	>
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	32	> Better commit message"
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	$ hg log --hidden -G
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	34	@ changeset: 3:4ae3a4151de9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	38	\| 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	39	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	\|
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	41	\| x changeset: 2:f137d23bb3e1
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	42	\| \| user: test
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	43	\| \| date: Thu Jan 01 00:00:00 1970 +0000
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	44	\| \| obsolete: pruned
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	45	\| \| summary: temporary amend commit for 471f378eab4c
f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	46	\| \|
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	50	\| obsolete: rewritten as 4ae3a4151de9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	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	56	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	57
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	-----------
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	60	$ hg obslog --patch 4ae3a4151de9
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	61	@ 4ae3a4151de9 (3) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	62	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	63	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	64	rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	65	diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	66	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	67	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	68	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	69	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	70	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	71	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	72	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	73
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	74	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	75	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	76	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	77	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	78	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	79	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	80
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	81
3398 d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	82	$ hg obslog --patch --color debug
3418 85cdce113c2c test-compat: merge stable into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3287 3411 diff changeset	83	@ [evolve.node\|4ae3a4151de9] [evolve.rev\|(3)] [evolve.short_description\|A1]
3398 d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	84	\|
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	85	x [evolve.node\|471f378eab4c] [evolve.rev\|(1)] [evolve.short_description\|A0]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	86	[evolve.verb\|rewritten](description, content) as [evolve.node\|4ae3a4151de9] by [evolve.user\|test] [evolve.date\|(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	87	[diff.diffline\|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	88	[diff.file_a\|--- a/changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	89	[diff.file_b\|+++ b/changeset-description]
3399 4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	90	[diff.hunk\|@@ -1,1 +1,3 @@]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	91	[diff.deleted\|-A0]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	92	[diff.inserted\|+A1]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	93	[diff.inserted\|+]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	94	[diff.inserted\|+Better commit message]
3398 d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	95
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	96	[diff.diffline\|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	97	[diff.file_a\|--- a/A0 Thu Jan 01 00:00:00 1970 +0000]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	98	[diff.file_b\|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	99	[diff.hunk\|@@ -1,1 +1,2 @@]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	100	A0
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	101	[diff.inserted\|+42]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	102
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	103
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	104
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	105	$ hg obslog --no-graph --patch 4ae3a4151de9
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	106	4ae3a4151de9 (3) A1
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	107	471f378eab4c (1) A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	108	rewritten(description, content) as 4ae3a4151de9 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	109	diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	110	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	111	+++ b/changeset-description
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	112	@@ -1,1 +1,3 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	113	-A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	114	+A1
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	115	+
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	116	+Better commit message
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	117
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	118	diff -r 471f378eab4c -r 4ae3a4151de9 A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	119	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	120	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	121	@@ -1,1 +1,2 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	122	A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	123	+42
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	124
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	125
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	126	$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date\|hgdate} by {user\|person} ", " also "))}'
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	127	@ A1
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	128	\|
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	129	x A0 at 0 0 by test
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	130
2441 80b5fc054219 evolve: adding longer aliases for olog Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 2420 diff changeset	131	$ hg obslog 4ae3a4151de9 --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	132	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	133	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	134	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	135	"node": "4ae3a4151de9",
3105 f5d472b7e800 test-compat: revert output changes related to temporary amend commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3100 diff changeset	136	"rev": 3,
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	137	"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	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	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	141	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	142	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	143	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	144	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	145	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	146	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	147	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	148	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	149	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	150	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	151	"4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	152	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	153	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	154	"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	155	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	156	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	157	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	158	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	159	"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	160	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	161	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	162	$ hg obslog --hidden --patch 471f378eab4c
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	163	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	164	rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	165	diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	166	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	167	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	168	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	169	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	170	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	171	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	172	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	173
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	174	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	175	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	176	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	177	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	178	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	179	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 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
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	182	$ 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	183	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	184	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	185	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	186	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	187	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	188	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	189	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	190	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	191	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	192	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	193	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	194	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	195	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	196	"4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	197	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	198	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	199	"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	200	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	201	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	202	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	203	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	204	"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	205	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	206	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	207	$ hg update 471f378eab4c
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	208	abort: hidden revision '471f378eab4c'!
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	209	(use --hidden to access hidden revisions; successor: 4ae3a4151de9)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	210	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	211	$ hg update --hidden "desc(A0)"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	212	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	213	working directory parent is obsolete! (471f378eab4c)
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	214	(use 'hg evolve' to update to its successor: 4ae3a4151de9)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	215
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	216	Test output with pruned commit
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	217	==============================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	218
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	219	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	220	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	221
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	222	$ hg init $TESTTMP/local-prune
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	223	$ cd $TESTTMP/local-prune
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	224	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	225	$ mkcommit A0 # 0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	226	$ mkcommit B0 # 1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	227	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	228	@ changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	229	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	230	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	231	\| 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	232	\| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	233	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	234	o changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	235	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	236	\| 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	237	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	238	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	239	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	240	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	241	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	242	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	243
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	244	$ hg prune -r 'desc(B0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	245	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	246	working directory now at 471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	247	1 changesets pruned
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	248	$ hg log --hidden -G
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	249	x changeset: 2:0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	250	\| tag: tip
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	251	\| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	252	\| date: Thu Jan 01 00:00:00 1970 +0000
2709 5d54de9cf50f merge back with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2698 diff changeset	253	\| obsolete: pruned
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	254	\| summary: B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	255	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	256	@ changeset: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	257	\| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	258	\| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	259	\| summary: A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	260	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	261	o changeset: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	262	user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	263	date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	264	summary: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	265
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	266
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	267	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	268	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	269
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	270	$ hg obslog 'desc(B0)' --hidden --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	271	x 0dec01379d3b (2) B0
2478 e3ddb534e5d9 test: improve the globing for obsmarker date Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2420 diff changeset	272	pruned by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	273	(No patch available, no successors)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	274
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	275	$ hg obslog 'desc(B0)' --hidden --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	276	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	277	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	278	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	279	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	280	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	281	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	282	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	283	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	284	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	285	"verb": "pruned"
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	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	289	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	290	"shortdescription": "B0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	291	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	292	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	293	$ hg obslog 'desc(A0)' --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	294	@ 471f378eab4c (1) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	295
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	296	$ hg obslog 'desc(A0)' --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	297	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	298	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	299	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	300	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	301	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	302	"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	303	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	304	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	305	$ hg up 1
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	306	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	307	$ hg up 0dec01379d3b
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	308	abort: hidden revision '0dec01379d3b'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	309	(use --hidden to access hidden revisions; pruned)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	310	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	311	$ hg up --hidden -r 'desc(B0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	313	working directory parent is obsolete! (0dec01379d3b)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	314	(use 'hg evolve' to update to its parent successor)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	315
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	Test output with splitted commit
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	================================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	318
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	319	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	321
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	322	$ hg init $TESTTMP/local-split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	$ cd $TESTTMP/local-split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	324	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	$ echo 42 >> a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	$ echo 43 >> b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	327	$ hg commit -A -m "A0"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	328	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	329	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	330	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	331	@ changeset: 1:471597cad322
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	332	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	333	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	334	\| 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	335	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	336	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	337	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	338	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	339	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	340	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	341
3216 13cb0810ce22 split: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3154 diff changeset	342	$ hg split -r 'desc(A0)' -n "testing split" -d "0 0" << EOF
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	343	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	344	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	345	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	346	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	347	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	348	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	349	> EOF
3287 4303a46b4167 test-compat: merge stable into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3223 3166 diff changeset	350	current hg version does not support storing note in obsmarker
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	351	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	352	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	353	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	354	diff --git a/a b/a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	355	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	356	examine changes to 'a'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	357
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	358	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	359	+42
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	360	record change 1/2 to 'a'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	361
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	362	diff --git a/b b/b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	363	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	364	examine changes to 'b'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	365
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	366	created new head
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	368	diff --git a/b b/b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	369	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	370	examine changes to 'b'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	371
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	372	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	373	+43
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	374	record this change to 'b'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	375
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	376	no more change to split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	377
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	378	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	@ changeset: 3:f257fde29c7a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	382	\| 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	383	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	384	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	385	o changeset: 2:337fec4d2edc
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	386	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	387	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	388	\| 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	389	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	390	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	391	\| x changeset: 1:471597cad322
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	392	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	393	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	394	\| obsolete: split as 337fec4d2edc, f257fde29c7a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	395	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	396	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	397	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	398	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	399	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	400	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	401
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	402	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	403	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	404
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	405	Check that debugobshistory on splitted commit show both targets
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	406	$ hg obslog 471597cad322 --hidden --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	407	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	408	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	409	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	410	(No patch available, too many successors (2))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	411
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	412	$ hg obslog 471597cad322 --hidden --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	413	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	414	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	415	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	416	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	417	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	418	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	419	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	420	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	421	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	422	"parent",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	423	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	424	],
3216 13cb0810ce22 split: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3154 diff changeset	425	"note": "testing split",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	426	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	427	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	428	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	429	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	430	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	431	"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	432	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	433	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	434	"node": "471597cad322",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	435	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	436	"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	437	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	438	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	439	Check that debugobshistory on the first successor after split show
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	440	the revision plus the splitted one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	441	$ hg obslog 337fec4d2edc --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	442	o 337fec4d2edc (2) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	443	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	444	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	445	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	446	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	447	(No patch available, too many successors (2))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	448
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	449	With the all option, it should show the three changesets
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	450	$ hg obslog --all 337fec4d2edc --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	451	o 337fec4d2edc (2) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	452	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	453	\| @ f257fde29c7a (3) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	454	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	455	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	456	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	457	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	458	(No patch available, too many successors (2))
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	459
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	460	Check that debugobshistory on the second successor after split show
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	461	the revision plus the splitted one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	462	$ hg obslog f257fde29c7a --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	463	@ f257fde29c7a (3) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	464	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	465	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	466	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	467	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	468	(No patch available, too many successors (2))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	469
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	470	With the all option, it should show the three changesets
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	471	$ hg obslog f257fde29c7a --all --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	472	o 337fec4d2edc (2) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	473	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	474	\| @ f257fde29c7a (3) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	475	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	476	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	477	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	478	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	479	(No patch available, too many successors (2))
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	480
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	481	Obslog with all option all should also works on the splitted commit
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	482	$ hg obslog -a 471597cad322 --hidden --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	483	o 337fec4d2edc (2) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	484	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	485	\| @ f257fde29c7a (3) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	486	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	487	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	488	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	489	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	490	(No patch available, too many successors (2))
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	491
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	492	Check that debugobshistory on both successors after split show
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	493	a coherent graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	494	$ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	495	o 337fec4d2edc (2) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	496	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	497	\| @ f257fde29c7a (3) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	498	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	499	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	500	rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
3223 73b4e84df0bd obsnote: don't add '' to note while showing it in obslog Pulkit Goyal <7895pulkit@gmail.com> parents: 3216 diff changeset	501	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	502	(No patch available, too many successors (2))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	503
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	504	$ hg update 471597cad322
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	505	abort: hidden revision '471597cad322'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	506	(use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	507	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	508	$ hg update --hidden 'min(desc(A0))'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	509	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	510	working directory parent is obsolete! (471597cad322)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	511	(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	512
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	513	Test output with lots of splitted commit
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	514	========================================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	515
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	516	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	517	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	518
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	519	$ hg init $TESTTMP/local-lots-split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	520	$ cd $TESTTMP/local-lots-split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	521	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	522	$ echo 42 >> a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	523	$ echo 43 >> b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	524	$ echo 44 >> c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	525	$ echo 45 >> d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	526	$ hg commit -A -m "A0"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	527	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	528	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	529	adding c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	adding d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	531	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	532	@ changeset: 1:de7290d8b885
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	535	\| 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	536	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	537	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	538	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	539	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	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	541	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	542
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	543
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	544	$ hg split -r 'desc(A0)' -d "0 0" << EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	546	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	549	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	550	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	551	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	552	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	553	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	554	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	555	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	556	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	557	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	558	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	559	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	560	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	561	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	562	> EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	563	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	564	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	565	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	566	adding c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	567	adding d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	568	diff --git a/a b/a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	569	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	570	examine changes to 'a'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	571
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	572	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	573	+42
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	574	record change 1/4 to 'a'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	575
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	576	diff --git a/b b/b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	577	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	578	examine changes to 'b'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	579
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	580	diff --git a/c b/c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	581	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	582	examine changes to 'c'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	583
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	584	diff --git a/d b/d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	585	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	586	examine changes to 'd'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	587
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	588	created new head
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	589	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	590	diff --git a/b b/b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	591	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	592	examine changes to 'b'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	593
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	594	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	595	+43
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	596	record change 1/3 to 'b'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	597
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	598	diff --git a/c b/c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	599	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	600	examine changes to 'c'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	601
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	602	diff --git a/d b/d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	603	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	604	examine changes to 'd'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	605
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	606	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	607	diff --git a/c b/c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	608	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	609	examine changes to 'c'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	610
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	611	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	612	+44
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	613	record change 1/2 to 'c'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	614
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	615	diff --git a/d b/d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	616	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	617	examine changes to 'd'? [Ynesfdaq?] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	618
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	619	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	620	diff --git a/d b/d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	621	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	622	examine changes to 'd'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	623
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	624	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	625	+45
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	626	record this change to 'd'? [Ynesfdaq?] y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	627
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	no more change to split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	629
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	630	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	631	@ changeset: 5:c7f044602e9b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	632	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	634	\| 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	635	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	636	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	637	o changeset: 4:1ae8bc733a14
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	638	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	639	\| 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	640	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	641	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	642	o changeset: 3:f257fde29c7a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	643	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	644	\| 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	645	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	646	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	647	o changeset: 2:337fec4d2edc
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	648	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	649	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	650	\| 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	651	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	652	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	653	\| x changeset: 1:de7290d8b885
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	654	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	655	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	656	\| obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	657	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	658	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	659	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	660	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	661	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	662	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	663
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	664	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	665	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	666
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	667	$ hg obslog de7290d8b885 --hidden --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	668	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	669	rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	670	(No patch available, too many successors (4))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	671
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	672	$ hg obslog de7290d8b885 --hidden --all --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	673	o 1ae8bc733a14 (4) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	674	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	675	\| o 337fec4d2edc (2) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	676	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	677	\| @ c7f044602e9b (5) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	678	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	679	\| o f257fde29c7a (3) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	680	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	681	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	682	rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	683	(No patch available, too many successors (4))
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	684
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	685	$ hg obslog de7290d8b885 --hidden --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	686	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	687	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	688	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	689	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	690	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	691	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	692	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	693	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	694	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	695	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	696	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	697	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	698	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	699	"1ae8bc733a14",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	700	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	701	"c7f044602e9b",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	702	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	703	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	704	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	705	"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	706	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	707	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	708	"node": "de7290d8b885",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	709	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	710	"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	711	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	712	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	713	$ hg obslog c7f044602e9b --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	714	@ c7f044602e9b (5) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	715	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	716	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	717	rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	718	(No patch available, too many successors (4))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	719
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	720	$ hg obslog c7f044602e9b --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	721	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	722	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	723	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	724	"node": "c7f044602e9b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	725	"rev": 5,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	726	"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	727	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	728	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	729	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	730	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	731	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	732	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	733	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	734	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	735	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	736	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	737	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	738	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	739	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	740	"1ae8bc733a14",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	741	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	742	"c7f044602e9b",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	743	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	744	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	745	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	746	"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	747	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	748	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	749	"node": "de7290d8b885",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	750	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	751	"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	752	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	753	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	754	Check that debugobshistory on all heads show a coherent graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	755	$ hg obslog 2::5 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	756	o 1ae8bc733a14 (4) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	757	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	758	\| o 337fec4d2edc (2) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	759	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	760	\| @ c7f044602e9b (5) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	761	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	762	\| o f257fde29c7a (3) A0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	763	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	764	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	765	rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	766	(No patch available, too many successors (4))
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	767
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	768	$ hg obslog 5 --all --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	769	o 1ae8bc733a14 (4) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	770	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	771	\| o 337fec4d2edc (2) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	772	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	773	\| @ c7f044602e9b (5) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	774	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	775	\| o f257fde29c7a (3) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	776	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	777	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	778	rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	779	(No patch available, too many successors (4))
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	780
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	781	$ hg update de7290d8b885
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	782	abort: hidden revision 'de7290d8b885'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	783	(use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	784	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	785	$ hg update --hidden 'min(desc(A0))'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	786	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	787	working directory parent is obsolete! (de7290d8b885)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	788	(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	789
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	790	Test output with folded commit
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	791	==============================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	792
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	793	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	794	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	795
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	796	$ hg init $TESTTMP/local-fold
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	797	$ cd $TESTTMP/local-fold
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	798	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	799	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	800	$ mkcommit B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	801	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	802	@ changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	803	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	804	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	805	\| 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	806	\| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	807	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	808	o changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	809	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	810	\| 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	811	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	812	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	813	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	814	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	815	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	816	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	817
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	818	$ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	819	2 changesets folded
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	820	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	821	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	822	@ changeset: 3:eb5a0daa2192
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	823	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	824	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	825	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	826	\| 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	827	\| summary: C0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	828	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	829	\| x changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	830	\| \| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	831	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	832	\| \| obsolete: rewritten as eb5a0daa2192
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	833	\| \| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	834	\| \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	835	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	836	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	837	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	838	\| obsolete: rewritten as eb5a0daa2192
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	839	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	840	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	841	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	842	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	843	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	844	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	845
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	846	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	847	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	848
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	849	Check that debugobshistory on the first folded revision show only
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	850	the revision with the target
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	851	$ 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	852	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	853	rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	854	diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	855	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	856	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	857	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	858	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	859	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	860
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	861	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	862	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	863	+++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	864	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	865	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	866
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	867
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	868	Check that with all option, all changesets are shown
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	869	$ 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	870	@ eb5a0daa2192 (3) C0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	871	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	872	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	873	/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	874	\| (No patch available, changesets rebased)
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	875	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	876	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	877	rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	878	diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	879	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	880	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	881	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	882	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	883	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	884
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	885	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	886	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	887	+++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	888	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	889	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	890
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	891
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	892	Check that debugobshistory on the second folded revision show only
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	893	the revision with the target
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	894	$ hg obslog --hidden 0dec01379d3b --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	895	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	896	rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	897	(No patch available, changesets rebased)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	898
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	899	Check that with all option, all changesets are shown
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	900	$ hg obslog --hidden --all 0dec01379d3b --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	901	@ eb5a0daa2192 (3) C0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	902	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	903	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	904	/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	905	\| (No patch available, changesets rebased)
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	906	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	907	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	908	rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	909	diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	910	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	911	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	912	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	913	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	914	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	915
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	916	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	917	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	918	+++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	919	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	920	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	921
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	922
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	923	Check that debugobshistory on the successor 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	924	graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	925	$ hg obslog eb5a0daa2192 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	926	@ eb5a0daa2192 (3) C0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	927	\|\
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	928	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	929	/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	930	\| (No patch available, changesets rebased)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	931	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	932	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	933	rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	934	diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	935	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	936	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	937	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	938	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	939	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	940
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	941	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	942	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	943	+++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	944	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	945	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	946
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	947
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	948	$ hg obslog eb5a0daa2192 --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	949	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	950	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	951	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	952	"node": "eb5a0daa2192",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	953	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	954	"shortdescription": "C0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	955	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	956	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	957	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	958	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	959	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	960	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	961	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	962	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	963	"effect": [
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	964	"description",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	965	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	966	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	967	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	968	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	969	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	970	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	971	"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	972	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	973	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	974	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	975	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	976	"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	977	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	978	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	979	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	980	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	981	"date": [
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	982	*, (glob)
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	983	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	984	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	985	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	986	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	987	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	988	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	989	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	990	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	991	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	992	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	993	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	994	"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	995	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	996	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	997	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	998	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	999	"shortdescription": "B0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1000	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1001	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1002	$ hg update 471f378eab4c
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1003	abort: hidden revision '471f378eab4c'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1004	(use --hidden to access hidden revisions; successor: eb5a0daa2192)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1005	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1006	$ hg update --hidden 'desc(A0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1007	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1008	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	1009	(use 'hg evolve' to update to its successor: eb5a0daa2192)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1010	$ hg update 0dec01379d3b
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1011	abort: hidden revision '0dec01379d3b'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1012	(use --hidden to access hidden revisions; successor: eb5a0daa2192)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1013	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1014	$ hg update --hidden 'desc(B0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1015	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1016	working directory parent is obsolete! (0dec01379d3b)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1017	(use 'hg evolve' to update to its successor: eb5a0daa2192)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1018
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1019	Test output with divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1020	===========================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1021
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1022	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1023	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1024
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1025	$ 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	1026	$ cd $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1027	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1028	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1029	$ hg amend -m "A1"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1030	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1031	@ changeset: 2:fdf9bde5129a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1032	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1033	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1034	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1035	\| 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	1036	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1037	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1038	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1039	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1040	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1041	\| 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	1042	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1043	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1044	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1045	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1046	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	1047	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1048
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1049	$ hg update --hidden 'desc(A0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1050	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1051	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	1052	(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	1053	$ hg amend -m "A2"
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	1054	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	1055	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1056	@ changeset: 3:65b757b745b9
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1057	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1058	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1059	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1060	\| date: Thu Jan 01 00:00:00 1970 +0000
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	1061	\| trouble: divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1062	\| summary: A2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1063	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1064	\| 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	1065	\|/ parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1066	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1067	\| date: Thu Jan 01 00:00:00 1970 +0000
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3105 diff changeset	1068	\| trouble: divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1069	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1070	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1071	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1072	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1073	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1074	\| obsolete: reworded as fdf9bde5129a
87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1075	\| 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	1076	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1077	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1078	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1079	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1080	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	1081	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1082
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1083	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1084	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1085
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1086	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	1087	$ 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	1088	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1089	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1090	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	1091	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1092	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1093	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1094	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1095	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1096
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1097	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1098	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	1099	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1100	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1101	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1102	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1103	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1104
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1105
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	1106
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1107	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	1108	$ 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	1109	@ 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	1110	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1111	\| 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	1112	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1113	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1114	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1115	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	1116	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1117	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1118	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1119	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1120	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1121
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1122	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1123	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	1124	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1125	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1126	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1127	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1128	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1129
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	1130
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	1131	$ 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	1132	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1133	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1134	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1135	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1136	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1137	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1138	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1139	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1140	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1141	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1142	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1143	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1144	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1145	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1146	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1147	"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	1148	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1149	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1150	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1151	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1152	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1153	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1154	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1155	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1156	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1157	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1158	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1159	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1160	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1161	"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	1162	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1163	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1164	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1165	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1166	"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	1167	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1168	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1169	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	1170	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1171	$ hg obslog fdf9bde5129a --patch
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1172	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	1173	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1174	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1175	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1176	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	1177	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1178	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1179	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1180	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1181	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1182
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1183	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1184	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	1185	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1186	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1187	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1188	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1189	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1190
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1191
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	1192
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1193	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	1194	$ 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	1195	@ 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	1196	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1197	\| 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	1198	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1199	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1200	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1201	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	1202	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1203	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1204	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1205	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1206	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1207
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1208	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1209	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	1210	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1211	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1212	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1213	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1214	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1215
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	1216
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1217	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	1218	and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1219	$ 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	1220	@ 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	1221	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1222	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1223	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1224	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	1225	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1226	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1227	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1228	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1229	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1230
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1231	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1232	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	1233	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1234	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1235	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1236	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1237	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1238
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1239
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	1240	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	1241	$ 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	1242	@ 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	1243	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1244	\| 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	1245	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1246	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1247	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1248	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	1249	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1250	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1251	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1252	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1253	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1254
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1255	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1256	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	1257	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1258	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1259	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1260	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1261	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1262
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	1263
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1264	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	1265	graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1266	$ 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	1267	@ 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	1268	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3410 diff changeset	1269	\| 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	1270	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1271	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1272	rewritten(description) as 65b757b745b9 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1273	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	1274	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1275	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1276	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1277	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1278	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1279
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1280	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1281	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	1282	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1283	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1284	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1285	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1286	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1287
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1288
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	1289	$ 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	1290	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1291	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1292	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1293	"node": "65b757b745b9",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1294	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1295	"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	1296	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1297	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1298	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1299	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1300	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1301	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1302	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1303	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1304	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1305	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1306	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1307	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1308	"65b757b745b9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1309	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1310	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1311	"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	1312	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1313	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1314	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1315	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1316	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1317	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1318	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1319	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1320	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1321	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1322	"fdf9bde5129a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1323	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1324	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1325	"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	1326	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1327	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1328	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1329	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1330	"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	1331	},
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1332	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1333	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1334	"node": "fdf9bde5129a",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1335	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1336	"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	1337	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1338	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1339	$ hg update 471f378eab4c
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1340	abort: hidden revision '471f378eab4c'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1341	(use --hidden to access hidden revisions; diverged)
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1342	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1343	$ hg update --hidden 'desc(A0)'
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1344	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1345	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	1346	(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1347
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1348	Test output with amended + folded commit
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1349	========================================
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1350
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1351	Test setup
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1352	----------
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1353
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1354	$ hg init $TESTTMP/local-amend-fold
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1355	$ cd $TESTTMP/local-amend-fold
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1356	$ mkcommit ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1357	$ mkcommit A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1358	$ mkcommit B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1359	$ hg amend -m "B1"
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1360	$ hg log --hidden -G
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1361	@ changeset: 3:b7ea6d14e664
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1362	\| tag: tip
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1363	\| parent: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1364	\| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1365	\| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1366	\| summary: B1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1367	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1368	\| x changeset: 2:0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1369	\|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1370	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1371	\| obsolete: reworded as b7ea6d14e664
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1372	\| summary: B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1373	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1374	o changeset: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1375	\| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1376	\| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1377	\| summary: A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1378	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1379	o changeset: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1380	user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1381	date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1382	summary: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1383
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1384	$ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1385	2 changesets folded
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1386	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1387	$ hg log --hidden -G
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1388	@ changeset: 4:eb5a0daa2192
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1389	\| tag: tip
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1390	\| parent: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1391	\| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1392	\| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1393	\| summary: C0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1394	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1395	\| x changeset: 3:b7ea6d14e664
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1396	\| \| parent: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1397	\| \| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1398	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1399	\| \| obsolete: rewritten as eb5a0daa2192
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1400	\| \| summary: B1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1401	\| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1402	\| \| x changeset: 2:0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1403	\| \|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1404	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1405	\| \| obsolete: reworded as b7ea6d14e664
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1406	\| \| summary: B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1407	\| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1408	\| x changeset: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1409	\|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1410	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1411	\| obsolete: rewritten as eb5a0daa2192
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1412	\| summary: A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1413	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1414	o changeset: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1415	user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1416	date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1417	summary: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1418
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1419	Actual test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1420	-----------
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1421
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1422	Check that debugobshistory on head show a coherent graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1423	$ hg obslog eb5a0daa2192 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1424	@ eb5a0daa2192 (4) C0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1425	\|\
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1426	x \| 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1427	/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1428	\| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1429	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1430	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1431	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1432	\| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1433	\| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1434	\|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1435	\| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1436	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1437	\| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1438	\| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1439	\| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1440	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1441	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1442	x b7ea6d14e664 (3) B1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1443	\| rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1444	\| (No patch available, changesets rebased)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1445	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1446	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1447	rewritten(description) as b7ea6d14e664 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1448	diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1449	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1450	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1451	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1452	-B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1453	+B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1454
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1455
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	1456	Check that obslog on ROOT with all option show everything
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1457	$ hg obslog 1 --hidden --all --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	1458	@ eb5a0daa2192 (4) C0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1459	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1460	x \| 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1461	/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1462	\| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1463	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1464	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1465	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1466	\| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1467	\| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1468	\|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1469	\| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1470	\| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1471	\| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1472	\| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1473	\| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1474	\|
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	1475	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1476	x b7ea6d14e664 (3) B1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1477	\| rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1478	\| (No patch available, changesets rebased)
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	1479	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1480	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1481	rewritten(description) as b7ea6d14e664 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1482	diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1483	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1484	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1485	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1486	-B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1487	+B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1488
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	1489
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	1490	$ hg obslog eb5a0daa2192 --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	1491	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1492	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1493	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1494	"node": "eb5a0daa2192",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1495	"rev": 4,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1496	"shortdescription": "C0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1497	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1498	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1499	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1500	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1501	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1502	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1503	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1504	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1505	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1506	*, (glob)
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1507	*, (glob)
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1508	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1509	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1510	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1511	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1512	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1513	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1514	"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	1515	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1516	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1517	"node": "b7ea6d14e664",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1518	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1519	"shortdescription": "B1"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1520	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1521	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1522	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1523	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1524	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1525	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1526	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1527	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1528	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1529	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1530	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1531	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1532	"b7ea6d14e664"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1533	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1534	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1535	"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	1536	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1537	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1538	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1539	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1540	"shortdescription": "B0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1541	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1542	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1543	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1544	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1545	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1546	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1547	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1548	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1549	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1550	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1551	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1552	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1553	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1554	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1555	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1556	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1557	"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	1558	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1559	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1560	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1561	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1562	"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	1563	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1564	]
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1565	$ hg update 471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1566	abort: hidden revision '471f378eab4c'!
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1567	(use --hidden to access hidden revisions; successor: eb5a0daa2192)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1568	[255]
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1569	$ hg update --hidden 'desc(A0)'
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1570	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1571	working directory parent is obsolete! (471f378eab4c)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1572	(use 'hg evolve' to update to its successor: eb5a0daa2192)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1573	$ hg update --hidden 0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1574	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1575	working directory parent is obsolete! (0dec01379d3b)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1576	(use 'hg evolve' to update to its successor: eb5a0daa2192)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1577	$ hg update 0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1578	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1579	$ hg update --hidden 'desc(B0)'
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1580	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1581
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1582	Test output with pushed and pulled obs markers
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1583	==============================================
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1584
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1585	Test setup
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1586	----------
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1587
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1588	$ hg init $TESTTMP/local-remote-markers-1
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1589	$ cd $TESTTMP/local-remote-markers-1
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1590	$ mkcommit ROOT
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1591	$ mkcommit A0
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1592	$ hg log --hidden -G
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1593	@ changeset: 1:471f378eab4c
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1594	\| tag: tip
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1595	\| user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1596	\| date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1597	\| summary: A0
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1598	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1599	o changeset: 0:ea207398892e
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1600	user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1601	date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1602	summary: ROOT
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1603
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1604	$ hg clone $TESTTMP/local-remote-markers-1 $TESTTMP/local-remote-markers-2
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1605	updating to branch default
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1606	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1607	$ cd $TESTTMP/local-remote-markers-2
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1608	$ hg log --hidden -G
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1609	@ changeset: 1:471f378eab4c
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1610	\| tag: tip
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1611	\| user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1612	\| date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1613	\| summary: A0
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1614	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1615	o changeset: 0:ea207398892e
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1616	user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1617	date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1618	summary: ROOT
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1619
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1620	$ cd $TESTTMP/local-remote-markers-1
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1621	$ hg amend -m "A1"
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1622	$ hg amend -m "A2"
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1623	$ hg log --hidden -G
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1624	@ changeset: 3:7a230b46bf61
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1625	\| tag: tip
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1626	\| parent: 0:ea207398892e
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1627	\| user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1628	\| date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1629	\| summary: A2
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1630	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1631	\| x changeset: 2:fdf9bde5129a
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1632	\|/ parent: 0:ea207398892e
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1633	\| user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1634	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1635	\| obsolete: reworded as 7a230b46bf61
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1636	\| summary: A1
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1637	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1638	\| x changeset: 1:471f378eab4c
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1639	\|/ user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1640	\| date: Thu Jan 01 00:00:00 1970 +0000
3098 87b83a3e0392 test-compat: revert output change from using core obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1641	\| obsolete: reworded as fdf9bde5129a
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1642	\| summary: A0
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1643	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1644	o changeset: 0:ea207398892e
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1645	user: test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1646	date: Thu Jan 01 00:00:00 1970 +0000
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1647	summary: ROOT
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1648
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1649	Actual test
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1650	-----------
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1651
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1652	$ hg obslog 7a230b46bf61 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1653	@ 7a230b46bf61 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1654	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1655	x fdf9bde5129a (2) A1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1656	\| rewritten(description) as 7a230b46bf61 by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1657	\| diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1658	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1659	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1660	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1661	\| -A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1662	\| +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1663	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1664	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1665	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1666	rewritten(description) as fdf9bde5129a by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1667	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	1668	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1669	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1670	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1671	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1672	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1673
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1674
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1675	$ cd $TESTTMP/local-remote-markers-2
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1676	$ hg pull
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1677	pulling from $TESTTMP/local-remote-markers-1
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1678	searching for changes
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1679	adding changesets
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1680	adding manifests
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1681	adding file changes
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1682	added 1 changesets with 0 changes to 1 files (+1 heads)
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1683	2 new obsolescence markers
2710 e22de367fc74 compat: adapt to change in 53b3a1968aa6-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2709 diff changeset	1684	obsoleted 1 changesets
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1685	(run 'hg heads' to see heads, 'hg merge' to merge)
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1686	working directory parent is obsolete! (471f378eab4c)
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1687	(use 'hg evolve' to update to its successor: 7a230b46bf61)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1688	Check that debugobshistory works with markers pointing to missing local
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1689	changectx
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1690	$ hg obslog 7a230b46bf61 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1691	o 7a230b46bf61 (2) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1692	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1693	x fdf9bde5129a
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1694	\| rewritten(description) as 7a230b46bf61 by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1695	\| (No patch available, context is not local)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1696	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1697	@ 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1698	rewritten(description) as fdf9bde5129a by test (*) (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1699	(No patch available, successor is unknown locally)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1700
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1701	$ hg obslog 7a230b46bf61 --color=debug --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1702	o [evolve.node\|7a230b46bf61] [evolve.rev\|(2)] [evolve.short_description\|A2]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1703	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1704	x [evolve.node evolve.missing_change_ctx\|fdf9bde5129a]
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1705	\| [evolve.verb\|rewritten](description) as [evolve.node\|7a230b46bf61] by [evolve.user\|test] [evolve.date\|(*)] (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1706	\| (No patch available, context is not local)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1707	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1708	@ [evolve.node\|471f378eab4c] [evolve.rev\|(1)] [evolve.short_description\|A0]
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1709	[evolve.verb\|rewritten](description) as [evolve.node\|fdf9bde5129a] by [evolve.user\|test] [evolve.date\|(*)] (glob)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	1710	(No patch available, successor is unknown locally)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1711

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 16 Jan 2018 04:35:34 +0100
branch	mercurial-4.3
changeset 3418	85cdce113c2c
parent 3287	4303a46b4167
parent 3411	e1f3e43a50a4
child 3419	1e2f683e11e7
child 3591	98941c28f3e2
permissions	-rw-r--r--