$ cat >> "$HGRCPATH" << EOF

  > [ui]

  > merge = :merge3

  > EOF

init

  $ hg init repo

  $ cd repo

commit

  $ echo 'a' > a

  $ hg ci -A -m test -u nobody -d '1 0'

  adding a

annotate -c

  $ hg annotate -c a

  8435f90966e4: a

annotate -cl

  $ hg annotate -cl a

  8435f90966e4:1: a

annotate -d

  $ hg annotate -d a

  Thu Jan 01 00:00:01 1970 +0000: a

annotate -n

  $ hg annotate -n a

  0: a

annotate -nl

  $ hg annotate -nl a

  0:1: a

annotate -u

  $ hg annotate -u a

  nobody: a

annotate -cdnu

  $ hg annotate -cdnu a

  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a

annotate -cdnul

  $ hg annotate -cdnul a

  nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a

annotate (JSON)

  $ hg annotate -Tjson a

  [

   {

    "lines": [{"line": "a\n", "rev": 0}],

    "path": "a"

   }

  ]

  $ hg annotate -Tjson -cdfnul a

  [

   {

    "lines": [{"date": [1.0, 0], "line": "a\n", "lineno": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "path": "a", "rev": 0, "user": "nobody"}],

    "path": "a"

   }

  ]

log-like templating

  $ hg annotate -T'{lines % "{rev} {node|shortest}: {line}"}' a

  0 8435: a

'{lineno}' field should be populated as necessary

  $ hg annotate -T'{lines % "{rev}:{lineno}: {line}"}' a

  0:1: a

  $ hg annotate -Ta a \

  > --config templates.a='"{lines % "{rev}:{lineno}: {line}"}"'

  0:1: a

  $ cat <<EOF >>a

  > a

  > a

  > EOF

  $ hg ci -ma1 -d '1 0'

  $ hg cp a b

  $ hg ci -mb -d '1 0'

  $ cat <<EOF >> b

  > b4

  > b5

  > b6

  > EOF

  $ hg ci -mb2 -d '2 0'

default output of '{lines}' should be readable

  $ hg annotate -T'{lines}' a

  0: a

  1: a

  1: a

  $ hg annotate -T'{join(lines, "\n")}' a

  0: a

  1: a

  1: a

several filters can be applied to '{lines}'

  $ hg annotate -T'{lines|json}\n' a

  [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}]

  $ hg annotate -T'{lines|stringify}' a

  0: a

  1: a

  1: a

  $ hg annotate -T'{lines|count}\n' a

  3

annotate multiple files (JSON)

  $ hg annotate -Tjson a b

  [

   {

    "lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}],

    "path": "a"

   },

   {

    "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}],

    "path": "b"

   }

  ]

annotate multiple files (template)

  $ hg annotate -T'== {path} ==\n{lines % "{rev}: {line}"}' a b

  == a ==

  0: a

  1: a

  1: a

  == b ==

  0: a

  1: a

  1: a

  3: b4

  3: b5

  3: b6

annotate -n b

  $ hg annotate -n b

  0: a

  1: a

  1: a

  3: b4

  3: b5

  3: b6

annotate --no-follow b

  $ hg annotate --no-follow b

  2: a

  2: a

  2: a

  3: b4

  3: b5

  3: b6

annotate -nl b

  $ hg annotate -nl b

  0:1: a

  1:2: a

  1:3: a

  3:4: b4

  3:5: b5

  3:6: b6

annotate -nf b

  $ hg annotate -nf b

  0 a: a

  1 a: a

  1 a: a

  3 b: b4

  3 b: b5

  3 b: b6

annotate -nlf b

  $ hg annotate -nlf b

  0 a:1: a

  1 a:2: a

  1 a:3: a

  3 b:4: b4

  3 b:5: b5

  3 b:6: b6

  $ hg up -C 2

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cat <<EOF >> b

  > b4

  > c

  > b5

  > EOF

  $ hg ci -mb2.1 -d '2 0'

  created new head

  $ hg merge

  merging b

  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ cat b

  a

  a

  a

  <<<<<<< working copy:    5fbdc1152d97 - test: b2.1

  b4

  c

  b5

  ||||||| common ancestor: 3086dbafde1c - test: b

  =======

  b4

  b5

  b6

  >>>>>>> merge rev:       37ec9f5c3d1f - test: b2

  $ cat <<EOF > b

  > a

  > a

  > a

  > b4

  > c

  > b5

  > EOF

  $ hg resolve --mark -q

  $ rm b.orig

  $ hg ci -mmergeb -d '3 0'

annotate after merge

  $ hg annotate -nf b

  0 a: a

  1 a: a

  1 a: a

  3 b: b4

  4 b: c

  3 b: b5

annotate after merge with -l

  $ hg annotate -nlf b

  0 a:1: a

  1 a:2: a

  1 a:3: a

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  $ hg up -C 1

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg cp a b

  $ cat <<EOF > b

  > a

  > z

  > a

  > EOF

  $ hg ci -mc -d '3 0'

  created new head

Work around the pure version not resolving the conflict like native code

#if pure

  $ hg merge

  merging b

  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ cat <<EOF > b

  > a

  > z

  > a

  > b4

  > c

  > b5

  > EOF

  $ hg resolve -m b

  (no more unresolved files)

  $ rm b.orig

#else

  $ hg merge

  merging b

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

#endif

  $ echo d >> b

  $ hg ci -mmerge2 -d '4 0'

annotate after rename merge

  $ hg annotate -nf b

  0 a: a

  6 b: z

  1 a: a

  3 b: b4

  4 b: c

  3 b: b5

  7 b: d

annotate after rename merge with -l

  $ hg annotate -nlf b

  0 a:1: a

  6 b:2: z

  1 a:3: a

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  7 b:7: d

--skip nothing (should be the same as no --skip at all)

  $ hg annotate -nlf b --skip '1::0'

  0 a:1: a

  6 b:2: z

  1 a:3: a

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  7 b:7: d

--skip a modified line. Note a slight behavior difference in pure - this is

because the pure code comes up with slightly different deltas internally.

  $ hg annotate -nlf b --skip 6

  0 a:1: a

  1 a:2* z (no-pure !)

  0 a:1* z (pure !)

  1 a:3: a

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  7 b:7: d

--skip added lines (and test multiple skip)

  $ hg annotate -nlf b --skip 3

  0 a:1: a

  6 b:2: z

  1 a:3: a

  1 a:3* b4

  4 b:5: c

  1 a:3* b5

  7 b:7: d

  $ hg annotate -nlf b --skip 4

  0 a:1: a

  6 b:2: z

  1 a:3: a

  3 b:4: b4

  1 a:3* c

  3 b:5: b5

  7 b:7: d

  $ hg annotate -nlf b --skip 3 --skip 4

  0 a:1: a

  6 b:2: z

  1 a:3: a

  1 a:3* b4

  1 a:3* c

  1 a:3* b5

  7 b:7: d

  $ hg annotate -nlf b --skip 'merge()'

  0 a:1: a

  6 b:2: z

  1 a:3: a

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  3 b:5* d

--skip everything -- use the revision the file was introduced in

  $ hg annotate -nlf b --skip 'all()'

  0 a:1: a

  0 a:1* z

  0 a:1* a

  0 a:1* b4

  0 a:1* c

  0 a:1* b5

  0 a:1* d

Issue2807: alignment of line numbers with -l

  $ echo more >> b

  $ hg ci -mmore -d '5 0'

  $ echo more >> b

  $ hg ci -mmore -d '6 0'