evolve: tests/test-evolve-obshistory-amend.t@a4d081923c81 (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
3729 1b1badb3d2fc obshistory: make obslog work when a commit doesn't have any description Anton Shestakov <av6@dwimlabs.net> parents: 3663 diff changeset	9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	10	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	11	=============================
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	12
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	Test setup
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
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	16	$ hg init $TESTTMP/local-amend
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	17	$ 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	18	$ cd $TESTTMP/local-amend
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	19	$ mkcommit ROOT
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	20	$ sync
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	21	$ mkcommit A0 .
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	$ 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	23	$ 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	24	>
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	25	> Better commit message"
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	26	$ sync
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	$ hg log --hidden -G
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	28	@ changeset: 2:4ae3a4151de9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	\| 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	33	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	34	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	\| 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	38	\| 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	39	\| summary: A0
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	o changeset: 0:ea207398892e
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
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	44	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	45
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	46	Check output on the client side
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	47	-------------------------------
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	48	$ hg obslog --patch 4ae3a4151de9
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	49	@ 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	50	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	51	x 471f378eab4c (1) A0
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	52	rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	53	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	54	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	55	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	56	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	57	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	58	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	59	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	60	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	61
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	62	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	63	--- 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	64	+++ 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	65	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	66	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	67	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	68
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	69
3398 d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	70	$ hg obslog --patch --color debug
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	71	@ [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	72	\|
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	73	x [evolve.node\|471f378eab4c] [evolve.rev\|(1)] [evolve.short_description\|A0]
3519 2823c82ad8a4 obslog: add the operation to the Obslog output Boris Feld <boris.feld@octobus.net> parents: 3432 diff changeset	74	[evolve.verb\|rewritten](description, content) as [evolve.node\|4ae3a4151de9] using [evolve.operation\|amend] 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	75	[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	76	[diff.file_a\|--- a/changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	77	[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	78	[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	79	[diff.deleted\|-A0]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	80	[diff.inserted\|+A1]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	81	[diff.inserted\|+]
4adf46158b9b obslog: colorize the description diff shown in obslog -p Pulkit Goyal <7895pulkit@gmail.com> parents: 3398 diff changeset	82	[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	83
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	84	[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	85	[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	86	[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	87	[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	88	A0
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	89	[diff.inserted\|+42]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	90
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p` Pulkit Goyal <7895pulkit@gmail.com> parents: 3375 diff changeset	91
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	92
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	93	$ 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	94	4ae3a4151de9 (2) A1
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	95
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	96	471f378eab4c (1) A0
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	97	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	98	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	99	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	100	+++ b/changeset-description
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	101	@@ -1,1 +1,3 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	102	-A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	103	+A1
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	104	+
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	105	+Better commit message
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	106
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	107	diff -r 471f378eab4c -r 4ae3a4151de9 A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	108	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	109	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	110	@@ -1,1 +1,2 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	111	A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	112	+42
4952 b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	113
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	114
2954 54f7b8fcdf3b obslog: fix --patch with --no-graph options Alain Leufroy parents: 2929 diff changeset	115
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	116	Test that content diff works with templating
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	117	$ hg obslog --color=debug --patch 4ae3a4151de9 \
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4964 diff changeset	118	> -T '{node\|short} {desc\|firstline}\n{markers % "patch:\n```{patch}```\n"}'
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	119	@ 4ae3a4151de9 A1
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	120	\|
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	121	x 471f378eab4c A0
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	122	patch:
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	123	```
4952 b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	124	[diff.diffline\|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	125	[diff.file_a\|--- a/A0 Thu Jan 01 00:00:00 1970 +0000]
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	126	[diff.file_b\|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000]
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	127	[diff.hunk\|@@ -1,1 +1,2 @@]
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	128	A0
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	129	[diff.inserted\|+42]
b135591bec1a obslog: make {patch} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	130	```
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	131
4917 d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	132	$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc\|firstline)} {if(markers, join(markers % "at {date\|hgdate} by {user\|person} ", " also "))}'
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	133	@ A1
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	134	\|
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	135	x A0 at 0 0 by test
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	136
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	137
d1d8e97d32af obslog: make changeset available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4823 diff changeset	138	Check that the same thing works with the old {shortdescription} form
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	139	$ 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	140	@ A1
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	141	\|
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	142	x A0 at 0 0 by test
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	143
2441 80b5fc054219 evolve: adding longer aliases for olog Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 2420 diff changeset	144	$ 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	145	[
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	"markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4964 diff changeset	148	"node": "4ae3a4151de9aa872113f0b196e28323308981e8",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	149	"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	150	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	151	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	152	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	153	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	154	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	155	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	156	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	157	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	158	]
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	159	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	160	"effects": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	161	"description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	162	"content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	163	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	164	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	165	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	166	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	167	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4948 diff changeset	168	"4ae3a4151de9aa872113f0b196e28323308981e8"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	169	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	170	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	171	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	172	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	173	"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	174	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	175	],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4964 diff changeset	176	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	177	"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	178	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	179	]
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	180	$ 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	181	x 471f378eab4c (1) A0
3559 d166b3dc5e8a tests: do not glob out fixed dates Martin von Zweigbergk <martinvonz@google.com> parents: 3519 diff changeset	182	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	183	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	184	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	185	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	186	@@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	187	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	188	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	189	+
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	190	+Better commit message
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	191
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	192	diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	193	--- 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	194	+++ 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	195	@@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	196	A0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	197	+42
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	198
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	199
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	200	$ 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	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	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	205	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	206	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	207	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	208	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	209	]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	210	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	211	"effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	212	*, (glob)
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	213	"content"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	214	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	215	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	216	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	217	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	218	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4948 diff changeset	219	"4ae3a4151de9aa872113f0b196e28323308981e8"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	220	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	221	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	222	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5167 diff changeset	223	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	224	"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	225	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	226	],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4964 diff changeset	227	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	228	"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	229	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	230	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	231	$ hg update 471f378eab4c
3663 54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	232	abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	233	(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	234	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	235	$ hg update --hidden "desc(A0)"
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	236	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	237	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	238	(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	239	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	240	(use 'hg evolve' to update to its successor: 4ae3a4151de9)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	241
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	242	Check output on the server side
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	243	-------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	244
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	245	$ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	246	o 4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	247	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	248	x 471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	249	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	250	(No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	251
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	252	$ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	253	o 4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	254
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	255	$ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	256	4ae3a4151de9 (1) A1
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	257
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	258	471f378eab4c
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	259	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	260	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	261
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	262
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	263	$ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	264	4ae3a4151de9 (1) A1
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	265
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	266	471f378eab4c
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	267	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	268	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	269
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	270
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	271	Amend two more times
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	272	====================
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	273
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	274	Amend again
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	275	-----------
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	276	$ hg log --hidden -G
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	277	o changeset: 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	278	\| tag: tip
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	279	\| parent: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	280	\| user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	281	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	282	\| summary: A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	283	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	284	\| @ changeset: 1:471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	285	\|/ user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	286	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	287	\| obsolete: rewritten using amend as 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	288	\| summary: A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	289	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	290	o changeset: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	291	user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	292	date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	293	summary: ROOT
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	294
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	295	$ hg up tip
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	296	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	297	$ hg amend -m "A2
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	298	>
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	299	> Better better commit message"
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	300	$ hg amend --config devel.default-date='1 0' -m "A3
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	301	>
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	302	> Better better better commit message"
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	303	$ sync
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	304	$ hg log --hidden -G
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	305	@ changeset: 4:92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	306	\| tag: tip
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	307	\| parent: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	308	\| user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	309	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	310	\| summary: A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	311	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	312	\| x changeset: 3:4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	313	\|/ parent: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	314	\| user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	315	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	316	\| obsolete: reworded using amend as 4:92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	317	\| summary: A2
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	318	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	319	\| x changeset: 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	320	\|/ parent: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	321	\| user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	322	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	323	\| obsolete: reworded using amend as 3:4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	324	\| summary: A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	325	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	326	\| x changeset: 1:471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	327	\|/ user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	328	\| date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	329	\| obsolete: rewritten using amend as 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	330	\| summary: A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	331	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	332	o changeset: 0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	333	user: test
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	334	date: Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	335	summary: ROOT
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	336
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	337	Check the output on the client
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	338	------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	339
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	340	$ hg obslog --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	341	@ 92210308515b (4) A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	342	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	343	x 4f1685185907 (3) A2
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	344	\| reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	345	\| diff -r 4f1685185907 -r 92210308515b changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	346	\| --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	347	\| +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	348	\| @@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	349	\| -A2
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	350	\| +A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	351	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	352	\| -Better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	353	\| +Better better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	354	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	355	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	356	x 4ae3a4151de9 (2) A1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 4983 diff changeset	357	\| reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	358	\| diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	359	\| --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	360	\| +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	361	\| @@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	362	\| -A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	363	\| +A2
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	364	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	365	\| -Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	366	\| +Better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	367	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	368	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	369	x 471f378eab4c (1) A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	370	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	371	diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	372	--- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	373	+++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	374	@@ -1,1 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	375	-A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	376	+A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	377	+
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	378	+Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	379
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	380	diff -r 471f378eab4c -r 4ae3a4151de9 A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	381	--- a/A0 Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	382	+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	383	@@ -1,1 +1,2 @@
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	384	A0
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	385	+42
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	386
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	387
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	388	Test that description diff works with templating
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	389	$ hg obslog --color=debug --patch 92210308515b \
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4964 diff changeset	390	> -T '{node\|short} {desc\|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}'
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	391	@ 92210308515b A3
f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	392	\|
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	393	x 4f1685185907 A2
4945 bd50608f54d8 obslog: rename {desc-diff} to {descdiff} since the former is invalid Martin von Zweigbergk <martinvonz@google.com> parents: 4944 diff changeset	394	\| description diff:
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	395	\| ```
4953 5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	396	\| [diff.diffline\|diff -r 4f1685185907 -r 92210308515b changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	397	\| [diff.file_a\|--- a/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	398	\| [diff.file_b\|+++ b/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	399	\| [diff.hunk\|@@ -1,3 +1,3 @@]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	400	\| [diff.deleted\|-A2]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	401	\| [diff.inserted\|+A3]
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	402	\|
4953 5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	403	\| [diff.deleted\|-Better better commit message]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	404	\| [diff.inserted\|+Better better better commit message]
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	405	\| ```
4945 bd50608f54d8 obslog: rename {desc-diff} to {descdiff} since the former is invalid Martin von Zweigbergk <martinvonz@google.com> parents: 4944 diff changeset	406	x 4ae3a4151de9 A1
bd50608f54d8 obslog: rename {desc-diff} to {descdiff} since the former is invalid Martin von Zweigbergk <martinvonz@google.com> parents: 4944 diff changeset	407	\| description diff:
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	408	\| ```
4953 5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	409	\| [diff.diffline\|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	410	\| [diff.file_a\|--- a/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	411	\| [diff.file_b\|+++ b/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	412	\| [diff.hunk\|@@ -1,3 +1,3 @@]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	413	\| [diff.deleted\|-A1]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	414	\| [diff.inserted\|+A2]
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	415	\|
4953 5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	416	\| [diff.deleted\|-Better commit message]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	417	\| [diff.inserted\|+Better better commit message]
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	418	\| ```
bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	419	x 471f378eab4c A0
4945 bd50608f54d8 obslog: rename {desc-diff} to {descdiff} since the former is invalid Martin von Zweigbergk <martinvonz@google.com> parents: 4944 diff changeset	420	description diff:
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	421	```
4953 5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	422	[diff.diffline\|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	423	[diff.file_a\|--- a/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	424	[diff.file_b\|+++ b/changeset-description]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	425	[diff.hunk\|@@ -1,1 +1,3 @@]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	426	[diff.deleted\|-A0]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	427	[diff.inserted\|+A1]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	428	[diff.inserted\|+]
5c41bb482867 obslog: make {descdiff} not be indented and leave that to the template Martin von Zweigbergk <martinvonz@google.com> parents: 4952 diff changeset	429	[diff.inserted\|+Better commit message]
4946 bd992b1d4426 obslog: make content and description patches available to templater Martin von Zweigbergk <martinvonz@google.com> parents: 4945 diff changeset	430	```
4944 f84a6ddb7f37 tests: demonstrate broken {patch} and {desc-diff} template keywords Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	431
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	432	Check the output on the server
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	433	------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	434
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	435	$ hg obslog -R $TESTTMP/server --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	436	o 92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	437	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	438	x 4f1685185907
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	439	\| reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	440	\| (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	441	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	442	x 4ae3a4151de9 (1) A1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 4983 diff changeset	443	\| reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	444	\| (No patch available, successor is unknown locally)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	445	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	446	x 471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	447	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	448	(No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	449
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	450	$ hg obslog -R $TESTTMP/server -f --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	451	o 92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	452	\|
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	453	x 4ae3a4151de9 (1) A1
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	454	reworded(description) as 92210308515b using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	455	diff -r 4ae3a4151de9 -r 92210308515b changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	456	--- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	457	+++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	458	@@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	459	-A1
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	460	+A3
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	461
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	462	-Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	463	+Better better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	464
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	465
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	466	$ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	467	92210308515b (2) A3
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	468
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	469	4f1685185907
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	470	reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	471	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	472
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	473	4ae3a4151de9 (1) A1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 4983 diff changeset	474	reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	475	(No patch available, successor is unknown locally)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	476
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	477	471f378eab4c
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	478	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	479	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	480
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	481
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	482	$ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	483	92210308515b (2) A3
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	484
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	485	4f1685185907
5167 471b7a4acf9b obslog: have at least one test that shows multiple dates with -f flag Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	486	reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	487	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	488
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	489	4ae3a4151de9 (1) A1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 4983 diff changeset	490	reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	491	(No patch available, successor is unknown locally)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	492
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	493	471f378eab4c
4964 bb2042ff6444 tests: remove extra whitespace before patch in obslog output Martin von Zweigbergk <martinvonz@google.com> parents: 4955 diff changeset	494	rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3894 7c624b45fe60 obslog: check filtered output with amended changesets Boris Feld <boris.feld@octobus.net> parents: 3886 diff changeset	495	(No patch available, context is not local)
4948 069cfc5301fb obslog: add newline after all markers in non-graphlog to match graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 4946 diff changeset	496

author	Anton Shestakov <av6@dwimlabs.net>
	Tue, 10 Mar 2020 19:05:08 +0700
changeset 5193	a4d081923c81
parent 5171	7f7f40cc6c9b
child 5308	0329246c70f3
permissions	-rw-r--r--