evolve: tests/test-evolve-obshistory.t@e21b4f3b32c1 (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
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	34	@ changeset: 2: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	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	41	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	42	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	43	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	44	\| obsolete: rewritten using amend as 2:4ae3a4151de9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	45	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	46	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	o changeset: 0:ea207398892e
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
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	51
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	-----------
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	54	$ hg obslog --patch 4ae3a4151de9
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	55	@ 4ae3a4151de9 (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	56	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	57	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	58	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	59	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	60	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	61	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	62	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	63	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	64	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	65	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	66	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	67
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	68	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	69	--- 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	70	+++ 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	71	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	72	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	73	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	74
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	75
3398 d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	76	$ hg obslog --patch --color debug
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	77	@ [evolve.node\|4ae3a4151de9] [evolve.rev\|(2)] [evolve.short_description\|A1]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	78	\|
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	79	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	80	[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	81	[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	82	[diff.file_a\|--- a/changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	83	[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	84	[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	85	[diff.deleted\|-A0]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	86	[diff.inserted\|+A1]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	87	[diff.inserted\|+]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	88	[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	89
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	90	[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	91	[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	92	[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	93	[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	94	A0
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	95	[diff.inserted\|+42]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	96
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	97
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	98
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	99	$ hg obslog --no-graph --patch 4ae3a4151de9
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	100	4ae3a4151de9 (2) A1
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	101	471f378eab4c (1) A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	102	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	103	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	104	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	105	+++ b/changeset-description
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	106	@@ -1,1 +1,3 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	107	-A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	108	+A1
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	109	+
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	110	+Better commit message
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	111
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	112	diff -r 471f378eab4c -r 4ae3a4151de9 A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	113	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	114	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	115	@@ -1,1 +1,2 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	116	A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	117	+42
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	118
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	119
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	120	$ 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	121	@ A1
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	122	\|
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	123	x A0 at 0 0 by test
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	124
2441 80b5fc054219 evolve: adding longer aliases for olog Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 2420 diff changeset	125	$ 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	126	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	127	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	128	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	129	"node": "4ae3a4151de9",
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	130	"rev": 2,
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	131	"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	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": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	135	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	136	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	137	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	138	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	139	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	140	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	141	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	142	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	143	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	144	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	145	"4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	146	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	147	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	148	"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	149	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	150	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	151	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	152	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	153	"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	154	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	155	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	156	$ 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	157	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	158	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	159	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	160	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	161	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	162	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	163	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	164	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	165	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	166	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	167
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	168	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	169	--- 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	170	+++ 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	171	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	172	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	173	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	174
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	175
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	176	$ 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	177	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	178	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	179	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	180	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	181	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	182	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	183	0 (glob)
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	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	186	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	187	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	188	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	189	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	190	"4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	191	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	192	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	193	"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	194	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	195	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	196	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	197	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	198	"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	199	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	200	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	201	$ hg update 471f378eab4c
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	202	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	203	(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	204	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	205	$ hg update --hidden "desc(A0)"
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	206	updating to a hidden changeset 471f378eab4c
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	207	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	208	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	209	(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	210
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	211	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	212	==============================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	213
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	214	Test setup
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
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	217	$ 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	218	$ cd $TESTTMP/local-prune
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	219	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	220	$ mkcommit A0 # 0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	221	$ mkcommit B0 # 1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	222	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	223	@ changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	224	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	225	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	226	\| 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	227	\| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	228	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	229	o changeset: 1:471f378eab4c
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: A0
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: 0:ea207398892e
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: ROOT
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	$ 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	240	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	241	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	242	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	243	$ 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	244	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	245	\| 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	246	\| 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	247	\| 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	248	\| 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	249	\| 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	250	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	251	@ 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	252	\| 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	253	\| 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	254	\| 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	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	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	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: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	260
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	261
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	262	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	263	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	264
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	265	$ 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	266	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	267	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	268	(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	269
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	270	$ 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	271	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	272	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	273	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	274	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	275	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	276	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	277	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	278	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	279	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	280	"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	281	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	282	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	283	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	284	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	285	"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	286	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	287	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	288	$ 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	289	@ 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	290
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	291	$ 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	292	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	293	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	294	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	295	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	296	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	297	"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	298	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	299	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	300	$ hg up 1
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	301	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	302	$ hg up 0dec01379d3b
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	303	abort: hidden revision '0dec01379d3b'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	304	(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	305	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	306	$ hg up --hidden -r 'desc(B0)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	307	updating to a hidden changeset 0dec01379d3b
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	308	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	309	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	310	(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	311
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	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	313	================================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	314
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	315	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	----------
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	$ 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	319	$ cd $TESTTMP/local-split
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	321	$ echo 42 >> a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	322	$ echo 43 >> b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	$ 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	324	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	327	@ changeset: 1:471597cad322
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	328	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	329	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	330	\| 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	331	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	332	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	333	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	334	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	335	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	336	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	337
3216 13cb0810ce22 split: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3154 diff changeset	338	$ 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	339	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	340	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	341	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	342	> n
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	> EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	346	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	347	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	348	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	349	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	350	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	351	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	352
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	353	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	354	+42
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	355	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	356
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	357	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	358	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	359	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	360
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	361	created new head
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	362	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	363	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	364	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	365	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	366
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	368	+43
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	369	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	370
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	371	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	372
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	373	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	374	@ changeset: 3:f257fde29c7a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	375	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	376	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	377	\| 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	378	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	o changeset: 2:337fec4d2edc
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	382	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	383	\| 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	384	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	385	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	386	\| x changeset: 1:471597cad322
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
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	389	\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	390	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	391	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	392	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	393	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	394	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	395	summary: ROOT
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	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	398	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	399
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	400	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	401	$ 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	402	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	403	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	404	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	405	(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	406
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	407	$ 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	408	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	409	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	410	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	411	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	412	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	413	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	414	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	415	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	416	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	417	"parent",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	418	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	419	],
3216 13cb0810ce22 split: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3154 diff changeset	420	"note": "testing split",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	421	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	422	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	423	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	424	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	425	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	426	"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	427	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	428	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	429	"node": "471597cad322",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	430	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	431	"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	432	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	433	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	434	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	435	the revision plus the splitted one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	436	$ 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	437	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	438	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	439	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	440	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	441	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	442	(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	443
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	444	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	445	$ 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	446	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	447	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	448	\| @ 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	449	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	450	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	451	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	452	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	453	(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	454
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	455	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	456	the revision plus the splitted one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	457	$ 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	458	@ 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	459	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	460	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	461	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	462	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	463	(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	464
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	465	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	466	$ 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	467	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	468	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	469	\| @ 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	470	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	471	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	472	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	473	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	474	(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	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	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	477	$ 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	478	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	479	\|
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	\| @ 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	481	\|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	482	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	483	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	484	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	485	(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	486
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	487	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	488	a coherent graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	489	$ 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	490	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	491	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	492	\| @ 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	493	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	494	x 471597cad322 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	495	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	496	note: testing split
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	497	(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	498
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	499	$ hg update 471597cad322
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	500	abort: hidden revision '471597cad322'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	501	(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	502	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	503	$ hg update --hidden 'min(desc(A0))'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	504	updating to a hidden changeset 471597cad322
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	505	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	506	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	507	(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	508
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	509	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	510	========================================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	511
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	512	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	513	----------
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	$ 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	516	$ 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	517	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	518	$ echo 42 >> a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	519	$ echo 43 >> b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	520	$ echo 44 >> c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	521	$ echo 45 >> d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	522	$ 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	523	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	524	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	525	adding c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	526	adding d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	527	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	528	@ changeset: 1:de7290d8b885
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	529	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	531	\| 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	532	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	535	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	536	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	537	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	538
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	539
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	$ 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	541	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	542	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	543	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	544	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	546	> n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	> y
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	> y
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	> n
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	> y
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	> EOF
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	559	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	560	adding a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	561	adding b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	562	adding c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	563	adding d
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	564	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	565	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	566	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	567
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	568	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	569	+42
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	570	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	571
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	572	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	573	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	574	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	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/c b/c
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 'c'? [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/d b/d
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 'd'? [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	created new head
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	585	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	586	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	587	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	588	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	589
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	590	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	591	+43
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	592	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	593
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	594	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	595	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	596	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	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/d b/d
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 'd'? [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	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	603	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	604	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	605	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	606
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	607	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	608	+44
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	609	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	610
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	611	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	612	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	613	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	614
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	615	Done splitting? [yN] n
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	616	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	617	new file mode 100644
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	618	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	619
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	620	@@ -0,0 +1,1 @@
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	621	+45
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	622	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	623
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	624	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	625
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	626	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	627	@ changeset: 5:c7f044602e9b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	629	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	630	\| 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	631	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	632	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	o changeset: 4:1ae8bc733a14
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	634	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	635	\| 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	636	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	637	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	638	o changeset: 3:f257fde29c7a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	639	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	640	\| 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	641	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	642	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	643	o changeset: 2:337fec4d2edc
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	644	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	645	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	646	\| 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	647	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	648	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	649	\| x changeset: 1:de7290d8b885
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	650	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	651	\| date: Thu Jan 01 00:00:00 1970 +0000
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	652	\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	653	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	654	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	655	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	656	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	657	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	658	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	659
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	660	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	661	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	662
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	663	$ 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	664	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	665	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	666	(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	667
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	668	$ 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	669	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	670	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	671	\| 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	672	\|/
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	\| @ 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	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 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	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	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	678	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	679	(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	680
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	681	$ 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	682	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	683	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	684	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	685	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	686	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	687	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	688	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	689	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	690	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	691	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	692	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	693	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	694	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	695	"1ae8bc733a14",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	696	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	697	"c7f044602e9b",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	698	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	699	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	700	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	701	"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	702	}
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	"node": "de7290d8b885",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	705	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	706	"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	707	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	708	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	709	$ 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	710	@ 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	711	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	712	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	713	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	714	(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	715
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	716	$ 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	717	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	718	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	719	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	720	"node": "c7f044602e9b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	721	"rev": 5,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	722	"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	723	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	724	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	725	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	726	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	727	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	728	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	729	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	730	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	731	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	732	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	733	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	734	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	735	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	736	"1ae8bc733a14",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	737	"337fec4d2edc",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	738	"c7f044602e9b",
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	739	"f257fde29c7a"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	740	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	741	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	742	"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	743	}
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	"node": "de7290d8b885",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	746	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	747	"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	748	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	749	]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	750	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	751	$ 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	752	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	753	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	754	\| 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	755	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	756	\| @ 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	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 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	759	\|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	760	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	761	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	762	(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	763
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	764	$ 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	765	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	766	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	767	\| 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	768	\|/
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	\| @ 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	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 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	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	x de7290d8b885 (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	774	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	775	(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	776
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	777	$ hg update de7290d8b885
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	778	abort: hidden revision 'de7290d8b885'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	779	(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	780	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	781	$ hg update --hidden 'min(desc(A0))'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	782	updating to a hidden changeset de7290d8b885
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	783	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	784	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	785	(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	786
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	787	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	788	==============================
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 setup
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	$ 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	794	$ cd $TESTTMP/local-fold
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	795	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	796	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	797	$ mkcommit B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	798	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	799	@ changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	800	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	801	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	802	\| 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	803	\| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	804	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	805	o changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	806	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	807	\| 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	808	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	809	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	810	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	811	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	812	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	813	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	814
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	815	$ 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	816	2 changesets folded
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	817	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	818	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	819	@ changeset: 3:eb5a0daa2192
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	820	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	821	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	822	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	823	\| 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	824	\| summary: C0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	825	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	826	\| x changeset: 2:0dec01379d3b
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	827	\| \| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	828	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	829	\| \| obsolete: rewritten as 3:eb5a0daa2192
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	830	\| \| summary: B0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	831	\| \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	832	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	833	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	834	\| date: Thu Jan 01 00:00:00 1970 +0000
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	835	\| obsolete: rewritten as 3:eb5a0daa2192
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	836	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	837	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	838	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	839	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	840	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	841	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	842
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	843	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	844	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	845
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	846	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	847	the revision with the target
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	848	$ 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	849	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	850	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	851	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	852	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	853	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	854	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	855	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	856	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	857
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	858	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	859	--- /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	860	+++ 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	861	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	862	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	863
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	864
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	865	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	866	$ 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	867	@ 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	868	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	869	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	870	/ 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	871	\| (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	872	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	873	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	874	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	875	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	876	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	877	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	878	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	879	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	880	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	881
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	882	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	883	--- /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	884	+++ 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	885	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	886	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	887
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	888
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	889	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	890	the revision with the target
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	891	$ 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	892	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	893	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	894	(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	895
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	896	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	897	$ 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	898	@ 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	899	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	900	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	901	/ 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	902	\| (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	903	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	904	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	905	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	906	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	907	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	908	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	909	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	910	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	911	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	912
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	913	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	914	--- /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	915	+++ 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	916	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	917	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	918
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	919
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	920	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	921	graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	922	$ 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	923	@ 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	924	\|\
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	925	x \| 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	926	/ 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	927	\| (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	928	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	929	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	930	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	931	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	932	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	933	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	934	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	935	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	936	+C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	937
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	938	diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	939	--- /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	940	+++ 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	941	@@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	942	+B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	943
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	944
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	945	$ 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	946	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	947	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	948	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	949	"node": "eb5a0daa2192",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	950	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	951	"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	952	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	953	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	954	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	955	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	956	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	957	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	958	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	959	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	960	"effect": [
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	961	"description",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	962	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	963	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	964	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	965	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	966	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	967	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	968	"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	969	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	970	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	971	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	972	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	973	"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	974	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	975	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	976	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	977	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	978	"date": [
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	979	*, (glob)
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	980	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	981	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	982	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	983	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	984	"parent",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	985	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	986	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	987	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	988	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	989	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	990	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	991	"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	992	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	993	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	994	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	995	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	996	"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	997	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	998	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	999	$ hg update 471f378eab4c
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1000	abort: hidden revision '471f378eab4c'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1001	(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	1002	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1003	$ hg update --hidden 'desc(A0)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1004	updating to a hidden changeset 471f378eab4c
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1005	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	1006	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	1007	(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	1008	$ hg update 0dec01379d3b
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1009	abort: hidden revision '0dec01379d3b'!
a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	1010	(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	1011	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1012	$ hg update --hidden 'desc(B0)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1013	updating to a hidden changeset 0dec01379d3b
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1014	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	1015	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	1016	(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	1017
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1018	Test output with divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1019	===========================
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	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1022	----------
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	$ 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	1025	$ cd $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1026	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1027	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1028	$ hg amend -m "A1"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1029	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1030	@ changeset: 2:fdf9bde5129a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1031	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1032	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1033	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1034	\| 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	1035	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1036	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1037	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1038	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1039	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1040	\| obsolete: reworded using amend as 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1041	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1042	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1043	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1044	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1045	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	1046	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1047
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1048	$ hg update --hidden 'desc(A0)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1049	updating to a hidden changeset 471f378eab4c
2289 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"
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1054	2 new content-divergent changesets
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	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
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1061	\| instability: content-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	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1064	\| * 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
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1068	\| instability: content-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
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1074	\| obsolete: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1075	\| obsolete: reworded using amend as 3:65b757b745b9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	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	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1111	\| * 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
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1172	* 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	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1197	\| * 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	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1244	\| * 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	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1269	\| * 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)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1344	updating to a hidden changeset 471f378eab4c
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1345	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	1346	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	1347	(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	1348
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1349	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	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
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1352	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	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
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1355	$ 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	1356	$ 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	1357	$ 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	1358	$ 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	1359	$ 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	1360	$ 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	1361	$ 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	1362	@ 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	1363	\| 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	1364	\| 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	1365	\| 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	1366	\| 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	1367	\| 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	1368	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1369	\| 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	1370	\|/ 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	1371	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1372	\| obsolete: reworded using amend as 3: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	1373	\| 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	1374	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1375	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	1376	\| 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	1377	\| 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	1378	\| 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	1379	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1380	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	1381	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	1382	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	1383	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	1384
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1385	$ 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	1386	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	1387	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	1388	$ 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	1389	@ 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	1390	\| 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	1391	\| 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	1392	\| 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	1393	\| 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	1394	\| 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	1395	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1396	\| 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	1397	\| \| 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	1398	\| \| 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	1399	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	1400	\| \| obsolete: rewritten as 4: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	1401	\| \| 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	1402	\| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1403	\| \| 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	1404	\| \|/ 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	1405	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1406	\| \| obsolete: reworded using amend as 3: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	1407	\| \| 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	1408	\| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1409	\| 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	1410	\|/ 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	1411	\| date: Thu Jan 01 00:00:00 1970 +0000
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3075 diff changeset	1412	\| obsolete: rewritten as 4: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	1413	\| 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	1414	\|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1415	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	1416	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	1417	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	1418	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	1419
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1420	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	1421	-----------
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1422
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1423	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	1424	$ 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	1425	@ 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	1426	\|\
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1427	x \| 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1428	/ 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	1429	\| 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	1430	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1431	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1432	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1433	\| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1434	\| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1435	\|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1436	\| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1437	\| --- /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	1438	\| +++ 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	1439	\| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1440	\| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1441	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1442	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1443	x b7ea6d14e664 (3) B1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1444	\| 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	1445	\| (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	1446	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1447	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1448	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	1449	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	1450	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1451	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1452	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1453	-B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1454	+B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1455
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1456
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	1457	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	1458	$ 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	1459	@ 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	1460	\|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1461	x \| 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1462	/ 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	1463	\| 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	1464	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1465	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1466	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1467	\| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1468	\| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1469	\|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1470	\| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1471	\| --- /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	1472	\| +++ 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	1473	\| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1474	\| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1475	\|
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	1476	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1477	x b7ea6d14e664 (3) B1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1478	\| 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	1479	\| (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	1480	\|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	1481	x 0dec01379d3b (2) B0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1482	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	1483	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	1484	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1485	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1486	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1487	-B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1488	+B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1489
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	1490
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	1491	$ 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	1492	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1493	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1494	"markers": [],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1495	"node": "eb5a0daa2192",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1496	"rev": 4,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1497	"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	1498	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1499	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1500	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1501	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1502	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1503	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1504	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1505	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1506	"effect": [
2585 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	*, (glob)
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1509	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1510	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1511	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1512	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1513	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1514	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1515	"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	1516	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1517	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1518	"node": "b7ea6d14e664",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1519	"rev": 3,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1520	"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	1521	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1522	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1523	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1524	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1525	"date": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1526	*, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1527	0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1528	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1529	"effect": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1530	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1531	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1532	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1533	"b7ea6d14e664"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1534	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1535	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1536	"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	1537	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1538	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1539	"node": "0dec01379d3b",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1540	"rev": 2,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1541	"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	1542	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1543	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1544	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1545	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1546	"date": [
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1547	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1548	0 (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1549	],
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1550	"effect": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1551	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1552	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	1553	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1554	"succnodes": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1555	"eb5a0daa2192"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1556	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1557	"user": "test",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1558	"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	1559	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1560	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1561	"node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1562	"rev": 1,
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	1563	"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	1564	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	1565	]
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1566	$ 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	1567	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	1568	(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	1569	[255]
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1570	$ hg update --hidden 'desc(A0)'
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1571	updating to a hidden changeset 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	1572	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	1573	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	1574	(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	1575	$ hg update --hidden 0dec01379d3b
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	1576	updating to a hidden changeset 0dec01379d3b
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	1577	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	1578	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	1579	(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	1580	$ 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	1581	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	1582	$ 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	1583	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	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 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	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	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	1589	----------
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1590
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1591	$ 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	1592	$ 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	1593	$ 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	1594	$ 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	1595	$ 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	1596	@ 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	1597	\| 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	1598	\| 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	1599	\| 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	1600	\| 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	1601	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1602	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	1603	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	1604	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	1605	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	1606
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1607	$ 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	1608	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	1609	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	1610	$ 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	1611	$ 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	1612	@ 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	1613	\| 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	1614	\| 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	1615	\| 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	1616	\| 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	1617	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1618	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	1619	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	1620	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	1621	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	1622
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1623	$ 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	1624	$ 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	1625	$ 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	1626	$ 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	1627	@ 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	1628	\| 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	1629	\| 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	1630	\| 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	1631	\| 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	1632	\| 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	1633	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1634	\| 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	1635	\|/ 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	1636	\| 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	1637	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1638	\| obsolete: reworded using amend as 3: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	1639	\| 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	1640	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1641	\| 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	1642	\|/ 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	1643	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1644	\| obsolete: reworded using amend as 2: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	1645	\| 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	1646	\|
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1647	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	1648	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	1649	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	1650	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	1651
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1652	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	1653	-----------
521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1654
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1655	$ 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	1656	@ 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	1657	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1658	x fdf9bde5129a (2) A1
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1659	\| 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	1660	\| 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	1661	\| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1662	\| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1663	\| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1664	\| -A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1665	\| +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1666	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1667	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1668	x 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1669	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	1670	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	1671	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	1672	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1673	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1674	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1675	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	1676
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1677
2349 521a18a10a06 obshistory: display a message when one marker node has no change ctx Boris Feld <boris.feld@octobus.net> parents: 2342 diff changeset	1678	$ 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	1679	$ 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	1680	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	1681	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	1682	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	1683	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	1684	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	1685	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	1686	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	1687	obsoleted 1 changesets
3075 8feb2cae7eae test: adapt to output change from eb586ed5d8ce Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3055 diff changeset	1688	new changesets 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	1689	(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	1690	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	1691	(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	1692	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	1693	changectx
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1694	$ 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	1695	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	1696	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1697	x fdf9bde5129a
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1698	\| 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	1699	\| (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	1700	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1701	@ 471f378eab4c (1) A0
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	1702	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	1703	(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	1704
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	1705	$ 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	1706	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	1707	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1708	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	1709	\| [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	1710	\| (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	1711	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	1712	@ [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	1713	[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	1714	(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	1715

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 16 Jan 2018 04:53:09 +0100
changeset 3423	e21b4f3b32c1
parent 3417	d3a17c67f85c
child 3432	f57be161f34b
permissions	-rw-r--r--