mercurial: tests/test-log.t@89b5c2ae1980 (annotated)

18991 c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	1	Log on empty repository: checking consistency
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	2
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	3	$ hg init empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	4	$ cd empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	5	$ hg log
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	6	$ hg log -r 1
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	7	abort: unknown revision '1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	8	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	9	$ hg log -r -1:0
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	10	abort: unknown revision '-1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	11	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	12	$ hg log -r 'branch(name)'
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	13	abort: unknown revision 'name'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	14	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	15	$ hg log -r null -q
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	16	-1:000000000000
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	17
34455 5c122b410706 tests: change to parent directory before all "hg init" in test-log.t Denis Laxalde <denis.laxalde@logilab.fr> parents: 34085 diff changeset	18	$ cd ..
5c122b410706 tests: change to parent directory before all "hg init" in test-log.t Denis Laxalde <denis.laxalde@logilab.fr> parents: 34085 diff changeset	19
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	20	The g is crafted to have 2 filelog topological heads in a linear
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	21	changeset graph
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	22
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	23	$ hg init a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	24	$ cd a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	25	$ echo a > a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	26	$ echo f > f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	27	$ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	28	adding a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	29	adding f
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	30
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	31	$ hg cp a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	32	$ hg cp f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	33	$ hg ci -mb -d '2 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	34
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	35	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	36	$ hg mv b dir
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	37	$ echo g >> g
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	38	$ echo f >> f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	39	$ hg ci -mc -d '3 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	40
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	41	$ hg mv a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	42	$ hg cp -f f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	43	$ echo a > d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	44	$ hg add d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	45	$ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	46
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	47	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	48	$ hg ci -me -d '5 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	49
23976 344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	50	Make sure largefiles doesn't interfere with logging a regular file
24207 d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	51	$ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
33212 fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32308 diff changeset	52	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
32308 e8569cc131d1 py3: explicitly convert a list to bytes to pass in ui.debug Pulkit Goyal <7895pulkit@gmail.com> parents: 31765 diff changeset	53	updated patterns: .hglf/a, a
24207 d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	54	0: a
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	55	$ hg log a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	56	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	57	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	58	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	59	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	60
24206 13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	61	$ hg log glob:a*
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	62	changeset: 3:2ca5ba701980
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	63	user: test
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	64	date: Thu Jan 01 00:00:04 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	65	summary: d
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	66
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	67	changeset: 0:9161b9aeaf16
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	68	user: test
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	69	date: Thu Jan 01 00:00:01 1970 +0000
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	70	summary: a
13c1e66f9653 largefiles: teach log to handle patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24189 diff changeset	71
24207 d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	72	$ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
33212 fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32308 diff changeset	73	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
32308 e8569cc131d1 py3: explicitly convert a list to bytes to pass in ui.debug Pulkit Goyal <7895pulkit@gmail.com> parents: 31765 diff changeset	74	updated patterns: glob:.hglf/a, glob:a
24207 d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	75	3: d
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	76	0: a
d90e3faf96a9 largefiles: don't prefix standin patterns with '.hglf' when logging Matt Harbison <matt_harbison@yahoo.com> parents: 24206 diff changeset	77
18340 8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	78	log on directory
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	79
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	80	$ hg log dir
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	81	changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	82	tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	83	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	84	date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	85	summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	86
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	87	changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	88	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	89	date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	90	summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	91
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	92	$ hg log somethingthatdoesntexist dir
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	93	changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	94	tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	95	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	96	date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	97	summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	98
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	99	changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	100	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	101	date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	102	summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	103
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	104
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	105	-f, non-existent directory
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	106
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	107	$ hg log -f dir
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	108	abort: cannot follow file not in parent revision: "dir"
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	109	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	110
21998 739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	111	-f, directory
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	112
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	113	$ hg up -q 3
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	114	$ hg log -f dir
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	115	changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	116	user: test
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	117	date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	118	summary: c
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	119
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	120	-f, directory with --patch
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	121
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	122	$ hg log -f dir -p
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	123	changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	124	user: test
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	125	date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	126	summary: c
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	127
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	128	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	129	--- /dev/null* (glob)
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	130	+++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	131	@@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	132	+a
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	133
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	134
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	135	-f, pattern
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	136
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	137	$ hg log -f -I 'dir**' -p
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	138	changeset: 2:f8954cd4dc1f
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	139	user: test
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	140	date: Thu Jan 01 00:00:03 1970 +0000
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	141	summary: c
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	142
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	143	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	144	--- /dev/null* (glob)
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	145	+++ b/dir/b* (glob)
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	146	@@ -0,0 +1,1 @@
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	147	+a
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	148
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	149	$ hg up -q 4
739095270f48 log: allow patterns with -f Durham Goode <durham@fb.com> parents: 21966 diff changeset	150
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	151	-f, a wrong style
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	152
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	153	$ hg log -f -l1 --style something
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	154	abort: style 'something' not found
31765 264baeef3588 show: new extension for displaying various repository data Gregory Szorc <gregory.szorc@gmail.com> parents: 30044 diff changeset	155	(available styles: bisect, changelog, compact, default, phases, show, status, xml)
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	156	[255]
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	157
19126 5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	158	-f, phases style
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	159
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	160
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	161	$ hg log -f -l1 --style phases
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	162	changeset: 4:7e4639b4691b
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	163	tag: tip
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	164	phase: draft
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	165	user: test
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	166	date: Thu Jan 01 00:00:05 1970 +0000
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	167	summary: e
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	168
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	169
24493 e810c7da1cae templates: fix "log -q" output of phases style Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	170	$ hg log -f -l1 --style phases -q
e810c7da1cae templates: fix "log -q" output of phases style Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	171	4:7e4639b4691b
e810c7da1cae templates: fix "log -q" output of phases style Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	172
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	173	-f, but no args
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	174
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	175	$ hg log -f
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	176	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	177	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	178	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	179	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	180	summary: e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	181
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	182	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	183	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	184	date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	185	summary: d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	186
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	187	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	188	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	189	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	190	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	191
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	192	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	193	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	194	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	195	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	196
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	197	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	198	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	199	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	200	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	201
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	202
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	203	one rename
11562 efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647) Joel Rosdahl <joel@rosdahl.net> parents: 11509 diff changeset	204
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	205	$ hg up -q 2
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	206	$ hg log -vf a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	207	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	208	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	209	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	210	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	211	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	212	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	213
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	214
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2901 diff changeset	215
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	216	many renames
10776 08870cf7d388 Fix default style so 'log --copies' has a start and an end. Greg Ward <greg-hg@gerg.ca> parents: 10061 diff changeset	217
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	218	$ hg up -q tip
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	219	$ hg log -vf e
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	220	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	221	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	222	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	223	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	224	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	225	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	226	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	227
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	228
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	229	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	230	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	231	date: Thu Jan 01 00:00:03 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	232	files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	233	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	234	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	235
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	236
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	237	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	238	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	239	date: Thu Jan 01 00:00:02 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	240	files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	241	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	242	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	243
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	244
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	245	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	246	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	247	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	248	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	249	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	250	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	251
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	252
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	253
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	254
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	255	log -pf dir/b
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	256
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	257	$ hg up -q 3
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	258	$ hg log -pf dir/b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	259	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	260	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	261	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	262	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	263
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	264	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	265	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	266	+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	267	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	268	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	269
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	270	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	271	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	272	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	273	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	274
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	275	diff -r 9161b9aeaf16 -r d89b0a12d229 b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	276	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	277	+++ b/b Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	278	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	279	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	280
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	281	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	282	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	283	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	284	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	285
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	286	diff -r 000000000000 -r 9161b9aeaf16 a
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	287	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	288	+++ b/a Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	289	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	290	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	291
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	292
21876 584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	293	log -pf b inside dir
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	294
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	295	$ hg --cwd=dir log -pf b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	296	changeset: 2:f8954cd4dc1f
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	297	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	298	date: Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	299	summary: c
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	300
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	301	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	302	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	303	+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	304	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	305	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	306
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	307	changeset: 1:d89b0a12d229
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	308	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	309	date: Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	310	summary: b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	311
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	312	diff -r 9161b9aeaf16 -r d89b0a12d229 b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	313	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	314	+++ b/b Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	315	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	316	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	317
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	318	changeset: 0:9161b9aeaf16
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	319	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	320	date: Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	321	summary: a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	322
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	323	diff -r 000000000000 -r 9161b9aeaf16 a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	324	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	325	+++ b/a Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	326	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	327	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	328
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	329
21966 be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	330	log -pf, but no args
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	331
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	332	$ hg log -pf
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	333	changeset: 3:2ca5ba701980
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	334	user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	335	date: Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	336	summary: d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	337
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	338	diff -r f8954cd4dc1f -r 2ca5ba701980 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	339	--- a/a Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	340	+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	341	@@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	342	-a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	343	diff -r f8954cd4dc1f -r 2ca5ba701980 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	344	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	345	+++ b/b Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	346	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	347	+a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	348	diff -r f8954cd4dc1f -r 2ca5ba701980 d
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	349	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	350	+++ b/d Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	351	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	352	+a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	353	diff -r f8954cd4dc1f -r 2ca5ba701980 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	354	--- a/g Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	355	+++ b/g Thu Jan 01 00:00:04 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	356	@@ -1,2 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	357	f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	358	-g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	359	+f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	360
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	361	changeset: 2:f8954cd4dc1f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	362	user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	363	date: Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	364	summary: c
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	365
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	366	diff -r d89b0a12d229 -r f8954cd4dc1f b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	367	--- a/b Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	368	+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	369	@@ -1,1 +0,0 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	370	-a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	371	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	372	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	373	+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	374	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	375	+a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	376	diff -r d89b0a12d229 -r f8954cd4dc1f f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	377	--- a/f Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	378	+++ b/f Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	379	@@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	380	f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	381	+f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	382	diff -r d89b0a12d229 -r f8954cd4dc1f g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	383	--- a/g Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	384	+++ b/g Thu Jan 01 00:00:03 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	385	@@ -1,1 +1,2 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	386	f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	387	+g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	388
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	389	changeset: 1:d89b0a12d229
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	390	user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	391	date: Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	392	summary: b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	393
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	394	diff -r 9161b9aeaf16 -r d89b0a12d229 b
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	395	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	396	+++ b/b Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	397	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	398	+a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	399	diff -r 9161b9aeaf16 -r d89b0a12d229 g
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	400	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	401	+++ b/g Thu Jan 01 00:00:02 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	402	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	403	+f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	404
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	405	changeset: 0:9161b9aeaf16
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	406	user: test
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	407	date: Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	408	summary: a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	409
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	410	diff -r 000000000000 -r 9161b9aeaf16 a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	411	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	412	+++ b/a Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	413	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	414	+a
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	415	diff -r 000000000000 -r 9161b9aeaf16 f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	416	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	417	+++ b/f Thu Jan 01 00:00:01 1970 +0000
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	418	@@ -0,0 +1,1 @@
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	419	+f
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	420
be94ed4baa5d log: do not use exact matcher for --patch --follow without file (issue4319) Yuya Nishihara <yuya@tcha.org> parents: 21947 diff changeset	421
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	422	log -vf dir/b
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	423
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	424	$ hg log -vf dir/b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	425	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	426	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	427	date: Thu Jan 01 00:00:03 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	428	files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	429	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	430	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	431
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	432
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	433	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	434	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	435	date: Thu Jan 01 00:00:02 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	436	files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	437	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	438	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	439
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	440
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	441	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	442	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	443	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	444	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	445	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	446	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	447
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	448
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	449
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	450
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	451	-f and multiple filelog heads
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	452
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	453	$ hg up -q 2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	454	$ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	455	2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	456	1
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	457	0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	458	$ hg up -q tip
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	459	$ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	460	3
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	461	2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	462	0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	463
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	464
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	465	log copies with --copies
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	466
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	467	$ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	468	4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	469	3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	470	2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	471	1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	472	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	473
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	474	log copies switch without --copies, with old filecopy template
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	475
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	476	$ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	477	4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	478	3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	479	2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	480	1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	481	0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	482
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	483	log copies switch with --copies
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	484
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	485	$ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	486	4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	487	3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	488	2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	489	1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	490	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	491
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	492
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	493	log copies with hardcoded style and with --style=default
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	494
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	495	$ hg log -vC -r4
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	496	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	497	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	498	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	499	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	500	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	501	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	502	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	503	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	504
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	505
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	506	$ hg log -vC -r4 --style=default
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	507	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	508	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	509	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	510	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	511	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	512	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	513	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	514	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	515
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	516
24013 942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	517	$ hg log -vC -r4 -Tjson
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	518	[
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	519	{
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	520	"rev": 4,
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	521	"node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	522	"branch": "default",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	523	"phase": "draft",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	524	"user": "test",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	525	"date": [5, 0],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	526	"desc": "e",
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	527	"bookmarks": [],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	528	"tags": ["tip"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	529	"parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	530	"files": ["dir/b", "e"],
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	531	"copies": {"e": "dir/b"}
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	532	}
942a5a34b2d0 log: fix json-formatted output when file copies are listed (issue4523) Augie Fackler <augie@google.com> parents: 23976 diff changeset	533	]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	534
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	535	log copies, non-linear manifest
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7062 diff changeset	536
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	537	$ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	538	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	539	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	540	$ echo foo > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	541	$ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	542	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	543	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	544	$ hg log -v --template '{rev} {file_copies}\n' -r 5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	545	5 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	546
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	547
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	548	log copies, execute bit set
9373 b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8020 diff changeset	549
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	550	#if execbit
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	551	$ chmod +x e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	552	$ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	553	$ hg log -v --template '{rev} {file_copies}\n' -r 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	554	6
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	555	#endif
9421 c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805) Christian Ebert <blacktrash@gmx.net> parents: 9373 diff changeset	556
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	557
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	558	log -p d
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10776 diff changeset	559
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	560	$ hg log -pv d
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	561	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	562	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	563	date: Thu Jan 01 00:00:04 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	564	files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	565	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	566	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	567
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	568
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	569	diff -r f8954cd4dc1f -r 2ca5ba701980 d
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	570	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	571	+++ b/d Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	572	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	573	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	574
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 10960 diff changeset	575
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	576
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	577	log --removed file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	578
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	579	$ hg log --removed -v a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	580	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	581	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	582	date: Thu Jan 01 00:00:04 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	583	files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	584	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	585	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	586
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	587
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	588	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	589	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	590	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	591	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	592	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	593	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	594
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	595
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	596
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	597	log --removed revrange file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	598
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	599	$ hg log --removed -v -r0:2 a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	600	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	601	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	602	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	603	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	604	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	605	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	606
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	607
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	608	$ cd ..
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	609
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	610	log --follow tests
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	611
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	612	$ hg init follow
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	613	$ cd follow
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	614
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	615	$ echo base > base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	616	$ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	617	adding base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	618
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	619	$ echo r1 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	620	$ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	621	$ echo r2 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	622	$ hg ci -Amr2 -d '1 0'
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	623
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	624	$ hg up -C 1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	625	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	626	$ echo b1 > b1
26102 5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	627
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	628	log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	629
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	630	$ hg log -r "follow('set:clean()')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	631	changeset: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	632	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	633	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	634	summary: base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	635
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	636	changeset: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	637	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	638	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	639	summary: r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	640
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	641
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	642	$ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	643	adding b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	644	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	645
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	646
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	647	log -f
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	648
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	649	$ hg log -f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	650	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	651	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	652	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	653	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	654	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	655	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	656
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	657	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	658	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	659	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	660	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	661
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	662	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	663	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	664	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	665	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	666
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	667
26102 5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	668	log -r follow('glob:b*')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	669
26102 5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	670	$ hg log -r "follow('glob:b*')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	671	changeset: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	672	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	673	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	674	summary: base
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	675
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	676	changeset: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	677	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	678	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	679	summary: r1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	680
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	681	changeset: 3:e62f78d544b4
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	682	tag: tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	683	parent: 1:3d5bf5654eda
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	684	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	685	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	686	summary: b1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	687
24189 8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	688	log -f -r '1 + 4'
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	689
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	690	$ hg up -C 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	691	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	692	$ echo b2 > b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	693	$ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	694	adding b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	695	created new head
24189 8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	696	$ hg log -f -r '1 + 4'
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	697	changeset: 4:ddb82e70d1a1
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	698	tag: tip
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	699	parent: 0:67e992f2c4f3
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	700	user: test
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	701	date: Thu Jan 01 00:00:01 1970 +0000
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	702	summary: b2
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	703
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	704	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	705	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	706	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	707	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	708
24189 8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	709	changeset: 0:67e992f2c4f3
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	710	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	711	date: Thu Jan 01 00:00:01 1970 +0000
24189 8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	712	summary: base
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	713
26102 5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	714	log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	715
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	716	$ hg log -r "follow('set:grep(b2)')"
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	717	changeset: 4:ddb82e70d1a1
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	718	tag: tip
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	719	parent: 0:67e992f2c4f3
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	720	user: test
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	721	date: Thu Jan 01 00:00:01 1970 +0000
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	722	summary: b2
5618858dce26 revsets: makes follow() supports file patterns (issue4757) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 25762 diff changeset	723
29814 cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	724	log -r "follow('set:grep(b2)', 4)"
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	725
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	726	$ hg up -qC 0
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	727	$ hg log -r "follow('set:grep(b2)', 4)"
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	728	changeset: 4:ddb82e70d1a1
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	729	tag: tip
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	730	parent: 0:67e992f2c4f3
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	731	user: test
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	732	date: Thu Jan 01 00:00:01 1970 +0000
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	733	summary: b2
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	734
35298 921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	735
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	736	follow files starting from multiple revisions:
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	737
35299 89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	738	$ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
35298 921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	739	3: b1
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	740	4: b2
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	741
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	742	follow files starting from empty revision:
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	743
35299 89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	744	$ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
35298 921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	745	abort: follow expected at least one starting revision!
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	746	[255]
921680c3e2ea revset: make follow() accept multiple startrevs Yuya Nishihara <yuya@tcha.org> parents: 35269 diff changeset	747
35299 89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	748	follow starting from revisions:
89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	749
89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	750	$ hg log -Gq -r "follow(startrev=2+4)"
89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	751	hg: parse error: follow takes no arguments or a pattern and an optional revset
89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	752	[255]
89b5c2ae1980 revset: make follow() accept keyword arguments Yuya Nishihara <yuya@tcha.org> parents: 35298 diff changeset	753
29814 cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	754	$ hg up -qC 4
cbf9984a7957 revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334) Gábor Stefanik <gabor.stefanik@nng.com> parents: 28627 diff changeset	755
23956 b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	756	log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	757
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	758	$ hg log -f -r null
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	759	changeset: -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	760	user:
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	761	date: Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	762
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	763	$ hg log -f -r null -G
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	764	o changeset: -1:000000000000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	765	user:
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	766	date: Thu Jan 01 00:00:00 1970 +0000
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	767
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	768
b1e026c25552 revset: fix ancestors(null) to include null revision (issue4512) Yuya Nishihara <yuya@tcha.org> parents: 23876 diff changeset	769
24064 c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	770	log -f with null parent
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	771
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	772	$ hg up -C null
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	773	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	774	$ hg log -f
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	775
c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	776
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	777	log -r . with two parents
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	778
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	779	$ hg up -C 3
24064 c260887cdbcd log: fix --follow null parent not to include revision 0 Yuya Nishihara <yuya@tcha.org> parents: 24013 diff changeset	780	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	781	$ hg merge tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	782	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	783	(branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	784	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	785	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	786	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	787	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	788	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	789	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	790
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	791
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	792
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	793	log -r . with one parent
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	794
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	795	$ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	796	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	797	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	798	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	799	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	800	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	801	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	802	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	803	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	804
11508 fbab0875fd09 log: fix missing diff output for hg log -p in sub directory Yuya Nishihara <yuya@tcha.org> parents: 11141 diff changeset	805
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	806	$ echo postm >> b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	807	$ hg ci -Amb1.1 -d'1 0'
11509 2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	808
2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	809
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	810	log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	811
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	812	$ hg log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	813	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	814	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	815	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	816	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	817	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	818
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	819	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	820	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	821	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	822	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	823	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	824	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	825
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	826	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	827	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	828	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	829	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	830	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	831
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	832	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	833	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	834	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	835	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	836
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	837	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	838	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	839	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	840	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	841
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	842
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	843
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	844	log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	845
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	846	$ hg log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	847	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	848	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	849	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	850	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	851	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	852
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	853	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	854	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	855	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	856	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	857	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	858	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	859
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	860	changeset: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	861	parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	862	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	863	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	864	summary: b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	865
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	866	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	867	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	868	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	869	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	870	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	871
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	872
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	873
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	874	log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	875
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	876	$ hg log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	877	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	878	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	879	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	880	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	881	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	882
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	883	diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	884	--- a/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	885	+++ b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	886	@@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	887	b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	888	+postm
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	889
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	890
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	891
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	892	log -r ""
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	893
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	894	$ hg log -r ''
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	895	hg: parse error: empty query
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	896	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	897
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	898	log -r <some unknown node id>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	899
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	900	$ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	901	abort: unknown revision '1000000000000000000000000000000000000000'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	902	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	903
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	904	log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	905
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	906	$ hg log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	907	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	908	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	909	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	910	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	911
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	912	log -p -l2 --color=always
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	913
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	914	$ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	915	> log -p -l2 --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	916	\x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	917	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	918	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	919	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	920	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	921
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	922	\x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	923	\x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	924	\x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	925	\x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	926	b1
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	927	\x1b[0;32m+postm\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	928
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	929	\x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	930	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	931	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	932	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	933	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	934	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	935
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	936	\x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	937	\x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	938	\x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	939	\x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	940	\x1b[0;32m+b2\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	941
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	942
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	943
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	944	log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	945
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	946	$ hg log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	947	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	948	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	949	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	950	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	951	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	952
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	953	b1 \| 1 +
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	954	1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	955
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	956
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	957	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	958
30016 2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	959	log --follow --patch FILE in repository where linkrev isn't trustworthy
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	960	(issue5376)
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	961
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	962	$ hg init follow-dup
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	963	$ cd follow-dup
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	964	$ cat <<EOF >> .hg/hgrc
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	965	> [ui]
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	966	> logtemplate = '=== {rev}: {desc}\n'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	967	> [diff]
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	968	> nodates = True
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	969	> EOF
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	970	$ echo 0 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	971	$ hg ci -qAm 'a0'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	972	$ echo 1 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	973	$ hg ci -m 'a1'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	974	$ hg up -q 0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	975	$ echo 1 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	976	$ touch b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	977	$ hg ci -qAm 'a1 with b'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	978	$ echo 3 >> a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	979	$ hg ci -m 'a3'
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	980
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	981	fctx.rev() == 2, but fctx.linkrev() == 1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	982
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	983	$ hg log -pf a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	984	=== 3: a3
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	985	diff -r 4ea02ba94d66 -r e7a6331a34f0 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	986	--- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	987	+++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	988	@@ -1,2 +1,3 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	989	0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	990	1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	991	+3
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	992
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	993	=== 2: a1 with b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	994	diff -r 49b5e81287e2 -r 4ea02ba94d66 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	995	--- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	996	+++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	997	@@ -1,1 +1,2 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	998	0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	999	+1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1000
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1001	=== 0: a0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1002	diff -r 000000000000 -r 49b5e81287e2 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1003	--- /dev/null
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1004	+++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1005	@@ -0,0 +1,1 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1006	+0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1007
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1008
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1009	fctx.introrev() == 2, but fctx.linkrev() == 1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1010
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1011	$ hg up -q 2
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1012	$ hg log -pf a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1013	=== 2: a1 with b
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1014	diff -r 49b5e81287e2 -r 4ea02ba94d66 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1015	--- a/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1016	+++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1017	@@ -1,1 +1,2 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1018	0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1019	+1
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1020
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1021	=== 0: a0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1022	diff -r 000000000000 -r 49b5e81287e2 a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1023	--- /dev/null
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1024	+++ b/a
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1025	@@ -0,0 +1,1 @@
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1026	+0
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1027
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1028
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1029	$ cd ..
2963fba2d18a log: copy the way of ancestor traversal to --follow matcher (issue5376) Yuya Nishihara <yuya@tcha.org> parents: 29814 diff changeset	1030
35269 2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1031	Multiple copy sources of a file:
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1032
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1033	$ hg init follow-multi
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1034	$ cd follow-multi
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1035	$ echo 0 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1036	$ hg ci -qAm 'a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1037	$ hg cp a b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1038	$ hg ci -m 'a->b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1039	$ echo 2 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1040	$ hg ci -m 'a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1041	$ echo 3 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1042	$ hg ci -m 'b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1043	$ echo 4 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1044	$ echo 4 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1045	$ hg ci -m 'a,b'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1046	$ echo 5 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1047	$ hg ci -m 'a0'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1048	$ echo 6 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1049	$ hg ci -m 'b0'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1050	$ hg up -q 4
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1051	$ echo 7 >> b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1052	$ hg ci -m 'b1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1053	created new head
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1054	$ echo 8 >> a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1055	$ hg ci -m 'a1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1056	$ hg rm a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1057	$ hg mv b a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1058	$ hg ci -m 'b1->a1'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1059	$ hg merge -qt :local
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1060	$ hg ci -m '(a0,b1->a1)->a'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1061
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1062	$ hg log -GT '{rev}: {desc}\n'
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1063	@ 10: (a0,b1->a1)->a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1064	\|\
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1065	\| o 9: b1->a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1066	\| \|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1067	\| o 8: a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1068	\| \|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1069	\| o 7: b1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1070	\| \|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1071	o \| 6: b0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1072	\| \|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1073	o \| 5: a0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1074	\|/
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1075	o 4: a,b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1076	\|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1077	o 3: b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1078	\|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1079	o 2: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1080	\|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1081	o 1: a->b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1082	\|
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1083	o 0: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1084
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1085
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1086	since file 'a' has multiple copy sources at the revision 4, ancestors can't
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1087	be indexed solely by fctx.linkrev().
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1088
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1089	$ hg log -T '{rev}: {desc}\n' -f a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1090	10: (a0,b1->a1)->a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1091	9: b1->a1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1092	7: b1
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1093	5: a0
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1094	4: a,b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1095	3: b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1096	2: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1097	1: a->b
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1098	0: a
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1099
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1100	$ cd ..
2af38229f147 test-log: test that fctx.ancestors() can't index parents only by linkrev Yuya Nishihara <yuya@tcha.org> parents: 34866 diff changeset	1101
28253 c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1102	Test that log should respect the order of -rREV even if multiple OR conditions
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1103	are specified (issue5100):
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1104
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1105	$ hg init revorder
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1106	$ cd revorder
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1107
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1108	$ hg branch -q b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1109	$ echo 0 >> f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1110	$ hg ci -qAm k0 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1111	$ hg branch -q b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1112	$ echo 1 >> f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1113	$ hg ci -qAm k1 -u u1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1114	$ hg branch -q b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1115	$ echo 2 >> f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1116	$ hg ci -qAm k2 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1117
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1118	$ hg update -q b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1119	$ echo 3 >> f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1120	$ hg ci -qAm k2 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1121	$ hg update -q b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1122	$ echo 4 >> f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1123	$ hg ci -qAm k1 -u u1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1124	$ hg update -q b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1125	$ echo 5 >> f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1126	$ hg ci -qAm k0 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1127
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1128	summary of revisions:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1129
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1130	$ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1131	@ 5 b0 u0 k0 f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1132	\|
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1133	\| o 4 b1 u1 k1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1134	\| \|
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1135	\| \| o 3 b2 u2 k2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1136	\| \| \|
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1137	\| \| o 2 b2 u2 k2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1138	\| \|/
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1139	\| o 1 b1 u1 k1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1140	\|/
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1141	o 0 b0 u0 k0 f0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1142
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1143
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1144	log -b BRANCH in ascending order:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1145
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1146	$ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1147	0 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1148	1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1149	4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1150	5 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1151	$ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1152	0 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1153	1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1154	4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1155	5 b0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1156
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1157	log --only-branch BRANCH in descending order:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1158
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1159	$ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1160	4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1161	3 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1162	2 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1163	1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1164	$ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1165	4 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1166	3 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1167	2 b2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1168	1 b1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1169
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1170	log -u USER in ascending order, against compound set:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1171
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1172	$ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1173	0 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1174	2 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1175	3 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1176	5 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1177	$ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1178	0 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1179	2 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1180	3 u2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1181	5 u0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1182
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1183	log -k TEXT in descending order, against compound set:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1184
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1185	$ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1186	5 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1187	3 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1188	2 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1189	1 k1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1190	0 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1191	$ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1192	5 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1193	3 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1194	2 k2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1195	1 k1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1196	0 k0
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1197
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1198	log FILE in ascending order, against dagrange:
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1199
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1200	$ hg log -r1:: -T '{rev} {files}\n' f1 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1201	1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1202	2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1203	3 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1204	4 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1205	$ hg log -r1:: -T '{rev} {files}\n' f2 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1206	1 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1207	2 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1208	3 f2
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1209	4 f1
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1210
c407583cf5f6 log: fix order of revisions filtered by multiple OR options (issue5100) Yuya Nishihara <yuya@tcha.org> parents: 26614 diff changeset	1211	$ cd ..
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1212
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1213	User
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1214
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1215	$ hg init usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1216	$ cd usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1217
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1218	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1219	$ hg ci -A -m "a" -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1220	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1221	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1222	$ hg ci -A -m "b" -u "User Two <user2@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1223	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1224
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1225	$ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1226	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1227	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1228	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1229	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1230
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1231	$ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1232	changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1233	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1234	user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1235	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1236	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1237
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1238	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1239	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1240	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1241	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1242
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1243	$ hg log -u "user3"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1244
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1245	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1246
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1247	$ hg init branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1248	$ cd branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1249
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1250	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1251	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1252	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1253	$ hg branch test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1254	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14645 diff changeset	1255	(branches are permanent and global, did you want a bookmark?)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1256	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1257	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1258	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1259
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1260	$ hg up default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1261	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1262	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1263	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1264	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1265	$ hg up test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1266	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1267	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1268	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1269	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1270
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1271
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1272	log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1273
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1274	$ hg log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1275	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1276	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1277	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1278	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1279	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1280
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1281	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1282	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1283	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1284	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1285
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1286
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1287
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1288	log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1289
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1290	$ hg log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1291	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1292	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1293	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1294	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1295	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1296	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1297	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1298
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1299	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1300	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1301	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1302	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1303	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1304
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1305
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1306
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1307	log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1308
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1309	$ hg log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1310	abort: unknown revision 'dummy'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	1311	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1312
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1313
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1314	log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1315
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1316	$ hg log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1317	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1318	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1319	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1320	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1321	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1322	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1323	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1324
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1325	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1326	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1327	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1328	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1329	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1330
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1331
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1332
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1333	log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1334
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1335	$ hg log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1336	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1337	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1338	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1339	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1340	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1341	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1342	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1343
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1344	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1345	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1346	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1347	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1348	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1349
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1350	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1351	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1352	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1353	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1354	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1355
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1356	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1357	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1358	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1359	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1360
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1361
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1362
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1363	log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1364
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1365	$ hg log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1366	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1367	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1368	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1369	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1370	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1371	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1372	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1373
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1374	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1375	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1376	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1377	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1378	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1379
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1380	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1381	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1382	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1383	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1384	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1385
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1386	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1387	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1388	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1389	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1390
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1391
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1392
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1393	log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1394
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1395	$ hg log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1396	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1397	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1398	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1399	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1400	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1401	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1402	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1403
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1404	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1405	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1406	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1407	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1408	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1409
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1410
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1411
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1412	log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1413
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1414	$ hg log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1415	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1416	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1417	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1418	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1419	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1420
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1421	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1422	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1423	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1424	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1425
23771 9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1426	#if gettext
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1427
23771 9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1428	Test that all log names are translated (e.g. branches, bookmarks, tags):
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1429
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1430	$ hg bookmark babar -r tip
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1431
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1432	$ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1433	\xc3\x84nderung: 3:f5d8de11c2e2 (esc)
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1434	Zweig: test
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1435	Lesezeichen: babar
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1436	Marke: tip
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1437	Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1438	Nutzer: test
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1439	Datum: Thu Jan 01 00:00:00 1970 +0000
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1440	Zusammenfassung: commit on test
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1441
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1442	$ hg bookmark -d babar
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1443
9f81f9e5b47a tests: add a i18n translation test for log output Sean Farley <sean.michael.farley@gmail.com> parents: 23729 diff changeset	1444	#endif
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1445
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1446	log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1447
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1448	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1449	$ hg log -p --cwd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1450	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1451	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1452	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1453	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1454	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1455	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1456	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1457
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1458	diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1459	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1460	+++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1461	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1462	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1463
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1464	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1465	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1466	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1467	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1468	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1469
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1470	diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1471	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1472	+++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1473	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1474	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1475
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1476	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1477	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1478	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1479	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1480	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1481
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1482	diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1483	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1484	+++ b/b Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1485	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1486	+b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1487
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1488	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1489	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1490	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1491	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1492
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1493	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1494	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1495	+++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1496	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1497	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1498
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1499
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1500
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1501	log -p -R repo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1502
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1503	$ cd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1504	$ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1505	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1506	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1507	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1508	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1509
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1510	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1511	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1512	+++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1513	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1514	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1515
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1516
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1517	$ cd ../..
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1518
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1519	$ hg init follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1520	$ cd follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1521
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1522	# Build the following history:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1523	# tip - o - x - o - x - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1524	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1525	# o - o - o - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1526	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1527	# o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1528	#
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1529	# Where "o" is a revision containing "foo" and
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1530	# "x" is a revision without "foo"
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1531
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1532	$ touch init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1533	$ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1534	adding init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1535	$ echo 'foo' > init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1536	$ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1537	$ echo 'foo' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1538	$ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1539	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1540	$ hg rm foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1541	$ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1542	$ echo 'related' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1543	$ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1544	adding foo
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1545
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1546	$ hg up 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1547	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1548	$ touch branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1549	$ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1550	adding branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1551	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1552	$ touch foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1553	$ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1554	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1555	$ echo 'change' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1556	$ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1557
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1558	$ hg up 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1559	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1560	$ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1561	$ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1562	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1563	$ hg merge 7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1564	merging foo
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26102 diff changeset	1565	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1566	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 11900 diff changeset	1567	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	1568	[1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1569	$ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1570	$ hg resolve -m foo
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21877 diff changeset	1571	(no more unresolved files)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1572	$ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1573
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1574	$ hg merge 4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1575	merging foo
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26102 diff changeset	1576	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1577	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 11900 diff changeset	1578	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	1579	[1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1580	$ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1581	$ hg resolve -m foo
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21877 diff changeset	1582	(no more unresolved files)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1583	$ hg ci -m "Last merge, related"
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1584
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 16923 diff changeset	1585	$ hg log --graph
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1586	@ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1587	\|\ tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1588	\| \| parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1589	\| \| parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1590	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1591	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1592	\| \| summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1593	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1594	\| o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1595	\| \|\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1596	\| \| \| parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1597	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1598	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1599	\| \| \| summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1600	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1601	\| \| o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1602	\| \| \| parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1603	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1604	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1605	\| \| \| summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1606	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1607	\| o \| changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1608	\| \|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1609	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1610	\| \| summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1611	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1612	\| o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1613	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1614	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1615	\| \| summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1616	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1617	\| o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1618	\| \| parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1619	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1620	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1621	\| \| summary: first branch, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1622	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1623	o \| changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1624	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1625	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1626	\| \| summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1627	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1628	o \| changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1629	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1630	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1631	\| \| summary: delete foo, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1632	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1633	o \| changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1634	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1635	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1636	\| \| summary: add unrelated old foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1637	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1638	o \| changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1639	\|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1640	\| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1641	\| summary: change, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1642	\|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1643	o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1644	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1645	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1646	summary: init, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1647
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1648
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1649	$ hg --traceback log -f foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1650	changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1651	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1652	parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1653	parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1654	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1655	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1656	summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1657
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1658	changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1659	parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1660	parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1661	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1662	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1663	summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1664
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1665	changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1666	parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1667	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1668	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1669	summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1670
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1671	changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1672	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1673	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1674	summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1675
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1676	changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1677	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1678	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1679	summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1680
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1681	changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1682	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1683	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1684	summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1685
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1686
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1687	Also check when maxrev < lastrevfilelog
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1688
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1689	$ hg --traceback log -f -r4 foo
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1690	changeset: 4:88176d361b69
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1691	user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1692	date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1693	summary: add foo, related
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1694
24189 8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	1695	changeset: 2:c4c64aedf0f7
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	1696	user: test
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	1697	date: Thu Jan 01 00:00:00 1970 +0000
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	1698	summary: add unrelated old foo
8b4b9ee6001a log: make -fr show complete history from the given revs Durham Goode <durham@fb.com> parents: 24180 diff changeset	1699
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1700	$ cd ..
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1701
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12383 diff changeset	1702	Issue2383: hg log showing _less_ differences than hg diff
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1703
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1704	$ hg init issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1705	$ cd issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1706
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1707	Create a test repo:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1708
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1709	$ echo a > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1710	$ hg ci -Am0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1711	adding a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1712	$ echo b > b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1713	$ hg ci -Am1
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1714	adding b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1715	$ hg co 0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1716	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1717	$ echo b > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1718	$ hg ci -m2
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1719	created new head
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1720
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1721	Merge:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1722
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1723	$ hg merge
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1724	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1725	(branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1726
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1727	Make sure there's a file listed in the merge to trigger the bug:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1728
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1729	$ echo c > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1730	$ hg ci -m3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1731
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1732	Two files shown here in diff:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1733
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1734	$ hg diff --rev 2:3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1735	diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1736	--- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1737	+++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1738	@@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1739	-b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1740	+c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1741	diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1742	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1743	+++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1744	@@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1745	+b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1746
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1747	Diff here should be the same:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1748
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1749	$ hg log -vpr 3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1750	changeset: 3:8e07aafe1edc
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1751	tag: tip
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1752	parent: 2:b09be438c43a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1753	parent: 1:925d80f479bb
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1754	user: test
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1755	date: Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1756	files: a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1757	description:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1758	3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1759
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1760
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1761	diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1762	--- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1763	+++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1764	@@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1765	-b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1766	+c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1767	diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1768	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1769	+++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1770	@@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1771	+b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1772
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1773	$ cd ..
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1774
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1775	'hg log -r rev fn' when last(filelog(fn)) != rev
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1776
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1777	$ hg init simplelog
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1778	$ cd simplelog
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1779	$ echo f > a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1780	$ hg ci -Am'a' -d '0 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1781	adding a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1782	$ echo f >> a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1783	$ hg ci -Am'a bis' -d '1 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1784
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1785	$ hg log -r0 a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1786	changeset: 0:9f758d63dcde
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1787	user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1788	date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1789	summary: a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1790
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1791	enable obsolete to test hidden feature
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1792
22955 fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 21998 diff changeset	1793	$ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 21998 diff changeset	1794	> [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34455 diff changeset	1795	> evolution.createmarkers=True
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1796	> EOF
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1797
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1798	$ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1799	1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1800	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1801	$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
33542 b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets Boris Feld <boris.feld@octobus.net> parents: 33262 diff changeset	1802	obsoleted 1 changesets
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1803	$ hg up null -q
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1804	$ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1805	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1806	$ hg log --template='{rev}:{node}\n' --hidden
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1807	1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1808	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
19471 fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979) Matt Mackall <mpm@selenic.com> parents: 19127 diff changeset	1809	$ hg log -r a
23046 c1aede895072 repoview: issue a special message when filtering hidden changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23045 diff changeset	1810	abort: hidden revision 'a'!
c1aede895072 repoview: issue a special message when filtering hidden changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 23045 diff changeset	1811	(use --hidden to access hidden revisions)
19471 fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979) Matt Mackall <mpm@selenic.com> parents: 19127 diff changeset	1812	[255]
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1813
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1814	test that parent prevent a changeset to be hidden
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1815
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18250 diff changeset	1816	$ hg up 1 -q --hidden
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1817	$ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1818	1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1819	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1820
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1821	test that second parent prevent a changeset to be hidden too
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1822
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1823	$ hg debugsetparents 0 1 # nothing suitable to merge here
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1824	$ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1825	1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1826	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18494 e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1827	$ hg debugsetparents 1
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1828	$ hg up -q null
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1829
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1830	bookmarks prevent a changeset being hidden
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1831
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1832	$ hg bookmark --hidden -r 1 X
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1833	$ hg log --template '{rev}:{node}\n'
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1834	1:a765632148dc55d38c35c4f247c618701886cb2f
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1835	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18495 8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1836	$ hg bookmark -d X
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1837
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1838	divergent bookmarks are not hidden
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1839
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1840	$ hg bookmark --hidden -r 1 X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1841	$ hg log --template '{rev}:{node}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1842	1:a765632148dc55d38c35c4f247c618701886cb2f
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1843	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1844
30044 69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1845	test hidden revision 0 (issue5385)
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1846
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1847	$ hg bookmark -d X@foo
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1848	$ hg up null -q
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1849	$ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
33542 b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets Boris Feld <boris.feld@octobus.net> parents: 33262 diff changeset	1850	obsoleted 1 changesets
30044 69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1851	$ echo f > b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1852	$ hg ci -Am'b' -d '2 0'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1853	adding b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1854	$ echo f >> b
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1855	$ hg ci -m'b bis' -d '3 0'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1856	$ hg log -T'{rev}:{node}\n'
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1857	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1858	2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1859
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1860	$ hg log -T'{rev}:{node}\n' -r:
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1861	2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1862	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1863	$ hg log -T'{rev}:{node}\n' -r:tip
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1864	2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1865	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1866	$ hg log -T'{rev}:{node}\n' -r:0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1867	abort: hidden revision '0'!
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1868	(use --hidden to access hidden revisions)
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1869	[255]
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1870	$ hg log -T'{rev}:{node}\n' -f
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1871	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1872	2:94375ec45bddd2a824535fc04855bd058c926ec0
69b61d0bb008 revset: do not rewrite ':y' to '0:y' (issue5385) Yuya Nishihara <yuya@tcha.org> parents: 30016 diff changeset	1873
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1874	clear extensions configuration
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1875	$ echo '[extensions]' >> $HGRCPATH
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1876	$ echo "obs=!" >> $HGRCPATH
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1877	$ cd ..
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1878
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1879	test -u/-k for problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1880	# unicode: cp932:
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1881	# u30A2 0x83 0x41(= 'A')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1882	# u30C2 0x83 0x61(= 'a')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1883
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1884	$ hg init problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1885	$ cd problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1886
33262 8e6f4939a69a tests: replace yet more calls to `python` with $PYTHON Augie Fackler <augie@google.com> parents: 33212 diff changeset	1887	$ $PYTHON > setup.sh <<EOF
33721 24849d53697d tests: clean up many print statements to be print functions instead Augie Fackler <augie@google.com> parents: 33542 diff changeset	1888	> print(u'''
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1889	> echo a > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1890	> hg add text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1891	> hg --encoding utf-8 commit -u '\u30A2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1892	> echo b > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1893	> hg --encoding utf-8 commit -u '\u30C2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1894	> echo c > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1895	> hg --encoding utf-8 commit -u none -m '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1896	> echo d > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1897	> hg --encoding utf-8 commit -u none -m '\u30C2'
33721 24849d53697d tests: clean up many print statements to be print functions instead Augie Fackler <augie@google.com> parents: 33542 diff changeset	1898	> '''.encode('utf-8'))
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1899	> EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1900	$ sh < setup.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1901
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1902	test in problematic encoding
33262 8e6f4939a69a tests: replace yet more calls to `python` with $PYTHON Augie Fackler <augie@google.com> parents: 33212 diff changeset	1903	$ $PYTHON > test.sh <<EOF
33721 24849d53697d tests: clean up many print statements to be print functions instead Augie Fackler <augie@google.com> parents: 33542 diff changeset	1904	> print(u'''
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1905	> hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1906	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1907	> hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1908	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1909	> hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1910	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1911	> hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
33721 24849d53697d tests: clean up many print statements to be print functions instead Augie Fackler <augie@google.com> parents: 33542 diff changeset	1912	> '''.encode('cp932'))
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1913	> EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1914	$ sh < test.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1915	0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1916	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1917	1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1918	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1919	2
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1920	0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1921	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1922	3
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1923	1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1924
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1925	$ cd ..
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1926
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1927	test hg log on non-existent files and on directories
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1928	$ hg init issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1929	$ cd issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1930	$ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1931	$ echo 1 > d1/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1932	$ echo 1 > D2/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1933	$ echo 1 > D3.i/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1934	$ echo 1 > d4.hg/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1935	$ echo 1 > d5.d/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1936	$ echo 1 > .d6/f1
17781 8ce535745500 test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b Adrian Buehlmann <adrian@cadifra.com> parents: 17746 diff changeset	1937	$ hg -q add .
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1938	$ hg commit -m "a bunch of weird directories"
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1939	$ hg log -l1 d1/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1940	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1941	$ hg log -l1 f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1942	$ hg log -l1 . \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1943	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1944	$ hg log -l1 ./ \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1945	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1946	$ hg log -l1 d1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1947	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1948	$ hg log -l1 D2 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1949	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1950	$ hg log -l1 D2/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1951	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1952	$ hg log -l1 D3.i \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1953	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1954	$ hg log -l1 D3.i/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1955	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1956	$ hg log -l1 d4.hg \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1957	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1958	$ hg log -l1 d4.hg/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1959	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1960	$ hg log -l1 d5.d \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1961	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1962	$ hg log -l1 d5.d/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1963	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1964	$ hg log -l1 .d6 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1965	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1966	$ hg log -l1 .d6/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1967	changeset: 0:65624cd9070a
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1968
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1969	issue3772: hg log -r :null showing revision 0 as well
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1970
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1971	$ hg log -r :null
20699 58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1972	changeset: 0:65624cd9070a
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1973	tag: tip
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1974	user: test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1975	date: Thu Jan 01 00:00:00 1970 +0000
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1976	summary: a bunch of weird directories
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1977
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1978	changeset: -1:000000000000
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1979	user:
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1980	date: Thu Jan 01 00:00:00 1970 +0000
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1981
18468 275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1982	$ hg log -r null:null
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1983	changeset: -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1984	user:
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1985	date: Thu Jan 01 00:00:00 1970 +0000
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1986
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	1987	working-directory revision requires special treatment
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	1988
28565 bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1989	clean:
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1990
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1991	$ hg log -r 'wdir()' --debug
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1992	changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1993	phase: draft
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1994	parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1995	parent: -1:0000000000000000000000000000000000000000
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1996	user: test
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1997	date: [A-Za-z0-9:+ ]+ (re)
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1998	extra: branch=default
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	1999
28566 34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2000	$ hg log -r 'wdir()' -p --stat
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2001	changeset: 2147483647:ffffffffffff
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2002	parent: 0:65624cd9070a
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2003	user: test
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2004	date: [A-Za-z0-9:+ ]+ (re)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2005
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2006
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2007
28565 bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2008
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2009	dirty:
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2010
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2011	$ echo 2 >> d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2012	$ echo 2 > d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2013	$ hg add d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2014	$ hg remove .d6/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2015	$ hg status
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2016	M d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2017	A d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2018	R .d6/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2019
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2020	$ hg log -r 'wdir()'
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25739 diff changeset	2021	changeset: 2147483647:ffffffffffff
25739 3dabc9b7494a changeset_printer: use node.wdirrev to calculate meaningful parentrevs Yuya Nishihara <yuya@tcha.org> parents: 25688 diff changeset	2022	parent: 0:65624cd9070a
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2023	user: test
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2024	date: [A-Za-z0-9:+ ]+ (re)
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2025
5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2026	$ hg log -r 'wdir()' -q
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25739 diff changeset	2027	2147483647:ffffffffffff
24584 5a40b5d45396 changeset_printer: display p1rev:p1node with "+" suffix for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24533 diff changeset	2028
24585 e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2029	$ hg log -r 'wdir()' --debug
25762 f4412380d357 changeset_printer: display wdirrev/wdirnode values for workingctx Yuya Nishihara <yuya@tcha.org> parents: 25739 diff changeset	2030	changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
24585 e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2031	phase: draft
e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2032	parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2033	parent: -1:0000000000000000000000000000000000000000
e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2034	user: test
e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2035	date: [A-Za-z0-9:+ ]+ (re)
28565 bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2036	files: d1/f1
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2037	files+: d1/f2
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2038	files-: .d6/f1
24585 e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2039	extra: branch=default
e191d5d8d515 changeset_printer: hide manifest node for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24584 diff changeset	2040
28566 34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2041	$ hg log -r 'wdir()' -p --stat --git
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2042	changeset: 2147483647:ffffffffffff
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2043	parent: 0:65624cd9070a
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2044	user: test
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2045	date: [A-Za-z0-9:+ ]+ (re)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2046
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2047	.d6/f1 \| 1 -
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2048	d1/f1 \| 1 +
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2049	d1/f2 \| 1 +
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2050	3 files changed, 2 insertions(+), 1 deletions(-)
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2051
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2052	diff --git a/.d6/f1 b/.d6/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2053	deleted file mode 100644
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2054	--- a/.d6/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2055	+++ /dev/null
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2056	@@ -1,1 +0,0 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2057	-1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2058	diff --git a/d1/f1 b/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2059	--- a/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2060	+++ b/d1/f1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2061	@@ -1,1 +1,2 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2062	1
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2063	+2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2064	diff --git a/d1/f2 b/d1/f2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2065	new file mode 100644
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2066	--- /dev/null
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2067	+++ b/d1/f2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2068	@@ -0,0 +1,1 @@
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2069	+2
34f798bec3dc tests: add test for "log -r wdir() -p" (issue4871) Yuya Nishihara <yuya@tcha.org> parents: 28565 diff changeset	2070
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2071	$ hg log -r 'wdir()' -Tjson
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2072	[
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2073	{
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2074	"rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2075	"node": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2076	"branch": "default",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2077	"phase": "draft",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2078	"user": "test",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2079	"date": [*, 0], (glob)
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2080	"desc": "",
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2081	"bookmarks": [],
25688 24cda1dd45ff workingctx: don't report the tags for its parents Matt Harbison <matt_harbison@yahoo.com> parents: 25006 diff changeset	2082	"tags": [],
24602 201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2083	"parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2084	}
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2085	]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2086
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2087	$ hg log -r 'wdir()' -Tjson -q
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2088	[
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2089	{
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2090	"rev": null,
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2091	"node": null
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2092	}
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2093	]
201caa10536b jsonchangeset: set rev and node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24585 diff changeset	2094
24603 e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2095	$ hg log -r 'wdir()' -Tjson --debug
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2096	[
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2097	{
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2098	"rev": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2099	"node": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2100	"branch": "default",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2101	"phase": "draft",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2102	"user": "test",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2103	"date": [*, 0], (glob)
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2104	"desc": "",
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2105	"bookmarks": [],
25688 24cda1dd45ff workingctx: don't report the tags for its parents Matt Harbison <matt_harbison@yahoo.com> parents: 25006 diff changeset	2106	"tags": [],
24603 e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2107	"parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2108	"manifest": null,
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2109	"extra": {"branch": "default"},
28565 bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2110	"modified": ["d1/f1"],
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2111	"added": ["d1/f2"],
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2112	"removed": [".d6/f1"]
24603 e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2113	}
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2114	]
e74f819e9160 jsonchangeset: set manifest node to "null" for workingctx Yuya Nishihara <yuya@tcha.org> parents: 24602 diff changeset	2115
28565 bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2116	$ hg revert -aqC
bfc7f20c76c7 tests: include modified/added/removed files in "log -r wdir()" output Yuya Nishihara <yuya@tcha.org> parents: 28253 diff changeset	2117
23773 c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2118	Check that adding an arbitrary name shows up in log automatically
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	2119
23773 c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2120	$ cat > ../names.py <<EOF
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2121	> """A small extension to test adding arbitrary names to a repo"""
33965 251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2122	> from __future__ import absolute_import
251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2123	> from mercurial import namespaces
23773 c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2124	>
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2125	> def reposetup(ui, repo):
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2126	> foo = {'foo': repo[0].node()}
23873 9ef234021667 namespaces: use named args for namespace api Sean Farley <sean.michael.farley@gmail.com> parents: 23865 diff changeset	2127	> names = lambda r: foo.keys()
9ef234021667 namespaces: use named args for namespace api Sean Farley <sean.michael.farley@gmail.com> parents: 23865 diff changeset	2128	> namemap = lambda r, name: foo.get(name)
9ef234021667 namespaces: use named args for namespace api Sean Farley <sean.michael.farley@gmail.com> parents: 23865 diff changeset	2129	> nodemap = lambda r, node: [name for name, n in foo.iteritems()
9ef234021667 namespaces: use named args for namespace api Sean Farley <sean.michael.farley@gmail.com> parents: 23865 diff changeset	2130	> if n == node]
33965 251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2131	> ns = namespaces.namespace(
251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2132	> "bars", templatename="bar", logname="barlog",
251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2133	> colorname="barcolor", listnames=names, namemap=namemap,
251bd3fddd9b tests: update test-log to pass our import checker Augie Fackler <raf@durin42.com> parents: 33773 diff changeset	2134	> nodemap=nodemap)
23873 9ef234021667 namespaces: use named args for namespace api Sean Farley <sean.michael.farley@gmail.com> parents: 23865 diff changeset	2135	>
23773 c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2136	> repo.names.addnamespace(ns)
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2137	> EOF
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2138
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2139	$ hg --config extensions.names=../names.py log -r 0
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2140	changeset: 0:65624cd9070a
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2141	tag: tip
23876 48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2142	barlog: foo
23773 c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2143	user: test
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2144	date: Thu Jan 01 00:00:00 1970 +0000
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2145	summary: a bunch of weird directories
c517b97c7609 namespaces: add test for log Sean Farley <sean.michael.farley@gmail.com> parents: 23771 diff changeset	2146
23876 48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2147	$ hg --config extensions.names=../names.py \
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2148	> --config extensions.color= --config color.log.barcolor=red \
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2149	> --color=always log -r 0
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2150	\x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2151	tag: tip
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2152	\x1b[0;31mbarlog: foo\x1b[0m (esc)
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2153	user: test
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2154	date: Thu Jan 01 00:00:00 1970 +0000
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2155	summary: a bunch of weird directories
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2156
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2157	$ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2158	foo
48fd1dfb99aa log: use namespace logname and colorname Sean Farley <sean.michael.farley@gmail.com> parents: 23873 diff changeset	2159
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	2160	$ cd ..
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2161
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2162	hg log -f dir across branches
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2163
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2164	$ hg init acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2165	$ cd acrossbranches
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2166	$ mkdir d
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2167	$ echo a > d/a && hg ci -Aqm a
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2168	$ echo b > d/a && hg ci -Aqm b
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2169	$ hg up -q 0
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2170	$ echo b > d/a && hg ci -Aqm c
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2171	$ hg log -f d -T '{desc}' -G
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2172	@ c
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2173	\|
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2174	o a
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2175
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24064 diff changeset	2176	Ensure that largefiles doesn't interfere with following a normal file
23976 344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	2177	$ hg --config extensions.largefiles= log -f d -T '{desc}' -G
33212 fe0667cc521e tests: add fsmonitor specific output lines at enabling largefiles FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32308 diff changeset	2178	The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
23976 344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	2179	@ c
344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	2180	\|
344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	2181	o a
344939126579 largefiles: don't interfere with logging normal files Matt Harbison <matt_harbison@yahoo.com> parents: 23956 diff changeset	2182
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2183	$ hg log -f d/a -T '{desc}' -G
23704 c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2184	@ c
23500 9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2185	\|
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2186	o a
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2187
9601229ed361 log: fix log -f slow path to actually follow history Durham Goode <durham@fb.com> parents: 23046 diff changeset	2188	$ cd ..
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2189
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2190	hg log -f with linkrev pointing to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2191	-------------------------------------------------
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2192
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2193	create history with a filerev whose linkrev points to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2194
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2195	$ hg init branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2196	$ cd branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2197	$ echo 1 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2198	$ hg commit -Am 'content1'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2199	adding a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2200	$ echo 2 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2201	$ hg commit -m 'content2'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2202	$ hg up --rev 'desc(content1)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2203	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2204	$ echo unrelated > unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2205	$ hg commit -Am 'unrelated'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2206	adding unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2207	created new head
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2208	$ hg graft -r 'desc(content2)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2209	grafting 1:2294ae80ad84 "content2"
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2210	$ echo 3 > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2211	$ hg commit -m 'content3'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2212	$ hg log -G
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2213	@ changeset: 4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2214	\| tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2215	\| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2216	\| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2217	\| summary: content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2218	\|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2219	o changeset: 3:15b2327059e5
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2220	\| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2221	\| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2222	\| summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2223	\|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2224	o changeset: 2:2029acd1168c
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2225	\| parent: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2226	\| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2227	\| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2228	\| summary: unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2229	\|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2230	\| o changeset: 1:2294ae80ad84
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2231	\|/ user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2232	\| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2233	\| summary: content2
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2234	\|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2235	o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2236	user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2237	date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2238	summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2239
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2240
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2241	log -f on the file should list the graft result.
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2242
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2243	$ hg log -Gf a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2244	@ changeset: 4:50b9b36e9c5d
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2245	\| tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2246	\| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2247	\| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2248	\| summary: content3
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2249	\|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2250	o changeset: 3:15b2327059e5
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2251	: user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2252	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2253	: summary: content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2254	:
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2255	o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2256	user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2257	date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2258	summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2259
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2260
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2261	plain log lists the original version
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2262	(XXX we should probably list both)
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2263
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2264	$ hg log -G a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2265	@ changeset: 4:50b9b36e9c5d
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2266	: tag: tip
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2267	: user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2268	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2269	: summary: content3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2270	:
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2271	: o changeset: 1:2294ae80ad84
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2272	:/ user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2273	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2274	: summary: content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2275	:
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2276	o changeset: 0:ae0a3c9f9e95
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2277	user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2278	date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2279	summary: content1
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2280
23704 c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2281
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2282	hg log -f from the grafted changeset
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2283	(The bootstrap should properly take the topology in account)
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2284
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2285	$ hg up 'desc(content3)^'
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2286	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2287	$ hg log -Gf a
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2288	@ changeset: 3:15b2327059e5
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2289	: user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2290	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2291	: summary: content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2292	:
23704 c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2293	o changeset: 0:ae0a3c9f9e95
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2294	user: test
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2295	date: Thu Jan 01 00:00:00 1970 +0000
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2296	summary: content1
c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	2297
23719 34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2298
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2299	Test that we use the first non-hidden changeset in that case.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2300
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2301	(hide the changeset)
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2302
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2303	$ hg log -T '{node}\n' -r 1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2304	2294ae80ad8447bc78383182eeac50cb049df623
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2305	$ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
33542 b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets Boris Feld <boris.feld@octobus.net> parents: 33262 diff changeset	2306	obsoleted 1 changesets
23719 34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2307	$ hg log -G
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2308	o changeset: 4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2309	\| tag: tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2310	\| user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2311	\| date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2312	\| summary: content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2313	\|
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2314	@ changeset: 3:15b2327059e5
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2315	\| user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2316	\| date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2317	\| summary: content2
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2318	\|
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2319	o changeset: 2:2029acd1168c
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2320	\| parent: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2321	\| user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2322	\| date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2323	\| summary: unrelated
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2324	\|
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2325	o changeset: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2326	user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2327	date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2328	summary: content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2329
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2330
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2331	Check that log on the file does not drop the file revision.
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2332
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2333	$ hg log -G a
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2334	o changeset: 4:50b9b36e9c5d
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2335	\| tag: tip
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2336	\| user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2337	\| date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2338	\| summary: content3
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2339	\|
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2340	@ changeset: 3:15b2327059e5
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2341	: user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2342	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2343	: summary: content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2344	:
23719 34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2345	o changeset: 0:ae0a3c9f9e95
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2346	user: test
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2347	date: Thu Jan 01 00:00:00 1970 +0000
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2348	summary: content1
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2349
34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 23704 diff changeset	2350
23720 8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2351	Even when a head revision is linkrev-shadowed.
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2352
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2353	$ hg log -T '{node}\n' -r 4
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2354	50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2355	$ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
33542 b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets Boris Feld <boris.feld@octobus.net> parents: 33262 diff changeset	2356	obsoleted 1 changesets
23720 8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2357	$ hg log -G a
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2358	@ changeset: 3:15b2327059e5
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2359	: tag: tip
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2360	: user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2361	: date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2362	: summary: content2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2363	:
23720 8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2364	o changeset: 0:ae0a3c9f9e95
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2365	user: test
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2366	date: Thu Jan 01 00:00:00 1970 +0000
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2367	summary: content1
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2368
8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23719 diff changeset	2369
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23500 diff changeset	2370	$ cd ..
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2371
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2372	Even when the file revision is missing from some head:
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2373
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2374	$ hg init issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2375	$ cd issue4490
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2376	$ echo '[experimental]' >> .hg/hgrc
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34455 diff changeset	2377	$ echo 'evolution.createmarkers=True' >> .hg/hgrc
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2378	$ echo a > a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2379	$ hg ci -Am0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2380	adding a
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2381	$ echo b > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2382	$ hg ci -Am1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2383	adding b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2384	$ echo B > b
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2385	$ hg ci --amend -m 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2386	$ hg up 0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2387	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2388	$ echo c > c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2389	$ hg ci -Am2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2390	adding c
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2391	created new head
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2392	$ hg up 'head() and not .'
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2393	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2394	$ hg log -G
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33965 diff changeset	2395	o changeset: 3:db815d6d32e6
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2396	\| tag: tip
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2397	\| parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2398	\| user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2399	\| date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2400	\| summary: 2
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2401	\|
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33965 diff changeset	2402	\| @ changeset: 2:9bc8ce7f9356
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2403	\|/ parent: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2404	\| user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2405	\| date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2406	\| summary: 1
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2407	\|
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2408	o changeset: 0:f7b1eb17ad24
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2409	user: test
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2410	date: Thu Jan 01 00:00:00 1970 +0000
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2411	summary: 0
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2412
07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2413	$ hg log -f -G b
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33965 diff changeset	2414	@ changeset: 2:9bc8ce7f9356
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2415	\| parent: 0:f7b1eb17ad24
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2416	~ user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2417	date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2418	summary: 1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2419
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2420	$ hg log -G b
34085 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 33965 diff changeset	2421	@ changeset: 2:9bc8ce7f9356
23729 07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23720 diff changeset	2422	\| parent: 0:f7b1eb17ad24
28627 d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2423	~ user: test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2424	date: Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2425	summary: 1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC) Martijn Pieters <mjpieters@fb.com> parents: 28566 diff changeset	2426
23865 81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2427	$ cd ..
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2428
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2429	Check proper report when the manifest changes but not the file issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2430	------------------------------------------------------------------------
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2431
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2432	$ hg init issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2433	$ cd issue4499
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2434	$ for f in A B C D F E G H I J K L M N O P Q R S T U; do
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2435	> echo 1 > $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2436	> hg add $f;
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2437	> done
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2438	$ hg commit -m 'A1B1C1'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2439	$ echo 2 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2440	$ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2441	$ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2442	$ hg commit -m 'A2B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2443	$ hg up 0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2444	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2445	$ echo 3 > A
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2446	$ echo 2 > B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2447	$ echo 2 > C
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2448	$ hg commit -m 'A3B2C2'
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2449	created new head
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2450
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2451	$ hg log -G
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2452	@ changeset: 2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2453	\| tag: tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2454	\| parent: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2455	\| user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2456	\| date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2457	\| summary: A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2458	\|
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2459	\| o changeset: 1:07dcc6b312c0
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2460	\|/ user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2461	\| date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2462	\| summary: A2B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2463	\|
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2464	o changeset: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2465	user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2466	date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2467	summary: A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2468
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2469
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2470	Log -f on B should reports current changesets
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2471
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2472	$ hg log -fG B
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2473	@ changeset: 2:fe5fc3d0eb17
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2474	\| tag: tip
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2475	\| parent: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2476	\| user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2477	\| date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2478	\| summary: A3B2C2
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2479	\|
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2480	o changeset: 0:abf4f0e38563
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2481	user: test
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2482	date: Thu Jan 01 00:00:00 1970 +0000
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2483	summary: A1B1C1
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2484
81349f4b47f4 linkrev: use the right manifest content when adjusting linrev (issue4499) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23773 diff changeset	2485	$ cd ..

author	Yuya Nishihara <yuya@tcha.org>
	Thu, 22 Sep 2016 19:35:36 +0900
changeset 35299	89b5c2ae1980
parent 35298	921680c3e2ea
child 35300	d36eda8896cc
permissions	-rw-r--r--