(this file is backported from core hg tests/test-annotate.t)

  $ cat >> $HGRCPATH << EOF

  > [ui]

  > merge = :merge3

  > [diff]

  > git=1

  > [extensions]

  > fastannotate=

  > [fastannotate]

  > modes=fctx

  > forcefollow=False

  > mainbranch=.

  > 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"

   }

  ]

  $ 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'

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

(note: the first one falls back to the vanilla annotate which does not use linelog)

  $ hg annotate -nf b --debug

  fastannotate: b: rebuilding broken cache

  fastannotate: b: 5 new changesets in the main branch

  0 a: a

  1 a: a

  1 a: a

  3 b: b4

  4 b: c

  3 b: b5

(difference explained below)

  $ hg annotate -nf b --debug

  fastannotate: b: using fast path (resolved fctx: False)

  0 a: a

  1 a: a

  1 a: a

  4 b: b4

  4 b: c

  4 b: b5

annotate after merge with -l

(fastannotate differs from annotate)

  $ hg log -Gp -T '{rev}:{node}' -r '2..5'

  @    5:64afcdf8e29e063c635be123d8d2fb160af00f7e

  |\

  | o  4:5fbdc1152d97597717021ad9e063061b200f146bdiff --git a/b b/b

  | |  --- a/b

  | |  +++ b/b

  | |  @@ -1,3 +1,6 @@

  | |   a

  | |   a

  | |   a

  | |  +b4

  | |  +c

  | |  +b5

  | |

  o |  3:37ec9f5c3d1f99572d7075971cb4876e2139b52fdiff --git a/b b/b

  |/   --- a/b

  |    +++ b/b

  |    @@ -1,3 +1,6 @@

  |     a

  |     a

  |     a

  |    +b4

  |    +b5

  |    +b6

  |

  o  2:3086dbafde1ce745abfc8d2d367847280aabae9ddiff --git a/a b/b

  |  copy from a

  ~  copy to b

(in this case, "b4", "b5" could be considered introduced by either rev 3, or rev 4.

 and that causes the rev number difference)

  $ hg annotate -nlf b --config fastannotate.modes=

  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 annotate -nlf b

  0 a:1: a

  1 a:2: a

  1 a:3: a

  4 b:4: b4

  4 b:5: c

  4 b:6: 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

(fastannotate differs from annotate)

  $ hg log -Gp -T '{rev}:{node}' -r '0+1+6+7'

  @    7:6284bb6c38fef984a929862a53bbc71ce9eafa81diff --git a/b b/b

  |\   --- a/b

  | :  +++ b/b

  | :  @@ -1,3 +1,7 @@

  | :   a

  | :   z

  | :   a

  | :  +b4

  | :  +c

  | :  +b5

  | :  +d

  | :

  o :  6:b80e3e32f75a6a67cd4ac85496a11511e9112816diff --git a/a b/b

  :/   copy from a

  :    copy to b

  :    --- a/a

  :    +++ b/b

  :    @@ -1,3 +1,3 @@

  :    -a (?)

  :     a

  :    +z

  :     a

  :    -a (?)

  :

  o  1:762f04898e6684ff713415f7b8a8d53d33f96c92diff --git a/a b/a

  |  --- a/a

  |  +++ b/a

  |  @@ -1,1 +1,3 @@

  |   a

  |  +a

  |  +a

  |

  o  0:8435f90966e442695d2ded29fdade2bac5ad8065diff --git a/a b/a

     new file mode 100644

     --- /dev/null

     +++ b/a

     @@ -0,0 +1,1 @@

     +a

(note on question marks:

 the upstream bdiff change (96f2f50d923f+3633403888ae+8c0c75aa3ff4+5c4e2636c1a9

 +38ed54888617) alters the output so deletion is not always at the end of the

 output. for example:

 | a | b | old | new | # old: e1d6aa0e4c3a, new: 8836f13e3c5b

 |-------------------|

 | a | a |  a  | -a  |

 | a | z | +z  |  a  |

 | a | a |  a  | +z  |

 |   |   | -a  |  a  |

 |-------------------|

 | a | a |     a     |

 | a | a |     a     |

 | a |   |    -a     |

 this leads to more question marks below)

(rev 1 adds two "a"s and rev 6 deletes one "a".

 the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1.

 and that causes the line number difference)

  $ hg annotate -nlf b --config fastannotate.modes=

  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

  $ hg annotate -nlf b

  0 a:1: a (?)

  1 a:2: a (?)

  6 b:2: z

  1 a:2: a (?)

  1 a:3: a (?)

  3 b:4: b4

  4 b:5: c

  3 b:5: b5

  7 b:7: d

Issue2807: alignment of line numbers with -l

(fastannotate differs from annotate, same reason as above)

  $ echo more >> b

  $ hg ci -mmore -d '5 0'

  $ echo more >> b

  $ hg ci -mmore -d '6 0'

  $ echo more >> b

  $ hg ci -mmore -d '7 0'

  $ hg annotate -nlf b

   0 a: 1: a (?)

   1 a: 2: a (?)

   6 b: 2: z

   1 a: 2: a (?)

   1 a: 3: a (?)

   3 b: 4: b4

   4 b: 5: c

   3 b: 5: b5

   7 b: 7: d

   8 b: 8: more

   9 b: 9: more

  10 b:10: more

linkrev vs rev

  $ hg annotate -r tip -n a

  0: a

  1: a

  1: a