mercurial-scm/hg-stable: tests/test-log.t annotate

annotate tests/test-log.t @ 18426:01638b51df44

hgweb: ignore filtered revision in revnav This changeset checks that a revision is known before adding it to the navigation. This will prevent traceback on filtered repository. This changeset result in an incorrect behaviors, Navigation link may be dropped without any replacement. However this bad navigation generation is much better than a crash

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Wed, 16 Jan 2013 14:19:28 +0100
parents	8802277c40ee
children	ac0c12123743

rev	line source
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	1 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	2 changeset graph
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	3
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	4 $ hg init a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	5 $ cd a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	6 $ echo a > a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	7 $ echo f > f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	8 $ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	9 adding a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	10 adding f
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	11
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	12 $ hg cp a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	13 $ hg cp f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	14 $ 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	15
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	16 $ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	17 $ hg mv b dir
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	18 $ echo g >> g
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	19 $ echo f >> f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	20 $ 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	21
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	22 $ hg mv a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	23 $ hg cp -f f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	24 $ echo a > d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	25 $ hg add d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	26 $ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	27
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	28 $ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	29 $ 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	30
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	31 $ hg log a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	32 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	33 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	34 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	35 summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	36
18340 8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	37 log on directory
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	38
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	39 $ hg log dir
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	40 changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	41 tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	42 user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	43 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	44 summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	45
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	46 changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	47 user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	48 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	49 summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	50
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	51 $ 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	52 changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	53 tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	54 user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	55 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	56 summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	57
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	58 changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	59 user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	60 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	61 summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	62
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	63
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	64 -f, directory
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	65
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	66 $ hg log -f dir
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	67 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	68 [255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	70 -f, but no args
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	71
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	72 $ hg log -f
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	73 changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	74 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	75 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	76 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	77 summary: e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	78
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	79 changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	80 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	81 date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	82 summary: d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	83
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	84 changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	85 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	86 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	87 summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	88
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	89 changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	90 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	91 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	92 summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	93
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	94 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	95 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	96 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	97 summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	98
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	99
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	100 one rename
11562 efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647) Joel Rosdahl <joel@rosdahl.net> parents: 11509 diff changeset	101
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	102 $ hg up -q 2
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	103 $ hg log -vf a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	104 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	105 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	106 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	107 files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	108 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	109 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	110
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	111
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2901 diff changeset	112
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	113 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	114
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	115 $ hg up -q tip
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	116 $ hg log -vf e
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	117 changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	118 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	119 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	120 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	121 files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	122 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	123 e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	124
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	125
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	126 changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	127 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	128 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	129 files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	130 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	131 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	132
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	133
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	134 changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	135 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	136 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	137 files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	138 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	139 b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	140
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	141
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	142 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	143 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	144 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	145 files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	146 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	147 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	148
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	149
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	150
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	151
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	152 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	153
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	154 $ hg up -q 3
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	155 $ 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	156 changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	157 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	158 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	159 summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	160
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	161 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	162 --- /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	163 +++ 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	164 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	165 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	166
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	167 changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	168 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	169 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	170 summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	171
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	172 diff -r 9161b9aeaf16 -r d89b0a12d229 b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	173 --- /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	174 +++ 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	175 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	176 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	177
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	178 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	179 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	180 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	181 summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	182
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	183 diff -r 000000000000 -r 9161b9aeaf16 a
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	184 --- /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	185 +++ 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	186 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	187 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	188
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	189
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	190 log -vf dir/b
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	191
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	192 $ 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	193 changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	194 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	195 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	196 files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	197 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	198 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	199
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	200
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	201 changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	202 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	203 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	204 files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	205 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	206 b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	207
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	208
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	209 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	210 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	211 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	212 files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	213 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	214 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	215
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	216
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	217
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	218
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	219 -f and multiple filelog heads
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	220
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	221 $ hg up -q 2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	222 $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	223 2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	224 1
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	225 0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	226 $ hg up -q tip
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	227 $ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	228 3
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	229 2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	230 0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	231
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	232
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	233 log copies with --copies
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	234
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	235 $ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	236 4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	237 3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	238 2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	239 1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	240 0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	241
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	242 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	243
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	244 $ 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	245 4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	246 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	247 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	248 1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	249 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	250
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	251 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	252
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	253 $ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	254 4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	255 3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	256 2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	257 1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	258 0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	259
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	260
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	261 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	262
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	263 $ hg log -vC -r4
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	264 changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	265 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	266 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	267 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	268 files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	269 copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	270 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	271 e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	272
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	273
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	274 $ 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	275 changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	276 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	277 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	278 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	279 files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	280 copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	281 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	282 e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	283
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	284
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	285
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	286
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	287 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	288
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	289 $ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	290 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	291 $ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	292 $ echo foo > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	293 $ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	294 adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	295 created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	296 $ 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	297 5 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	298
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	299
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	300 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	301
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	302 #if execbit
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	303 $ chmod +x e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	304 $ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	305 $ 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	306 6
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	307 #endif
9421 c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805) Christian Ebert <blacktrash@gmx.net> parents: 9373 diff changeset	308
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	309
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	310 log -p d
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10776 diff changeset	311
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	312 $ hg log -pv d
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	313 changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	314 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	315 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	316 files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	317 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	318 d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	319
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	320
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	321 diff -r f8954cd4dc1f -r 2ca5ba701980 d
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	322 --- /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	323 +++ 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	324 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	325 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	326
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 10960 diff changeset	327
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	328
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	329 log --removed file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	330
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	331 $ 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	332 changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	333 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	334 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	335 files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	336 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	337 d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	338
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	339
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	340 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	341 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	342 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	343 files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	344 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	345 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	346
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	347
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	348
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	349 log --removed revrange file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	350
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	351 $ 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	352 changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	353 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	354 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	355 files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	356 description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	357 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	358
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	359
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	360 $ cd ..
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	361
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	362 log --follow tests
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	363
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	364 $ 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	365 $ cd follow
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	366
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	367 $ echo base > base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	368 $ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	369 adding base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	370
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	371 $ echo r1 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	372 $ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	373 $ echo r2 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	374 $ 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	375
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	376 $ hg up -C 1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	377 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	378 $ echo b1 > b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	379 $ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	380 adding b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	381 created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	382
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	383
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	384 log -f
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	385
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	386 $ hg log -f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	387 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	388 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	389 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	390 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	391 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	392 summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	393
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	394 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	395 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	396 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	397 summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	398
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	399 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	400 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	401 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	402 summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	403
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	404
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	405
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	406 log -f -r 1:tip
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	407
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	408 $ hg up -C 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	409 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	410 $ echo b2 > b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	411 $ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	412 adding b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	413 created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	414 $ hg log -f -r 1:tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	415 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	416 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	417 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	418 summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	419
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	420 changeset: 2:60c670bf5b30
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	421 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	422 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	423 summary: r2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	424
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	425 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	426 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	427 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	428 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	429 summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	430
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	431
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	432
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	433 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	434
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	435 $ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	436 2 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	437 $ hg merge tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	438 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	439 (branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	440 $ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	441 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	442 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	443 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	444 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	445 summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	446
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	447
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	448
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	449 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	450
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	451 $ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	452 $ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	453 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	454 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	455 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	456 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	457 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	458 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	459 summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	460
11508 fbab0875fd09 log: fix missing diff output for hg log -p in sub directory Yuya Nishihara <yuya@tcha.org> parents: 11141 diff changeset	461
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	462 $ echo postm >> b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	463 $ 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	464
2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	465
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	466 log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	467
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	468 $ hg log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	469 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	470 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	471 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	472 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	473 summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	474
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	475 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	476 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	477 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	478 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	479 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	480 summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	481
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	482 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	483 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	484 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	485 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	486 summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	487
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	488 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	489 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	490 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	491 summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	492
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	493 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	494 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	495 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	496 summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	497
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	498
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	499
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	500 log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	501
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	502 $ hg log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	503 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	504 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	505 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	506 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	507 summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	508
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	509 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	510 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	511 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	512 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	513 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	514 summary: m12
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 changeset: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	517 parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	518 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	519 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	520 summary: b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	521
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	522 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	523 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	524 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	525 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	526 summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	527
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	528
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	529
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	530 log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	531
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	532 $ hg log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	533 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	534 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	535 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	536 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	537 summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	538
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	539 diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	540 --- a/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	541 +++ b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	542 @@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	543 b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	544 +postm
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	545
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	546
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	547
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	548 log -r ""
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	549
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	550 $ hg log -r ''
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	551 hg: parse error: empty query
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	552 [255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	553
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	554 log -r <some unknown node id>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	555
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	556 $ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	557 abort: unknown revision '1000000000000000000000000000000000000000'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	558 [255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	559
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	560 log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	561
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	562 $ hg log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	563 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	564 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	565 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	566 summary: r1
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 log -p -l2 --color=always
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	569
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	570 $ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	571 > 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	572 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	573 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	574 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	575 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	576 summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	577
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	578 \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	579 \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	580 \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	581 \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	582 b1
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	583 \x1b[0;32m+postm\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	584
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	585 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	586 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	587 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	588 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	589 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	590 summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	591
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	592 \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	593 \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	594 \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	595 \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	596 \x1b[0;32m+b2\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	597
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	598
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	599
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	600 log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	601
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	602 $ hg log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	603 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	604 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	605 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	606 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	607 summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	608
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	609 b1 \| 1 +
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	610 1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	611
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	612
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	613 $ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	614
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	615
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	616 User
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	617
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	618 $ hg init usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	619 $ cd usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	620
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	621 $ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	622 $ 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	623 adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	624 $ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	625 $ 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	626 adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	627
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	628 $ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	629 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	630 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	631 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	632 summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	633
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	634 $ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	635 changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	636 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	637 user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	638 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	639 summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	640
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	641 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	642 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	643 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	644 summary: a
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 $ hg log -u "user3"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	647
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	648 $ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	649
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	650 $ hg init branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	651 $ cd branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	652
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	653 $ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	654 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	655 adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	656 $ hg branch test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	657 marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14645 diff changeset	658 (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	659 $ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	660 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	661 adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	662
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	663 $ hg up default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	664 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	665 $ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	666 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	667 adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	668 $ hg up test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	669 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	670 $ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	671 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	672 adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	673
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	674
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	675 log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	676
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	677 $ hg log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	678 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	679 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	680 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	681 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	682 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	683
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	684 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	685 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	686 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	687 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	688
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	689
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	690
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	691 log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	692
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	693 $ hg log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	694 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	695 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	696 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	697 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	698 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	699 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	700 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	701
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	702 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	703 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	704 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	705 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	706 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	707
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	708
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	709
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	710 log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	711
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	712 $ hg log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	713 abort: unknown revision 'dummy'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	714 [255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	715
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	716
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	717 log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	718
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	719 $ hg log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	720 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	721 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	722 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	723 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	724 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	725 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	726 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	727
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	728 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	729 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	730 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	731 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	732 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	733
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	734
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	735
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	736 log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	737
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	738 $ hg log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	739 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	740 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	741 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	742 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	743 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	744 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	745 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	746
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	747 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	748 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	749 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	750 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	751 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	752
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	753 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	754 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	755 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	756 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	757 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	758
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	759 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	760 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	761 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	762 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	763
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	764
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	765
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	766 log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	767
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	768 $ hg log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	769 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	770 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	771 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	772 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	773 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	774 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	775 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	776
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	777 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	778 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	779 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	780 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	781 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	782
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	783 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	784 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	785 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	786 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	787 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	788
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	789 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	790 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	791 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	792 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	793
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	794
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	795
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	796 log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	797
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	798 $ hg log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	799 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	800 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	801 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	802 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	803 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	804 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	805 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	806
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	807 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	808 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	809 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	810 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	811 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	812
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	813
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	814
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	815 log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	816
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	817 $ hg log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	818 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	819 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	820 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	821 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	822 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	823
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	824 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	825 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	826 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	827 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	828
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	829
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	830
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	831 log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	832
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	833 $ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	834 $ hg log -p --cwd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	835 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	836 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	837 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	838 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	839 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	840 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	841 summary: commit on test
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 diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	844 --- /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	845 +++ 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	846 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	847 +c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	848
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	849 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	850 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	851 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	852 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	853 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	854
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	855 diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	856 --- /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	857 +++ 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	858 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	859 +c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	860
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	861 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	862 branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	863 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	864 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	865 summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	866
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	867 diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	868 --- /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	869 +++ 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	870 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	871 +b
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 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	874 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	875 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	876 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	877
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	878 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	879 --- /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	880 +++ 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	881 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	882 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	883
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	884
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	885
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	886 log -p -R repo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	887
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	888 $ cd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	889 $ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	890 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	891 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	892 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	893 summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	894
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	895 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	896 --- /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	897 +++ 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	898 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	899 +a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	900
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	901
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	902 $ cd ../..
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 $ hg init follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	905 $ cd follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	906
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	907 # 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	908 # 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	909 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	910 # 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	911 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	912 # o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	913 #
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	914 # 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	915 # "x" is a revision without "foo"
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	916
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	917 $ touch init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	918 $ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	919 adding init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	920 $ echo 'foo' > init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	921 $ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	922 $ echo 'foo' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	923 $ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	924 adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	925 $ hg rm foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	926 $ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	927 $ echo 'related' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	928 $ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	929 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	930
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	931 $ hg up 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	932 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	933 $ touch branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	934 $ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	935 adding branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	936 created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	937 $ touch foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	938 $ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	939 adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	940 $ echo 'change' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	941 $ hg ci -m "change foo, related"
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 $ hg up 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	944 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	945 $ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	946 $ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	947 created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	948 $ hg merge 7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	949 merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	950 warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15442 diff changeset	951 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	952 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	953 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	954 [1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	955 $ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	956 $ hg resolve -m foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	957 $ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	958
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	959 $ hg merge 4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	960 merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	961 warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15442 diff changeset	962 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	963 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	964 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	965 [1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	966 $ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	967 $ hg resolve -m foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	968 $ 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	969
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 16923 diff changeset	970 $ hg log --graph
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	971 @ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	972 \|\ tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	973 \| \| parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	974 \| \| parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	975 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	976 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	977 \| \| summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	978 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	979 \| o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	980 \| \|\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	981 \| \| \| parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	982 \| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	983 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	984 \| \| \| summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	985 \| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	986 \| \| o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	987 \| \| \| parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	988 \| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	989 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	990 \| \| \| summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	991 \| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	992 \| o \| changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	993 \| \|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	994 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	995 \| \| summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	996 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	997 \| o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	998 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	999 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1000 \| \| summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1001 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1002 \| o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1003 \| \| parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1004 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1005 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1006 \| \| summary: first branch, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1007 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1008 o \| changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1009 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1010 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1011 \| \| summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1012 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1013 o \| changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1014 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1015 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1016 \| \| summary: delete foo, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1017 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1018 o \| changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1019 \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1020 \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1021 \| \| summary: add unrelated old foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1022 \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1023 o \| changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1024 \|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1025 \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1026 \| summary: change, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1027 \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1028 o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1029 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1030 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1031 summary: init, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1032
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1033
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1034 $ hg --traceback log -f foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1035 changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1036 tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1037 parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1038 parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1039 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1040 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1041 summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1042
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1043 changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1044 parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1045 parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1046 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1047 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1048 summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1049
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1050 changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1051 parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1052 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1053 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1054 summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1055
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1056 changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1057 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1058 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1059 summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1060
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1061 changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1062 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1063 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1064 summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1065
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1066 changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1067 user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1068 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1069 summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1070
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1071
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1072 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	1073
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1074 $ 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	1075 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	1076 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	1077 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	1078 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	1079
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1080 $ 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	1081
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12383 diff changeset	1082 Issue2383: hg log showing _less_ differences than hg diff
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1083
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1084 $ hg init issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1085 $ cd issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1086
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1087 Create a test repo:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1088
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1089 $ echo a > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1090 $ hg ci -Am0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1091 adding a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1092 $ echo b > b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1093 $ hg ci -Am1
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1094 adding b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1095 $ hg co 0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1096 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	1097 $ echo b > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1098 $ hg ci -m2
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1099 created new head
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1100
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1101 Merge:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1102
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1103 $ hg merge
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1104 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	1105 (branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1106
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1107 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	1108
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1109 $ echo c > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1110 $ hg ci -m3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1111
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1112 Two files shown here in diff:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1113
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1114 $ hg diff --rev 2:3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1115 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1116 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1117 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1118 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1119 -b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1120 +c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1121 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1122 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1123 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1124 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1125 +b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1126
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1127 Diff here should be the same:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1128
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1129 $ hg log -vpr 3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1130 changeset: 3:8e07aafe1edc
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1131 tag: tip
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1132 parent: 2:b09be438c43a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1133 parent: 1:925d80f479bb
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1134 user: test
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1135 date: Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1136 files: a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1137 description:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1138 3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1139
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1140
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1141 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1142 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1143 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1144 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1145 -b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1146 +c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1147 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1148 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1149 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1150 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1151 +b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1152
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1153 $ 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	1154
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1155 '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	1156
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1157 $ 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	1158 $ 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	1159 $ 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	1160 $ 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	1161 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	1162 $ 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	1163 $ 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	1164
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1165 $ 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	1166 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	1167 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	1168 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	1169 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	1170
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1171 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	1172
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1173 $ cat > ${TESTTMP}/obs.py << EOF
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1174 > import mercurial.obsolete
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1175 > mercurial.obsolete._enabled = True
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1176 > EOF
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1177 $ echo '[extensions]' >> $HGRCPATH
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1178 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1179
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1180 $ 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	1181 1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1182 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1183 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1184 $ 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	1185 $ 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	1186 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1187 $ 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	1188 1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1189 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1190
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1191 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	1192
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18250 diff changeset	1193 $ 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	1194 $ 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	1195 1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1196 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1197
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1198 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	1199
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1200 $ 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	1201 $ 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	1202 1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1203 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1204
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1205 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	1206 $ echo '[extensions]' >> $HGRCPATH
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1207 $ 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	1208 $ cd ..
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1209
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1210 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	1211 # 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	1212 # 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	1213 # 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	1214
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1215 $ 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	1216 $ 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	1217
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1218 $ python > setup.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1219 > print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1220 > 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	1221 > 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	1222 > 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	1223 > 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	1224 > 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	1225 > 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	1226 > 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	1227 > 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	1228 > hg --encoding utf-8 commit -u none -m '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1229 > '''.encode('utf-8')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1230 > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1231 $ 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	1232
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1233 test in 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	1234 $ python > test.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1235 > print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1236 > 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	1237 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1238 > 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	1239 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1240 > 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	1241 > echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1242 > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1243 > '''.encode('cp932')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1244 > EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1245 $ 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	1246 0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1247 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1248 1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1249 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1250 2
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1251 0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1252 ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1253 3
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1254 1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1255
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1256 $ cd ..
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1257
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1258 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	1259 $ hg init issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1260 $ cd issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1261 $ 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	1262 $ echo 1 > d1/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1263 $ echo 1 > D2/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1264 $ echo 1 > D3.i/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1265 $ echo 1 > d4.hg/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1266 $ echo 1 > d5.d/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1267 $ 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	1268 $ hg -q add .
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1269 $ hg commit -m "a bunch of weird directories"
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1270 $ hg log -l1 d1/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1271 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1272 $ hg log -l1 f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1273 $ hg log -l1 . \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1274 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1275 $ hg log -l1 ./ \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1276 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1277 $ hg log -l1 d1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1278 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1279 $ hg log -l1 D2 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1280 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1281 $ hg log -l1 D2/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1282 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1283 $ hg log -l1 D3.i \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1284 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1285 $ hg log -l1 D3.i/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1286 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1287 $ hg log -l1 d4.hg \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1288 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1289 $ hg log -l1 d4.hg/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1290 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1291 $ hg log -l1 d5.d \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1292 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1293 $ hg log -l1 d5.d/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1294 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1295 $ hg log -l1 .d6 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1296 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1297 $ hg log -l1 .d6/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1298 changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1299 $ cd ..

Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-log.t @ 18426:01638b51df44