evolve: tests/test-evolve-obshistory-fold.t@4baf81dd2193 (annotated)

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

author	Anton Shestakov <av6@dwimlabs.net>
	Wed, 13 Feb 2019 19:18:17 +0800
changeset 4401	4baf81dd2193
parent 3897	83e8803e1cf1
child 3909	f7afd3a158e3
child 4918	f16274729530
permissions	-rw-r--r--