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

annotate tests/test-annotate.t @ 37178:68ee61822182

thirdparty: port zope.interface to relative imports By using relative imports, we're guaranteed to get modules vendored with Mercurial rather than other random modules that might be in sys.path. My editor strips trailing whitespace on save. So some minor source code cleanup was also performed as part of this commit. # no-check-commit because some modified lines have double newlines Differential Revision: https://phab.mercurial-scm.org/D2930

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Wed, 21 Mar 2018 19:52:30 -0700
parents	a8a902d7176e
children	435481393198

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

Mercurial > public > mercurial-scm > hg

annotate tests/test-annotate.t @ 37178:68ee61822182