evolve: tests/test-evolve-obshistory-amend.t@cb5983c0287f (annotated)

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

author	Anton Shestakov <av6@dwimlabs.net>
	Fri, 08 May 2020 22:18:15 +0800
branch	mercurial-4.7
changeset 5367	cb5983c0287f
parent 5362	72340abfcece
child 5368	844b1ad5b34b
permissions	-rw-r--r--