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

annotate tests/test-annotate.t @ 39883:3e896b51aa5d

storageutil: move metadata parsing and packing from revlog (API) Parsing and writing of revision text metadata is likely identical across storage backends. Let's move the code out of revlog so we don't need to import the revlog module in order to use it. Differential Revision: https://phab.mercurial-scm.org/D4754

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 24 Sep 2018 14:31:31 -0700
parents	ddca38941b2b
children	47cb6750dea3

rev	line source
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	1 $ HGMERGE=true; export HGMERGE
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	2
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	3 init
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	4
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	5 $ hg init repo
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	6 $ cd repo
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	7
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	8 commit
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	9
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	10 $ echo 'a' > a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	11 $ hg ci -A -m test -u nobody -d '1 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	12 adding a
4365 46280c004f22 change tests to use simplemerge by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3405 diff changeset	13
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	14 annotate -c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	15
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	16 $ hg annotate -c a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	17 8435f90966e4: a
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	18
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	19 annotate -cl
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	20
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	21 $ hg annotate -cl a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	22 8435f90966e4:1: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	23
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	24 annotate -d
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	25
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	26 $ hg annotate -d a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	27 Thu Jan 01 00:00:01 1970 +0000: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	28
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	29 annotate -n
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	30
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	31 $ hg annotate -n a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	32 0: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	33
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	34 annotate -nl
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	35
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	36 $ hg annotate -nl a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	37 0:1: a
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4659 diff changeset	38
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	39 annotate -u
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	40
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	41 $ hg annotate -u a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	42 nobody: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	43
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	44 annotate -cdnu
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	45
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	46 $ hg annotate -cdnu a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	47 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	48
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	49 annotate -cdnul
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	50
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	51 $ hg annotate -cdnul a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	52 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	53
22480 dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	54 annotate (JSON)
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	55
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	56 $ hg annotate -Tjson a
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	57 [
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	58 {
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	59 "lines": [{"line": "a\n", "rev": 0}],
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	60 "path": "a"
22480 dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	61 }
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	62 ]
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	63
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	64 $ hg annotate -Tjson -cdfnul a
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	65 [
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	66 {
39396 34ba47117164 formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC) Yuya Nishihara <yuya@tcha.org> parents: 38451 diff changeset	67 "lines": [{"date": [1.0, 0], "line": "a\n", "line_number": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "path": "a", "rev": 0, "user": "nobody"}],
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	68 "path": "a"
22480 dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	69 }
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	70 ]
dff638170c48 annotate: port to generic templater enabled by hidden -T option Yuya Nishihara <yuya@tcha.org> parents: 18993 diff changeset	71
36988 66e64681e0a8 annotate: add support for template keywords and functions depending on ctx Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	72 log-like templating
66e64681e0a8 annotate: add support for template keywords and functions depending on ctx Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	73
66e64681e0a8 annotate: add support for template keywords and functions depending on ctx Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	74 $ hg annotate -T'{lines % "{rev} {node\|shortest}: {line}"}' a
66e64681e0a8 annotate: add support for template keywords and functions depending on ctx Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	75 0 8435: a
66e64681e0a8 annotate: add support for template keywords and functions depending on ctx Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	76
38364 57dc72b56b6c annotate: automatically populate fields referenced from template Yuya Nishihara <yuya@tcha.org> parents: 37502 diff changeset	77 '{line_number}' field should be populated as necessary
57dc72b56b6c annotate: automatically populate fields referenced from template Yuya Nishihara <yuya@tcha.org> parents: 37502 diff changeset	78
57dc72b56b6c annotate: automatically populate fields referenced from template Yuya Nishihara <yuya@tcha.org> parents: 37502 diff changeset	79 $ hg annotate -T'{lines % "{rev}:{line_number}: {line}"}' a
57dc72b56b6c annotate: automatically populate fields referenced from template Yuya Nishihara <yuya@tcha.org> parents: 37502 diff changeset	80 0:1: a
38451 5b04a0c30f3f formatter: look for template symbols from the associated name Yuya Nishihara <yuya@tcha.org> parents: 38364 diff changeset	81 $ hg annotate -Ta a \
5b04a0c30f3f formatter: look for template symbols from the associated name Yuya Nishihara <yuya@tcha.org> parents: 38364 diff changeset	82 > --config templates.a='"{lines % "{rev}:{line_number}: {line}"}"'
5b04a0c30f3f formatter: look for template symbols from the associated name Yuya Nishihara <yuya@tcha.org> parents: 38364 diff changeset	83 0:1: a
38364 57dc72b56b6c annotate: automatically populate fields referenced from template Yuya Nishihara <yuya@tcha.org> parents: 37502 diff changeset	84
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	85 $ cat <<EOF >>a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	86 > a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	87 > a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	88 > EOF
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	89 $ hg ci -ma1 -d '1 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	90 $ hg cp a b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	91 $ hg ci -mb -d '1 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	92 $ cat <<EOF >> b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	93 > b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	94 > b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	95 > b6
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	96 > EOF
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	97 $ hg ci -mb2 -d '2 0'
2923 cd47230a4eb9 tests: new test for "hg annotate" Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	98
37500 8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	99 default output of '{lines}' should be readable
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	100
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	101 $ hg annotate -T'{lines}' a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	102 0: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	103 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	104 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	105 $ hg annotate -T'{join(lines, "\n")}' a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	106 0: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	107
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	108 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	109
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	110 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	111
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	112 several filters can be applied to '{lines}'
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	113
37502 40c7347f6848 formatter: remove template resources from nested items before generating JSON Yuya Nishihara <yuya@tcha.org> parents: 37500 diff changeset	114 $ hg annotate -T'{lines\|json}\n' a
40c7347f6848 formatter: remove template resources from nested items before generating JSON Yuya Nishihara <yuya@tcha.org> parents: 37500 diff changeset	115 [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}]
37500 8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	116 $ hg annotate -T'{lines\|stringify}' a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	117 0: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	118 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	119 1: a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	120 $ hg annotate -T'{lines\|count}\n' a
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	121 3
8bb3899a0f47 formatter: make nested items somewhat readable in template output Yuya Nishihara <yuya@tcha.org> parents: 37282 diff changeset	122
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	123 annotate multiple files (JSON)
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	124
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	125 $ hg annotate -Tjson a b
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	126 [
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	127 {
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	128 "lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}],
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	129 "path": "a"
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	130 },
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	131 {
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	132 "lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}, {"line": "b4\n", "rev": 3}, {"line": "b5\n", "rev": 3}, {"line": "b6\n", "rev": 3}],
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	133 "path": "b"
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	134 }
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	135 ]
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	136
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	137 annotate multiple files (template)
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	138
39396 34ba47117164 formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC) Yuya Nishihara <yuya@tcha.org> parents: 38451 diff changeset	139 $ hg annotate -T'== {path} ==\n{lines % "{rev}: {line}"}' a b
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	140 == a ==
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	141 0: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	142 1: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	143 1: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	144 == b ==
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	145 0: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	146 1: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	147 1: a
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	148 3: b4
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	149 3: b5
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	150 3: b6
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	151
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	152 annotate -n b
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 2925 diff changeset	153
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	154 $ hg annotate -n b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	155 0: a
30440 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 29667 diff changeset	156 1: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	157 1: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	158 3: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	159 3: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	160 3: b6
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	161
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	162 annotate --no-follow b
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4659 diff changeset	163
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	164 $ hg annotate --no-follow b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	165 2: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	166 2: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	167 2: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	168 3: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	169 3: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	170 3: b6
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	171
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	172 annotate -nl b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	173
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	174 $ hg annotate -nl b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	175 0:1: a
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	176 1:2: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	177 1:3: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	178 3:4: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	179 3:5: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	180 3:6: b6
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	181
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	182 annotate -nf b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	183
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	184 $ hg annotate -nf b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	185 0 a: a
30440 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 29667 diff changeset	186 1 a: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	187 1 a: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	188 3 b: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	189 3 b: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	190 3 b: b6
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	191
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	192 annotate -nlf b
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 2925 diff changeset	193
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	194 $ hg annotate -nlf b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	195 0 a:1: a
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	196 1 a:2: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	197 1 a:3: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	198 3 b:4: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	199 3 b:5: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	200 3 b:6: b6
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 2925 diff changeset	201
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	202 $ hg up -C 2
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	204 $ cat <<EOF >> b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	205 > b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	206 > c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	207 > b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	208 > EOF
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	209 $ hg ci -mb2.1 -d '2 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	210 created new head
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	211 $ hg merge
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	212 merging b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	213 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	214 (branch merge, don't forget to commit)
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	215 $ hg ci -mmergeb -d '3 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	216
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	217 annotate after merge
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	218
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	219 $ hg annotate -nf b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	220 0 a: a
30440 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 29667 diff changeset	221 1 a: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	222 1 a: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	223 3 b: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	224 4 b: c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	225 3 b: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	226
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	227 annotate after merge with -l
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	228
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	229 $ hg annotate -nlf b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	230 0 a:1: a
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	231 1 a:2: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	232 1 a:3: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	233 3 b:4: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	234 4 b:5: c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	235 3 b:5: b5
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 2925 diff changeset	236
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	237 $ hg up -C 1
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	238 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	239 $ hg cp a b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	240 $ cat <<EOF > b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	241 > a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	242 > z
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	243 > a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	244 > EOF
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	245 $ hg ci -mc -d '3 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	246 created new head
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	247 $ hg merge
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	248 merging b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	249 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	250 (branch merge, don't forget to commit)
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	251 $ cat <<EOF >> b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	252 > b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	253 > c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	254 > b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	255 > EOF
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	256 $ echo d >> b
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	257 $ hg ci -mmerge2 -d '4 0'
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	258
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	259 annotate after rename merge
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	260
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	261 $ hg annotate -nf b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	262 0 a: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	263 6 b: z
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	264 1 a: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	265 3 b: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	266 4 b: c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	267 3 b: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	268 7 b: d
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	269
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	270 annotate after rename merge with -l
3405 2e1d8b238b6c Test annotate using named rev instead of linkrev Brendan Cully <brendan@kublai.com> parents: 3202 diff changeset	271
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	272 $ hg annotate -nlf b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	273 0 a:1: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	274 6 b:2: z
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	275 1 a:3: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	276 3 b:4: b4
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	277 4 b:5: c
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	278 3 b:5: b5
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	279 7 b:7: d
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	280
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	281 --skip nothing (should be the same as no --skip at all)
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	282
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	283 $ hg annotate -nlf b --skip '1::0'
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	284 0 a:1: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	285 6 b:2: z
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	286 1 a:3: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	287 3 b:4: b4
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	288 4 b:5: c
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	289 3 b:5: b5
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	290 7 b:7: d
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	291
32787 e5dd44f78ac6 tests: handle variation between pure and normal output in annotate --skip Augie Fackler <raf@durin42.com> parents: 32672 diff changeset	292 --skip a modified line. Note a slight behavior difference in pure - this is
e5dd44f78ac6 tests: handle variation between pure and normal output in annotate --skip Augie Fackler <raf@durin42.com> parents: 32672 diff changeset	293 because the pure code comes up with slightly different deltas internally.
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	294
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	295 $ hg annotate -nlf b --skip 6
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	296 0 a:1: a
34487 323bed58cf57 test-annotate: fix up expected output for pure Augie Fackler <augie@google.com> parents: 34435 diff changeset	297 1 a:2* z (no-pure !)
323bed58cf57 test-annotate: fix up expected output for pure Augie Fackler <augie@google.com> parents: 34435 diff changeset	298 0 a:1* z (pure !)
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	299 1 a:3: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	300 3 b:4: b4
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	301 4 b:5: c
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	302 3 b:5: b5
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	303 7 b:7: d
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	304
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	305 --skip added lines (and test multiple skip)
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	306
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	307 $ hg annotate -nlf b --skip 3
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	308 0 a:1: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	309 6 b:2: z
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	310 1 a:3: a
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	311 1 a:3* b4
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	312 4 b:5: c
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	313 1 a:3* b5
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	314 7 b:7: d
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	315
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	316 $ hg annotate -nlf b --skip 4
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	317 0 a:1: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	318 6 b:2: z
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	319 1 a:3: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	320 3 b:4: b4
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	321 1 a:3* c
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	322 3 b:5: b5
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	323 7 b:7: d
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	324
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	325 $ hg annotate -nlf b --skip 3 --skip 4
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	326 0 a:1: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	327 6 b:2: z
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	328 1 a:3: a
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	329 1 a:3* b4
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	330 1 a:3* c
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	331 1 a:3* b5
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	332 7 b:7: d
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	333
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	334 $ hg annotate -nlf b --skip 'merge()'
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	335 0 a:1: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	336 6 b:2: z
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	337 1 a:3: a
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	338 3 b:4: b4
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	339 4 b:5: c
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	340 3 b:5: b5
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	341 3 b:5* d
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	342
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	343 --skip everything -- use the revision the file was introduced in
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	344
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	345 $ hg annotate -nlf b --skip 'all()'
1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	346 0 a:1: a
34435 884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	347 0 a:1* z
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	348 0 a:1* a
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	349 0 a:1* b4
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	350 0 a:1* c
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	351 0 a:1* b5
884b595f5195 annotate: mark lines affected by skip-annotate with * Siddharth Agarwal <sid0@fb.com> parents: 33961 diff changeset	352 0 a:1* d
32519 1df80eff24cf annotate: add a new experimental --skip option to skip revs Siddharth Agarwal <sid0@fb.com> parents: 32085 diff changeset	353
14358 bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	354 Issue2807: alignment of line numbers with -l
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	355
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	356 $ echo more >> b
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	357 $ hg ci -mmore -d '5 0'
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	358 $ echo more >> b
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	359 $ hg ci -mmore -d '6 0'
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	360 $ echo more >> b
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	361 $ hg ci -mmore -d '7 0'
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	362 $ hg annotate -nlf b
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	363 0 a: 1: a
14358 bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	364 6 b: 2: z
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	365 1 a: 3: a
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	366 3 b: 4: b4
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	367 4 b: 5: c
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	368 3 b: 5: b5
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	369 7 b: 7: d
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	370 8 b: 8: more
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	371 9 b: 9: more
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	372 10 b:10: more
bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	373
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	374 linkrev vs rev
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	375
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	376 $ hg annotate -r tip -n a
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	377 0: a
30440 8c0c75aa3ff4 bdiff: give slight preference to longest matches in the middle of the B side Mads Kiilerich <madski@unity3d.com> parents: 29667 diff changeset	378 1: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	379 1: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	380
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	381 linkrev vs rev with -l
4639 c7371aa0c153 test-annotate: add a test for issue 589. Patrick Mezard <pmezard@gmail.com> parents: 3405 diff changeset	382
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	383 $ hg annotate -r tip -nl a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	384 0:1: a
30441 3633403888ae bdiff: give slight preference to appending lines Mads Kiilerich <madski@unity3d.com> parents: 30440 diff changeset	385 1:2: a
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	386 1:3: a
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	387
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 11852 diff changeset	388 Issue589: "undelete" sequence leads to crash
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	389
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	390 annotate was crashing when trying to --follow something
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	391
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	392 like A -> B -> A
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	393
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	394 generate ABA rename configuration
4639 c7371aa0c153 test-annotate: add a test for issue 589. Patrick Mezard <pmezard@gmail.com> parents: 3405 diff changeset	395
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	396 $ echo foo > foo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	397 $ hg add foo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	398 $ hg ci -m addfoo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	399 $ hg rename foo bar
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	400 $ hg ci -m renamefoo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	401 $ hg rename bar foo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	402 $ hg ci -m renamebar
4639 c7371aa0c153 test-annotate: add a test for issue 589. Patrick Mezard <pmezard@gmail.com> parents: 3405 diff changeset	403
11852 b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	404 annotate after ABA with follow
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	405
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	406 $ hg annotate --follow foo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	407 foo: foo
b2f91119bf8c tests: unify test-annotate Martin Geisler <mg@lazybytes.net> parents: 10369 diff changeset	408
13697 eaee75036725 annotate: catch nonexistent files using match.bad callback (issue1590) Matt Mackall <mpm@selenic.com> parents: 12399 diff changeset	409 missing file
eaee75036725 annotate: catch nonexistent files using match.bad callback (issue1590) Matt Mackall <mpm@selenic.com> parents: 12399 diff changeset	410
eaee75036725 annotate: catch nonexistent files using match.bad callback (issue1590) Matt Mackall <mpm@selenic.com> parents: 12399 diff changeset	411 $ hg ann nosuchfile
14358 bf93e78f2638 annotate: fix alignment of columns in front of line numbers (issue2807) Thomas Arendsen Hein <thomas@intevation.de> parents: 13697 diff changeset	412 abort: nosuchfile: no such file in rev e9e6b4fa872f
13697 eaee75036725 annotate: catch nonexistent files using match.bad callback (issue1590) Matt Mackall <mpm@selenic.com> parents: 12399 diff changeset	413 [255]
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	414
15829 2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	415 annotate file without '\n' on last line
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	416
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	417 $ printf "" > c
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	418 $ hg ci -A -m test -u nobody -d '1 0'
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	419 adding c
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	420 $ hg annotate c
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	421 $ printf "a\nb" > c
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	422 $ hg ci -m test
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	423 $ hg annotate c
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	424 [0-9]+: a (re)
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	425 [0-9]+: b (re)
2c480532f36e annotate: append newline after non newline-terminated file listings Ion Savin <ion.savin@tora.com> parents: 15528 diff changeset	426
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	427 Issue3841: check annotation of the file of which filelog includes
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	428 merging between the revision and its ancestor
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	429
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	430 to reproduce the situation with recent Mercurial, this script uses (1)
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	431 "hg debugsetparents" to merge without ancestor check by "hg merge",
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	432 and (2) the extension to allow filelog merging between the revision
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	433 and its ancestor by overriding "repo._filecommit".
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	434
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	435 $ cat > ../legacyrepo.py <<EOF
33961 fa187801f4b8 tests: update test-annotate to pass our module import checker Augie Fackler <raf@durin42.com> parents: 33416 diff changeset	436 > from __future__ import absolute_import
fa187801f4b8 tests: update test-annotate to pass our module import checker Augie Fackler <raf@durin42.com> parents: 33416 diff changeset	437 > from mercurial import error, node
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	438 > def reposetup(ui, repo):
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	439 > class legacyrepo(repo.__class__):
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	440 > def _filecommit(self, fctx, manifest1, manifest2,
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	441 > linkrev, tr, changelist):
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	442 > fname = fctx.path()
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	443 > text = fctx.data()
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	444 > flog = self.file(fname)
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	445 > fparent1 = manifest1.get(fname, node.nullid)
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	446 > fparent2 = manifest2.get(fname, node.nullid)
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	447 > meta = {}
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	448 > copy = fctx.renamed()
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	449 > if copy and copy[0] != fname:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24817 diff changeset	450 > raise error.Abort('copying is not supported')
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	451 > if fparent2 != node.nullid:
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	452 > changelist.append(fname)
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	453 > return flog.add(text, meta, tr, linkrev,
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	454 > fparent1, fparent2)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24817 diff changeset	455 > raise error.Abort('only merging is supported')
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	456 > repo.__class__ = legacyrepo
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	457 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	458
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	459 $ cat > baz <<EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	460 > 1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	461 > 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	462 > 3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	463 > 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	464 > 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	465 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	466 $ hg add baz
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	467 $ hg commit -m "baz:0"
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	468
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	469 $ cat > baz <<EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	470 > 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	471 > 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	472 > 3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	473 > 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	474 > 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	475 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	476 $ hg commit -m "baz:1"
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	477
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	478 $ cat > baz <<EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	479 > 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	480 > 2 baz:2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	481 > 3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	482 > 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	483 > 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	484 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	485 $ hg debugsetparents 17 17
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	486 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:2"
37282 435481393198 tests: don't use revlog paths in tests Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	487 $ hg debugindexdot baz
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	488 digraph G {
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	489 -1 -> 0
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	490 0 -> 1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	491 1 -> 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	492 1 -> 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	493 }
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	494 $ hg annotate baz
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	495 17: 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	496 18: 2 baz:2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	497 16: 3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	498 16: 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	499 16: 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	500
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	501 $ cat > baz <<EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	502 > 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	503 > 2 baz:2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	504 > 3 baz:3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	505 > 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	506 > 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	507 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	508 $ hg commit -m "baz:3"
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	509
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	510 $ cat > baz <<EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	511 > 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	512 > 2 baz:2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	513 > 3 baz:3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	514 > 4 baz:4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	515 > 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	516 > EOF
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	517 $ hg debugsetparents 19 18
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	518 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:4"
37282 435481393198 tests: don't use revlog paths in tests Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	519 $ hg debugindexdot baz
18993 0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	520 digraph G {
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	521 -1 -> 0
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	522 0 -> 1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	523 1 -> 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	524 1 -> 2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	525 2 -> 3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	526 3 -> 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	527 2 -> 4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	528 }
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	529 $ hg annotate baz
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	530 17: 1 baz:1
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	531 18: 2 baz:2
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	532 19: 3 baz:3
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	533 20: 4 baz:4
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	534 16: 5
0fd0612dc855 annotate: increase refcount of each revisions correctly (issue3841) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17347 diff changeset	535
24421 77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	536 annotate clean file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	537
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	538 $ hg annotate -ncr "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	539 11 472b18db256d : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	540
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	541 annotate modified file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	542
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	543 $ echo foofoo >> foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	544 $ hg annotate -r "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	545 11 : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	546 20+: foofoo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	547
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	548 $ hg annotate -cr "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	549 472b18db256d : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	550 b6bedd5477e7+: foofoo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	551
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	552 $ hg annotate -ncr "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	553 11 472b18db256d : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	554 20 b6bedd5477e7+: foofoo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	555
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	556 $ hg annotate --debug -ncr "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	557 11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	558 20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	559
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	560 $ hg annotate -udr "wdir()" foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	561 test Thu Jan 01 00:00:00 1970 +0000: foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	562 test [A-Za-z0-9:+ ]+: foofoo (re)
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	563
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	564 $ hg annotate -ncr "wdir()" -Tjson foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	565 [
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	566 {
39814 ddca38941b2b annotate: pass in wdir rev and node to formatter (BC) Yuya Nishihara <yuya@tcha.org> parents: 39723 diff changeset	567 "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": "ffffffffffffffffffffffffffffffffffffffff", "rev": 2147483647}],
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	568 "path": "foo"
24421 77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	569 }
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	570 ]
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	571
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	572 annotate added file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	573
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	574 $ echo bar > bar
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	575 $ hg add bar
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	576 $ hg annotate -ncr "wdir()" bar
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	577 20 b6bedd5477e7+: bar
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	578
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	579 annotate renamed file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	580
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	581 $ hg rename foo renamefoo2
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	582 $ hg annotate -ncr "wdir()" renamefoo2
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	583 11 472b18db256d : foo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	584 20 b6bedd5477e7+: foofoo
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	585
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	586 annotate missing file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	587
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	588 $ rm baz
33341 1a4eca3b12dd test-annotate: conditionalize output instead of tests Matt Harbison <matt_harbison@yahoo.com> parents: 33284 diff changeset	589
24498 ab3a8ed7cf1d test-annotate: conditionalize error output for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24421 diff changeset	590 $ hg annotate -ncr "wdir()" baz
35239 feecfefeba25 tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages Matt Harbison <matt_harbison@yahoo.com> parents: 34487 diff changeset	591 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
feecfefeba25 tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages Matt Harbison <matt_harbison@yahoo.com> parents: 34487 diff changeset	592 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
24498 ab3a8ed7cf1d test-annotate: conditionalize error output for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24421 diff changeset	593 [255]
24421 77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	594
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	595 annotate removed file
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	596
77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	597 $ hg rm baz
33341 1a4eca3b12dd test-annotate: conditionalize output instead of tests Matt Harbison <matt_harbison@yahoo.com> parents: 33284 diff changeset	598
24498 ab3a8ed7cf1d test-annotate: conditionalize error output for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24421 diff changeset	599 $ hg annotate -ncr "wdir()" baz
35239 feecfefeba25 tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages Matt Harbison <matt_harbison@yahoo.com> parents: 34487 diff changeset	600 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
feecfefeba25 tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages Matt Harbison <matt_harbison@yahoo.com> parents: 34487 diff changeset	601 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
24498 ab3a8ed7cf1d test-annotate: conditionalize error output for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24421 diff changeset	602 [255]
24421 77881cade20e annotate: add option to annotate working-directory files Yuya Nishihara <yuya@tcha.org> parents: 23705 diff changeset	603
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	604 $ hg revert --all --no-backup --quiet
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	605 $ hg id -n
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	606 20
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	607
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	608 Test followlines() revset; we usually check both followlines(pat, range) and
5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	609 followlines(pat, range, descend=True) to make sure both give the same result
5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	610 when they should.
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	611
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	612 $ echo a >> foo
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	613 $ hg ci -m 'foo: add a'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	614 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	615 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	616 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	617 20: baz:4
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	618 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=20)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	619 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	620 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	621 20: baz:4
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	622 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	623 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	624 19: baz:3
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	625 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=True)'
31992 3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	626 19: baz:3
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	627 20: baz:4
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	628 $ printf "0\n0\n" \| cat - baz > baz1
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	629 $ mv baz1 baz
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	630 $ hg ci -m 'added two lines with 0'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	631 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	632 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	633 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	634 20: baz:4
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	635 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=true, startrev=19)'
31992 3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	636 19: baz:3
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	637 20: baz:4
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	638 $ echo 6 >> baz
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	639 $ hg ci -m 'added line 8'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	640 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	641 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	642 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	643 20: baz:4
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	644 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=1)'
31992 3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	645 19: baz:3
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	646 20: baz:4
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	647 $ sed 's/3/3+/' baz > baz.new
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	648 $ mv baz.new baz
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	649 $ hg ci -m 'baz:3->3+'
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	650 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, descend=0)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	651 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	652 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	653 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	654 24: baz:3->3+
31992 3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	655 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)'
3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	656 19: baz:3
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	657 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	658 24: baz:3->3+
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	659 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2, descend=false)'
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	660 22: added two lines with 0
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	661
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	662 file patterns are okay
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	663 $ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)'
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	664 22: added two lines with 0
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	665
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	666 renames are followed
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	667 $ hg mv baz qux
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	668 $ sed 's/4/4+/' qux > qux.new
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	669 $ mv qux.new qux
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	670 $ hg ci -m 'qux:4->4+'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	671 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	672 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	673 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	674 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	675 24: baz:3->3+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	676 25: qux:4->4+
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	677
5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	678 but are missed when following children
5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	679 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=22, descend=True)'
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	680 24: baz:3->3+
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	681
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	682 merge
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	683 $ hg up 24 --quiet
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	684 $ echo 7 >> baz
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	685 $ hg ci -m 'one more line, out of line range'
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	686 created new head
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	687 $ sed 's/3+/3-/' baz > baz.new
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	688 $ mv baz.new baz
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	689 $ hg ci -m 'baz:3+->3-'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	690 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	691 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	692 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	693 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	694 24: baz:3->3+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	695 27: baz:3+->3-
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	696 $ hg merge 25
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	697 merging baz and qux to qux
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	698 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	699 (branch merge, don't forget to commit)
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	700 $ hg ci -m merge
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	701 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	702 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	703 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	704 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	705 24: baz:3->3+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	706 25: qux:4->4+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	707 27: baz:3+->3-
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	708 28: merge
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	709 $ hg up 25 --quiet
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	710 $ hg merge 27
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	711 merging qux and baz to qux
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	712 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	713 (branch merge, don't forget to commit)
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	714 $ hg ci -m 'merge from other side'
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	715 created new head
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	716 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	717 16: baz:0
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	718 19: baz:3
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	719 20: baz:4
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	720 24: baz:3->3+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	721 25: qux:4->4+
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	722 27: baz:3+->3-
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	723 29: merge from other side
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	724 $ hg up 24 --quiet
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	725
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	726 we are missing the branch with rename when following children
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	727 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=26, descend=True)'
befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	728 27: baz:3+->3-
31938 5e3b49defbff revset: add a 'descend' argument to followlines to return descendants Denis Laxalde <denis.laxalde@logilab.fr> parents: 30804 diff changeset	729
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	730 we follow all branches in descending direction
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	731 $ hg up 23 --quiet
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	732 $ sed 's/3/+3/' baz > baz.new
4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	733 $ mv baz.new baz
4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	734 $ hg ci -m 'baz:3->+3'
4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	735 created new head
31991 55987fc8aba1 context: add an assertion checking linerange consistency in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31955 diff changeset	736 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 2:5, startrev=16, descend=True)' --graph
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	737 @ 30: baz:3->+3
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	738 :
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	739 : o 27: baz:3+->3-
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	740 : :
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	741 : o 24: baz:3->3+
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	742 :/
4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	743 o 20: baz:4
4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	744 \|\
31991 55987fc8aba1 context: add an assertion checking linerange consistency in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31955 diff changeset	745 \| o 19: baz:3
55987fc8aba1 context: add an assertion checking linerange consistency in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31955 diff changeset	746 \|/
31992 3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	747 o 18: baz:2
3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	748 :
3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	749 o 16: baz:0
3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	750 \|
3e47a40d7a7a context: possibly yield initial fctx in blockdescendants() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31991 diff changeset	751 ~
31955 4c2c30bc38b4 context: follow all branches in blockdescendants() Denis Laxalde <denis@laxalde.org> parents: 31938 diff changeset	752
33284 b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	753 Issue5595: on a merge changeset with different line ranges depending on
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	754 parent, be conservative and use the surrounding interval to avoid loosing
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	755 track of possible further descendants in specified range.
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	756
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	757 $ hg up 23 --quiet
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	758 $ hg cat baz -r 24
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	759 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	760 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	761 1 baz:1
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	762 2 baz:2
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	763 3+ baz:3
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	764 4 baz:4
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	765 5
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	766 6
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	767 $ cat > baz << EOF
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	768 > 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	769 > 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	770 > a
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	771 > b
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	772 > 3+ baz:3
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	773 > 4 baz:4
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	774 > y
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	775 > z
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	776 > EOF
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	777 $ hg ci -m 'baz: mostly rewrite with some content from 24'
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	778 created new head
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	779 $ hg merge --tool :merge-other 24
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	780 merging baz
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	781 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	782 (branch merge, don't forget to commit)
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	783 $ hg ci -m 'merge forgetting about baz rewrite'
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	784 $ cat > baz << EOF
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	785 > 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	786 > 0
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	787 > 1 baz:1
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	788 > 2+ baz:2
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	789 > 3+ baz:3
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	790 > 4 baz:4
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	791 > 5
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	792 > 6
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	793 > EOF
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	794 $ hg ci -m 'baz: narrow change (2->2+)'
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	795 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:4, startrev=20, descend=True)' --graph
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	796 @ 33: baz: narrow change (2->2+)
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	797 \|
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	798 o 32: merge forgetting about baz rewrite
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	799 \|\
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	800 \| o 31: baz: mostly rewrite with some content from 24
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	801 \| :
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	802 \| : o 30: baz:3->+3
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	803 \| :/
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	804 +---o 27: baz:3+->3-
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	805 \| :
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	806 o : 24: baz:3->3+
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	807 :/
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	808 o 20: baz:4
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	809 \|\
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	810 ~ ~
b2670290eab4 followlines: join merge parents line ranges in blockdescendants() (issue5595) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32787 diff changeset	811
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	812 check error cases
32063 befefdd34cf8 context: start walking from "introrev" in blockancestors() Denis Laxalde <denis@laxalde.org> parents: 31998 diff changeset	813 $ hg up 24 --quiet
30754 26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	814 $ hg log -r 'followlines()'
26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	815 hg: parse error: followlines takes at least 1 positional arguments
26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	816 [255]
26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	817 $ hg log -r 'followlines(baz)'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	818 hg: parse error: followlines requires a line range
30754 26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	819 [255]
26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	820 $ hg log -r 'followlines(baz, 1)'
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	821 hg: parse error: followlines expects a line range
30754 26209cb7184e revset: parse variable-length arguments of followlines() by getargsdict() Yuya Nishihara <yuya@tcha.org> parents: 30719 diff changeset	822 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	823 $ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	824 hg: parse error: followlines expects exactly one revision
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	825 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	826 $ hg log -r 'followlines("glob:*", 1:2)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	827 hg: parse error: followlines expects exactly one file
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	828 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	829 $ hg log -r 'followlines(baz, 1:)'
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	830 hg: parse error: line range bounds must be integers
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	831 [255]
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	832 $ hg log -r 'followlines(baz, :1)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	833 hg: parse error: line range bounds must be integers
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	834 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	835 $ hg log -r 'followlines(baz, x:4)'
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	836 hg: parse error: line range bounds must be integers
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	837 [255]
4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	838 $ hg log -r 'followlines(baz, 5:4)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	839 hg: parse error: line range must be positive
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	840 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	841 $ hg log -r 'followlines(baz, 0:4)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	842 hg: parse error: fromline must be strictly positive
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	843 [255]
30804 4227f80f72b2 revset: abuse x:y syntax to specify line range of followlines() Yuya Nishihara <yuya@tcha.org> parents: 30800 diff changeset	844 $ hg log -r 'followlines(baz, 2:40)'
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	845 abort: line range exceeds file size
42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	846 [255]
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	847 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'
33416 9467d5337292 revset: add experimental relation and subscript operators Yuya Nishihara <yuya@tcha.org> parents: 33341 diff changeset	848 hg: parse error at 43: not a prefix: [
36714 2a258985ffeb revsetlang: add a hint for more useful parse errors Ryan McElroy <rmcelroy@fb.com> parents: 35239 diff changeset	849 (followlines(baz, 2:4, startrev=20, descend=[1])
2a258985ffeb revsetlang: add a hint for more useful parse errors Ryan McElroy <rmcelroy@fb.com> parents: 35239 diff changeset	850 ^ here)
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	851 [255]
83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	852 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'
32085 2a2744dffecf revset: add i18n comments to error messages for followlines predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32063 diff changeset	853 hg: parse error: descend argument must be a boolean
31998 83527d9f1f13 revset: properly parse "descend" argument of followlines() Denis Laxalde <denis@laxalde.org> parents: 31992 diff changeset	854 [255]
30719 42c75b4fa46a revset: add a followlines(file, fromline, toline[, rev]) revset Denis Laxalde <denis.laxalde@logilab.fr> parents: 30441 diff changeset	855
32672 7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	856 Test empty annotate output
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	857
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	858 $ printf '\0' > binary
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	859 $ touch empty
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	860 $ hg ci -qAm 'add binary and empty files'
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	861
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	862 $ hg annotate binary empty
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	863 binary: binary file
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	864
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	865 $ hg annotate -Tjson binary empty
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	866 [
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	867 {
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	868 "path": "binary"
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	869 },
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	870 {
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	871 "lines": [],
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	872 "path": "empty"
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	873 }
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	874 ]
7a209737f01c annotate: restructure formatter output to be nested list (BC) Yuya Nishihara <yuya@tcha.org> parents: 32519 diff changeset	875
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	876 Test annotate with whitespace options
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	877
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	878 $ cd ..
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	879 $ hg init repo-ws
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	880 $ cd repo-ws
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	881 $ cat > a <<EOF
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	882 > aa
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	883 >
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	884 > b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	885 > EOF
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	886 $ hg ci -Am "adda"
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	887 adding a
17347 2da47de36b6f check-code: fix check for trailing whitespace on continued lines too Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	888 $ sed 's/EOL$//g' > a <<EOF
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	889 > a a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	890 >
17347 2da47de36b6f check-code: fix check for trailing whitespace on continued lines too Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	891 > EOL
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	892 > b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	893 > EOF
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	894 $ hg ci -m "changea"
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	895
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	896 Annotate with no option
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	897
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	898 $ hg annotate a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	899 1: a a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	900 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	901 1:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	902 1: b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	903
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	904 Annotate with --ignore-space-change
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	905
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	906 $ hg annotate --ignore-space-change a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	907 1: a a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	908 1:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	909 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	910 0: b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	911
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	912 Annotate with --ignore-all-space
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	913
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	914 $ hg annotate --ignore-all-space a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	915 0: a a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	916 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	917 1:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	918 0: b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	919
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	920 Annotate with --ignore-blank-lines (similar to no options case)
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	921
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	922 $ hg annotate --ignore-blank-lines a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	923 1: a a
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	924 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	925 1:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	926 1: b b
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 14358 diff changeset	927
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15829 diff changeset	928 $ cd ..
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	929
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	930 Annotate with orphaned CR (issue5798)
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	931 -------------------------------------
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	932
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	933 $ hg init repo-cr
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	934 $ cd repo-cr
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	935
35836 9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	936 $ cat <<'EOF' >> "$TESTTMP/substcr.py"
9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	937 > import sys
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36988 diff changeset	938 > from mercurial.utils import procutil
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36988 diff changeset	939 > procutil.setbinary(sys.stdin)
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36988 diff changeset	940 > procutil.setbinary(sys.stdout)
35836 9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	941 > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	942 > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	943 > stdout.write(stdin.read().replace(b'\r', b'[CR]'))
9a08f7d18c20 test-annotate: rewrite sed with some python Yuya Nishihara <yuya@tcha.org> parents: 35831 diff changeset	944 > EOF
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	945
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	946 >>> with open('a', 'wb') as f:
36835 12492794bf8c py3: silence f.write() in test-annotate.t Yuya Nishihara <yuya@tcha.org> parents: 36768 diff changeset	947 ... f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') and None
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	948 $ hg ci -qAm0
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	949 >>> with open('a', 'wb') as f:
36835 12492794bf8c py3: silence f.write() in test-annotate.t Yuya Nishihara <yuya@tcha.org> parents: 36768 diff changeset	950 ... f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') and None
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	951 $ hg ci -m1
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	952
39723 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 39396 diff changeset	953 $ hg annotate -r0 a \| "$PYTHON" "$TESTTMP/substcr.py"
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	954 0: 0a[CR]0b[CR]
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	955 0: 0c[CR]0d[CR]
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	956 0: 0e
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	957 0: 0f
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	958 0: 0g
39723 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 39396 diff changeset	959 $ hg annotate -r1 a \| "$PYTHON" "$TESTTMP/substcr.py"
35831 0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	960 0: 0a[CR]0b[CR]
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	961 1: 1c[CR]1d[CR]
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	962 0: 0e
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	963 1: 1f
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	964 0: 0g
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	965
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	966 $ cd ..
0a7c59a4c835 annotate: do not poorly split lines at CR (issue5798) Yuya Nishihara <yuya@tcha.org> parents: 35239 diff changeset	967
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	968 Annotate with linkrev pointing to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	969 ------------------------------------------------
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	970
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	971 create history with a filerev whose linkrev points to another branch
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	972
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	973 $ hg init branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	974 $ cd branchedlinkrev
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	975 $ echo A > a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	976 $ hg commit -Am 'contentA'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	977 adding a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	978 $ echo B >> a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	979 $ hg commit -m 'contentB'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	980 $ hg up --rev 'desc(contentA)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	981 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	982 $ echo unrelated > unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	983 $ hg commit -Am 'unrelated'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	984 adding unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	985 created new head
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	986 $ hg graft -r 'desc(contentB)'
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	987 grafting 1:fd27c222e3e6 "contentB"
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	988 $ echo C >> a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	989 $ hg commit -m 'contentC'
24817 0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	990 $ echo W >> a
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	991 $ hg log -G
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	992 @ changeset: 4:072f1e8df249
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	993 \| tag: tip
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	994 \| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	995 \| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	996 \| summary: contentC
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	997 \|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	998 o changeset: 3:ff38df03cc4b
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	999 \| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1000 \| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1001 \| summary: contentB
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1002 \|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1003 o changeset: 2:62aaf3f6fc06
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1004 \| parent: 0:f0932f74827e
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1005 \| user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1006 \| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1007 \| summary: unrelated
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1008 \|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1009 \| o changeset: 1:fd27c222e3e6
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1010 \|/ user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1011 \| date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1012 \| summary: contentB
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1013 \|
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1014 o changeset: 0:f0932f74827e
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1015 user: test
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1016 date: Thu Jan 01 00:00:00 1970 +0000
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1017 summary: contentA
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1018
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1019
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1020 Annotate should list ancestor of starting revision only
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1021
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1022 $ hg annotate a
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1023 0: A
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1024 3: B
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1025 4: C
c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1026
24817 0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1027 $ hg annotate a -r 'wdir()'
0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1028 0 : A
0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1029 3 : B
0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1030 4 : C
0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1031 4+: W
0bb98eee531d committablefilectx: propagate ancestry info to parent to fix annotation Yuya Nishihara <yuya@tcha.org> parents: 24498 diff changeset	1032
23705 28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1033 Even when the starting revision is the linkrev-shadowed one:
28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1034
28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1035 $ hg annotate a -r 3
28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1036 0: A
28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1037 3: B
28a302e9225d linkrev: also adjust linkrev when bootstrapping annotate (issue4305) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1038
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 22480 diff changeset	1039 $ cd ..
29667 2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1040
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1041 Issue5360: Deleted chunk in p1 of a merge changeset
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1042
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1043 $ hg init repo-5360
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1044 $ cd repo-5360
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1045 $ echo 1 > a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1046 $ hg commit -A a -m 1
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1047 $ echo 2 >> a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1048 $ hg commit -m 2
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1049 $ echo a > a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1050 $ hg commit -m a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1051 $ hg update '.^' -q
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1052 $ echo 3 >> a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1053 $ hg commit -m 3 -q
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1054 $ hg merge 2 -q
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1055 $ cat > a << EOF
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1056 > b
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1057 > 1
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1058 > 2
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1059 > 3
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1060 > a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1061 > EOF
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1062 $ hg resolve --mark -q
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1063 $ hg commit -m m
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1064 $ hg annotate a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1065 4: b
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1066 0: 1
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1067 1: 2
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1068 3: 3
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1069 2: a
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1070
2f6d5c60f6fc annotate: pre-calculate the "needed" dictionary (issue5360) Jun Wu <quark@fb.com> parents: 26587 diff changeset	1071 $ cd ..

Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-annotate.t @ 39883:3e896b51aa5d