commit: pass mergestate into _filecommit() instead of re-reading it

mergestate reading although cheap is not free. Let's read mergestate once on top
and pass it into `_filecommit()`.

In upcoming patches, we will be reading mergestate more in `_filecommit()`.

Differential Revision: https://phab.mercurial-scm.org/D8984

mercurial/commit.py

@@ -1,438 +1,442 b''
 # commit.py - fonction to perform commit
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 import errno
 
 from .i18n import _
 from .node import (
     hex,
     nullid,
     nullrev,
 )
 
 from . import (
     context,
     mergestate,
     metadata,
     phases,
     scmutil,
     subrepoutil,
 )
 
 
 def _write_copy_meta(repo):
     """return a (changelog, filelog) boolean tuple
 
     changelog: copy related information should be stored in the changeset
     filelof:   copy related information should be written in the file revision
     """
     if repo.filecopiesmode == b'changeset-sidedata':
         writechangesetcopy = True
         writefilecopymeta = True
     else:
         writecopiesto = repo.ui.config(b'experimental', b'copies.write-to')
         writefilecopymeta = writecopiesto != b'changeset-only'
         writechangesetcopy = writecopiesto in (
             b'changeset-only',
             b'compatibility',
         )
     return writechangesetcopy, writefilecopymeta
 
 
 def commitctx(repo, ctx, error=False, origctx=None):
     """Add a new revision to the target repository.
     Revision information is passed via the context argument.
 
     ctx.files() should list all files involved in this commit, i.e.
     modified/added/removed files. On merge, it may be wider than the
     ctx.files() to be committed, since any file nodes derived directly
     from p1 or p2 are excluded from the committed ctx.files().
 
     origctx is for convert to work around the problem that bug
     fixes to the files list in changesets change hashes. For
     convert to be the identity, it can pass an origctx and this
     function will use the same files list when it makes sense to
     do so.
     """
     repo = repo.unfiltered()
 
     p1, p2 = ctx.p1(), ctx.p2()
     user = ctx.user()
 
     with repo.lock(), repo.transaction(b"commit") as tr:
         mn, files = _prepare_files(tr, ctx, error=error, origctx=origctx)
 
         extra = ctx.extra().copy()
 
         if extra is not None:
             for name in (
                 b'p1copies',
                 b'p2copies',
                 b'filesadded',
                 b'filesremoved',
             ):
                 extra.pop(name, None)
         if repo.changelog._copiesstorage == b'extra':
             extra = _extra_with_copies(repo, extra, files)
 
         # update changelog
         repo.ui.note(_(b"committing changelog\n"))
         repo.changelog.delayupdate(tr)
         n = repo.changelog.add(
             mn,
             files,
             ctx.description(),
             tr,
             p1.node(),
             p2.node(),
             user,
             ctx.date(),
             extra,
         )
         xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
         repo.hook(
             b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2,
         )
         # set the new commit is proper phase
         targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
         if targetphase:
             # retract boundary do not alter parent changeset.
             # if a parent have higher the resulting phase will
             # be compliant anyway
             #
             # if minimal phase was 0 we don't need to retract anything
             phases.registernew(repo, tr, targetphase, [n])
         return n
 
 
 def _prepare_files(tr, ctx, error=False, origctx=None):
     repo = ctx.repo()
     p1 = ctx.p1()
 
     writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
 
     if ctx.manifestnode():
         # reuse an existing manifest revision
         repo.ui.debug(b'reusing known manifest\n')
         mn = ctx.manifestnode()
         files = metadata.ChangingFiles()
         files.update_touched(ctx.files())
         if writechangesetcopy:
             files.update_added(ctx.filesadded())
             files.update_removed(ctx.filesremoved())
     elif not ctx.files():
         repo.ui.debug(b'reusing manifest from p1 (no file change)\n')
         mn = p1.manifestnode()
         files = metadata.ChangingFiles()
     else:
         mn, files = _process_files(tr, ctx, error=error)
 
     if origctx and origctx.manifestnode() == mn:
         origfiles = origctx.files()
         assert files.touched.issubset(origfiles)
         files.update_touched(origfiles)
 
     if writechangesetcopy:
         files.update_copies_from_p1(ctx.p1copies())
         files.update_copies_from_p2(ctx.p2copies())
 
     return mn, files
 
 
 def _process_files(tr, ctx, error=False):
     repo = ctx.repo()
     p1 = ctx.p1()
     p2 = ctx.p2()
 
     writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
 
     m1ctx = p1.manifestctx()
     m2ctx = p2.manifestctx()
     mctx = m1ctx.copy()
 
     m = mctx.read()
     m1 = m1ctx.read()
     m2 = m2ctx.read()
+    ms = mergestate.mergestate.read(repo)
 
     files = metadata.ChangingFiles()
 
     # check in files
     added = []
     removed = list(ctx.removed())
     linkrev = len(repo)
     repo.ui.note(_(b"committing files:\n"))
     uipathfn = scmutil.getuipathfn(repo)
     for f in sorted(ctx.modified() + ctx.added()):
         repo.ui.note(uipathfn(f) + b"\n")
         try:
             fctx = ctx[f]
             if fctx is None:
                 removed.append(f)
             else:
                 added.append(f)
                 m[f], is_touched = _filecommit(
-                    repo, fctx, m1, m2, linkrev, tr, writefilecopymeta,
+                    repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms
                 )
                 if is_touched:
                     if is_touched == 'added':
                         files.mark_added(f)
                     else:
                         files.mark_touched(f)
                 m.setflag(f, fctx.flags())
         except OSError:
             repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f))
             raise
         except IOError as inst:
             errcode = getattr(inst, 'errno', errno.ENOENT)
             if error or errcode and errcode != errno.ENOENT:
                 repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f))
             raise
 
     # update manifest
     removed = [f for f in removed if f in m1 or f in m2]
     drop = sorted([f for f in removed if f in m])
     for f in drop:
         del m[f]
     if p2.rev() == nullrev:
         files.update_removed(removed)
     else:
         rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2))
         for f in removed:
             if not rf(f):
                 files.mark_removed(f)
 
     mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files.touched, added, drop)
 
     return mn, files
 
 
 def _filecommit(
-    repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta,
+    repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta, ms,
 ):
     """
     commit an individual file as part of a larger transaction
 
     input:
 
         fctx:       a file context with the content we are trying to commit
         manifest1:  manifest of changeset first parent
         manifest2:  manifest of changeset second parent
         linkrev:    revision number of the changeset being created
         tr:         current transation
         includecopymeta: boolean, set to False to skip storing the copy data
                     (only used by the Google specific feature of using
                     changeset extra as copy source of truth).
+        ms:         mergestate object
 
     output: (filenode, touched)
 
         filenode: the filenode that should be used by this changeset
         touched:  one of: None (mean untouched), 'added' or 'modified'
     """
 
     fname = fctx.path()
     fparent1 = manifest1.get(fname, nullid)
     fparent2 = manifest2.get(fname, nullid)
     touched = None
     if fparent1 == fparent2 == nullid:
         touched = 'added'
 
     if isinstance(fctx, context.filectx):
         # This block fast path most comparisons which are usually done. It
         # assumes that bare filectx is used and no merge happened, hence no
         # need to create a new file revision in this case.
         node = fctx.filenode()
         if node in [fparent1, fparent2]:
             repo.ui.debug(b'reusing %s filelog entry\n' % fname)
             if (
                 fparent1 != nullid and manifest1.flags(fname) != fctx.flags()
             ) or (
                 fparent2 != nullid and manifest2.flags(fname) != fctx.flags()
             ):
                 touched = 'modified'
             return node, touched
 
     flog = repo.file(fname)
     meta = {}
     cfname = fctx.copysource()
     fnode = None
 
     if cfname and cfname != fname:
         # Mark the new revision of this file as a copy of another
         # file.  This copy data will effectively act as a parent
         # of this new revision.  If this is a merge, the first
         # parent will be the nullid (meaning "look up the copy data")
         # and the second one will be the other parent.  For example:
         #
         # 0 --- 1 --- 3   rev1 changes file foo
         #   \       /     rev2 renames foo to bar and changes it
         #    \- 2 -/      rev3 should have bar with all changes and
         #                      should record that bar descends from
         #                      bar in rev2 and foo in rev1
         #
         # this allows this merge to succeed:
         #
         # 0 --- 1 --- 3   rev4 reverts the content change from rev2
         #   \       /     merging rev3 and rev4 should use bar@rev2
         #    \- 2 --- 4        as the merge base
         #
 
         cnode = manifest1.get(cfname)
         newfparent = fparent2
 
         if manifest2:  # branch merge
             if fparent2 == nullid or cnode is None:  # copied on remote side
                 if cfname in manifest2:
                     cnode = manifest2[cfname]
                     newfparent = fparent1
 
         # Here, we used to search backwards through history to try to find
         # where the file copy came from if the source of a copy was not in
         # the parent directory. However, this doesn't actually make sense to
         # do (what does a copy from something not in your working copy even
         # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
         # the user that copy information was dropped, so if they didn't
         # expect this outcome it can be fixed, but this is the correct
         # behavior in this circumstance.
 
         if cnode:
             repo.ui.debug(b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)))
             if includecopymeta:
                 meta[b"copy"] = cfname
                 meta[b"copyrev"] = hex(cnode)
             fparent1, fparent2 = nullid, newfparent
         else:
             repo.ui.warn(
                 _(
                     b"warning: can't find ancestor for '%s' "
                     b"copied from '%s'!\n"
                 )
                 % (fname, cfname)
             )
 
     elif fparent1 == nullid:
         fparent1, fparent2 = fparent2, nullid
     elif fparent2 != nullid:
         # is one parent an ancestor of the other?
         fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
         if fparent1 in fparentancestors:
             fparent1, fparent2 = fparent2, nullid
         elif fparent2 in fparentancestors:
             fparent2 = nullid
         elif not fparentancestors:
             # TODO: this whole if-else might be simplified much more
-            ms = mergestate.mergestate.read(repo)
-            if ms.extras(fname).get(b'filenode-source') == b'other':
+            if (
+                ms.active()
+                and ms.extras(fname).get(b'filenode-source') == b'other'
+            ):
                 fparent1, fparent2 = fparent2, nullid
 
     # is the file changed?
     text = fctx.data()
     if fparent2 != nullid or meta or flog.cmp(fparent1, text):
         if touched is None:  # do not overwrite added
             touched = 'modified'
         fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)
     # are just the flags changed during merge?
     elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
         touched = 'modified'
         fnode = fparent1
     else:
         fnode = fparent1
     return fnode, touched
 
 
 def _commit_manifest(tr, linkrev, ctx, mctx, manifest, files, added, drop):
     """make a new manifest entry (or reuse a new one)
 
     given an initialised manifest context and precomputed list of
     - files: files affected by the commit
     - added: new entries in the manifest
     - drop:  entries present in parents but absent of this one
 
     Create a new manifest revision, reuse existing ones if possible.
 
     Return the nodeid of the manifest revision.
     """
     repo = ctx.repo()
 
     md = None
 
     # all this is cached, so it is find to get them all from the ctx.
     p1 = ctx.p1()
     p2 = ctx.p2()
     m1ctx = p1.manifestctx()
 
     m1 = m1ctx.read()
 
     if not files:
         # if no "files" actually changed in terms of the changelog,
         # try hard to detect unmodified manifest entry so that the
         # exact same commit can be reproduced later on convert.
         md = m1.diff(manifest, scmutil.matchfiles(repo, ctx.files()))
     if not files and md:
         repo.ui.debug(
             b'not reusing manifest (no file change in '
             b'changelog, but manifest differs)\n'
         )
     if files or md:
         repo.ui.note(_(b"committing manifest\n"))
         # we're using narrowmatch here since it's already applied at
         # other stages (such as dirstate.walk), so we're already
         # ignoring things outside of narrowspec in most cases. The
         # one case where we might have files outside the narrowspec
         # at this point is merges, and we already error out in the
         # case where the merge has files outside of the narrowspec,
         # so this is safe.
         mn = mctx.write(
             tr,
             linkrev,
             p1.manifestnode(),
             p2.manifestnode(),
             added,
             drop,
             match=repo.narrowmatch(),
         )
     else:
         repo.ui.debug(
             b'reusing manifest from p1 (listed files ' b'actually unchanged)\n'
         )
         mn = p1.manifestnode()
 
     return mn
 
 
 def _extra_with_copies(repo, extra, files):
     """encode copy information into a `extra` dictionnary"""
     p1copies = files.copied_from_p1
     p2copies = files.copied_from_p2
     filesadded = files.added
     filesremoved = files.removed
     files = sorted(files.touched)
     if not _write_copy_meta(repo)[1]:
         # If writing only to changeset extras, use None to indicate that
         # no entry should be written. If writing to both, write an empty
         # entry to prevent the reader from falling back to reading
         # filelogs.
         p1copies = p1copies or None
         p2copies = p2copies or None
         filesadded = filesadded or None
         filesremoved = filesremoved or None
 
     extrasentries = p1copies, p2copies, filesadded, filesremoved
     if extra is None and any(x is not None for x in extrasentries):
         extra = {}
     if p1copies is not None:
         p1copies = metadata.encodecopies(files, p1copies)
         extra[b'p1copies'] = p1copies
     if p2copies is not None:
         p2copies = metadata.encodecopies(files, p2copies)
         extra[b'p2copies'] = p2copies
     if filesadded is not None:
         filesadded = metadata.encodefileindices(files, filesadded)
         extra[b'filesadded'] = filesadded
     if filesremoved is not None:
         filesremoved = metadata.encodefileindices(files, filesremoved)
         extra[b'filesremoved'] = filesremoved
     return extra

tests/test-annotate.t

@@ -1,1202 +1,1202 b''
   $ 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
   ||||||| base
   =======
   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'
   $ echo more >> b
   $ hg ci -mmore -d '7 0'
   $ 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
    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
 
 linkrev vs rev with -l
 
   $ hg annotate -r tip -nl a
   0:1: a
   1:2: a
   1:3: a
 
 Issue589: "undelete" sequence leads to crash
 
 annotate was crashing when trying to --follow something
 
 like A -> B -> A
 
 generate ABA rename configuration
 
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m addfoo
   $ hg rename foo bar
   $ hg ci -m renamefoo
   $ hg rename bar foo
   $ hg ci -m renamebar
 
 annotate after ABA with follow
 
   $ hg annotate --follow foo
   foo: foo
 
 missing file
 
   $ hg ann nosuchfile
   abort: nosuchfile: no such file in rev e9e6b4fa872f
   [255]
 
 annotate file without '\n' on last line
 
   $ printf "" > c
   $ hg ci -A -m test -u nobody -d '1 0'
   adding c
   $ hg annotate c
   $ printf "a\nb" > c
   $ hg ci -m test
   $ hg annotate c
   [0-9]+: a (re)
   [0-9]+: b (re)
 
 Issue3841: check annotation of the file of which filelog includes
 merging between the revision and its ancestor
 
 to reproduce the situation with recent Mercurial, this script uses (1)
 "hg debugsetparents" to merge without ancestor check by "hg merge",
 and (2) the extension to allow filelog merging between the revision
 and its ancestor by overriding "repo._filecommit".
 
   $ cat > ../legacyrepo.py <<EOF
   > from __future__ import absolute_import
   > from mercurial import commit, error, extensions, node
   > def _filecommit(orig, repo, fctx, manifest1, manifest2,
-  >                 linkrev, tr, includecopymeta):
+  >                 linkrev, tr, includecopymeta, ms):
   >     fname = fctx.path()
   >     text = fctx.data()
   >     flog = repo.file(fname)
   >     fparent1 = manifest1.get(fname, node.nullid)
   >     fparent2 = manifest2.get(fname, node.nullid)
   >     meta = {}
   >     copy = fctx.copysource()
   >     if copy and copy != fname:
   >         raise error.Abort('copying is not supported')
   >     if fparent2 != node.nullid:
   >         return flog.add(text, meta, tr, linkrev,
   >                         fparent1, fparent2), 'modified'
   >     raise error.Abort('only merging is supported')
   > def uisetup(ui):
   >     extensions.wrapfunction(commit, '_filecommit', _filecommit)
   > EOF
 
   $ cat > baz <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg add baz
   $ hg commit -m "baz:0"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg commit -m "baz:1"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3
   > 4
   > 5
   > EOF
   $ hg debugsetparents 17 17
   $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:2"
   $ hg debugindexdot baz
   digraph G {
   	-1 -> 0
   	0 -> 1
   	1 -> 2
   	1 -> 2
   }
   $ hg annotate baz
   17: 1 baz:1
   18: 2 baz:2
   16: 3
   16: 4
   16: 5
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3 baz:3
   > 4
   > 5
   > EOF
   $ hg commit -m "baz:3"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3 baz:3
   > 4 baz:4
   > 5
   > EOF
   $ hg debugsetparents 19 18
   $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:4"
   $ hg debugindexdot baz
   digraph G {
   	-1 -> 0
   	0 -> 1
   	1 -> 2
   	1 -> 2
   	2 -> 3
   	3 -> 4
   	2 -> 4
   }
   $ hg annotate baz
   17: 1 baz:1
   18: 2 baz:2
   19: 3 baz:3
   20: 4 baz:4
   16: 5
 
 annotate clean file
 
   $ hg annotate -ncr "wdir()" foo
   11 472b18db256d : foo
 
 annotate modified file
 
   $ echo foofoo >> foo
   $ hg annotate -r "wdir()" foo
   11 : foo
   20+: foofoo
 
   $ hg annotate -cr "wdir()" foo
   472b18db256d : foo
   b6bedd5477e7+: foofoo
 
   $ hg annotate -ncr "wdir()" foo
   11 472b18db256d : foo
   20 b6bedd5477e7+: foofoo
 
   $ hg annotate --debug -ncr "wdir()" foo
   11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo
   20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo
 
   $ hg annotate -udr "wdir()" foo
   test Thu Jan 01 00:00:00 1970 +0000: foo
   test [A-Za-z0-9:+ ]+: foofoo (re)
 
   $ hg annotate -ncr "wdir()" -Tjson foo
   [
    {
     "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": "ffffffffffffffffffffffffffffffffffffffff", "rev": 2147483647}],
     "path": "foo"
    }
   ]
 
 annotate added file
 
   $ echo bar > bar
   $ hg add bar
   $ hg annotate -ncr "wdir()" bar
   20 b6bedd5477e7+: bar
 
 annotate renamed file
 
   $ hg rename foo renamefoo2
   $ hg annotate -ncr "wdir()" renamefoo2
   11 472b18db256d : foo
   20 b6bedd5477e7+: foofoo
 
 annotate missing file
 
   $ rm baz
 
   $ hg annotate -ncr "wdir()" baz
   abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
   abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
   [255]
 
 annotate removed file
 
   $ hg rm baz
 
   $ hg annotate -ncr "wdir()" baz
   abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
   abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
   [255]
 
   $ hg revert --all --no-backup --quiet
   $ hg id -n
   20
 
 Test followlines() revset; we usually check both followlines(pat, range) and
 followlines(pat, range, descend=True) to make sure both give the same result
 when they should.
 
   $ echo a >> foo
   $ hg ci -m 'foo: add a'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5)'
   16: baz:0
   19: baz:3
   20: baz:4
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=20)'
   16: baz:0
   19: baz:3
   20: baz:4
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19)'
   16: baz:0
   19: baz:3
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=True)'
   19: baz:3
   20: baz:4
   $ printf "0\n0\n" | cat - baz > baz1
   $ mv baz1 baz
   $ hg ci -m 'added two lines with 0'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=true, startrev=19)'
   19: baz:3
   20: baz:4
   $ echo 6 >> baz
   $ hg ci -m 'added line 8'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=1)'
   19: baz:3
   20: baz:4
   $ sed 's/3/3+/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'baz:3->3+'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, descend=0)'
   16: baz:0
   19: baz:3
   20: baz:4
   24: baz:3->3+
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)'
   19: baz:3
   20: baz:4
   24: baz:3->3+
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2, descend=false)'
   22: added two lines with 0
 
 file patterns are okay
   $ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)'
   22: added two lines with 0
 
 renames are followed
   $ hg mv baz qux
   $ sed 's/4/4+/' qux > qux.new
   $ mv qux.new qux
   $ hg ci -m 'qux:4->4+'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   24: baz:3->3+
   25: qux:4->4+
 
 but are missed when following children
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=22, descend=True)'
   24: baz:3->3+
 
 merge
   $ hg up 24 --quiet
   $ echo 7 >> baz
   $ hg ci -m 'one more line, out of line range'
   created new head
   $ sed 's/3+/3-/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'baz:3+->3-'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   24: baz:3->3+
   27: baz:3+->3-
   $ hg merge 25
   merging baz and qux to qux
   warning: conflicts while merging qux! (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 qux
   0
   0
   1 baz:1
   2 baz:2
   <<<<<<< working copy: 863de62655ef - test: baz:3+->3-
   3- baz:3
   4 baz:4
   ||||||| base
   3+ baz:3
   4 baz:4
   =======
   3+ baz:3
   4+ baz:4
   >>>>>>> merge rev:    cb8df70ae185 - test: qux:4->4+
   5
   6
   7
   $ cat > qux <<EOF
   > 0
   > 0
   > 1 baz:1
   > 2 baz:2
   > 3- baz:3
   > 4 baz:4
   > 5
   > 6
   > 7
   > EOF
   $ hg resolve --mark -q
   $ rm qux.orig
   $ hg ci -m merge
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   24: baz:3->3+
   25: qux:4->4+
   27: baz:3+->3-
   28: merge
   $ hg up 25 --quiet
   $ hg merge 27
   merging qux and baz to qux
   warning: conflicts while merging qux! (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 qux
   0
   0
   1 baz:1
   2 baz:2
   <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
   3+ baz:3
   4+ baz:4
   ||||||| base
   3+ baz:3
   4 baz:4
   =======
   3- baz:3
   4 baz:4
   >>>>>>> merge rev:    863de62655ef - test: baz:3+->3-
   5
   6
   7
   $ cat > qux <<EOF
   > 0
   > 0
   > 1 baz:1
   > 2 baz:2
   > 3+ baz:3
   > 4+ baz:4
   > 5
   > 6
   > EOF
   $ hg resolve --mark -q
   $ rm qux.orig
   $ hg ci -m 'merge from other side'
   created new head
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
   16: baz:0
   19: baz:3
   20: baz:4
   24: baz:3->3+
   25: qux:4->4+
   27: baz:3+->3-
   29: merge from other side
   $ hg up 24 --quiet
 
 we are missing the branch with rename when following children
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=26, descend=True)'
   27: baz:3+->3-
 
 we follow all branches in descending direction
   $ hg up 23 --quiet
   $ sed 's/3/+3/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'baz:3->+3'
   created new head
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 2:5, startrev=16, descend=True)' --graph
   @  30: baz:3->+3
   :
   : o  27: baz:3+->3-
   : :
   : o  24: baz:3->3+
   :/
   o    20: baz:4
   |\
   | o  19: baz:3
   |/
   o  18: baz:2
   :
   o  16: baz:0
   |
   ~
 
 Issue5595: on a merge changeset with different line ranges depending on
 parent, be conservative and use the surrounding interval to avoid loosing
 track of possible further descendants in specified range.
 
   $ hg up 23 --quiet
   $ hg cat baz -r 24
   0
   0
   1 baz:1
   2 baz:2
   3+ baz:3
   4 baz:4
   5
   6
   $ cat > baz << EOF
   > 0
   > 0
   > a
   > b
   > 3+ baz:3
   > 4 baz:4
   > y
   > z
   > EOF
   $ hg ci -m 'baz: mostly rewrite with some content from 24'
   created new head
   $ hg merge --tool :merge-other 24
   merging baz
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge forgetting about baz rewrite'
   $ cat > baz << EOF
   > 0
   > 0
   > 1 baz:1
   > 2+ baz:2
   > 3+ baz:3
   > 4 baz:4
   > 5
   > 6
   > EOF
   $ hg ci -m 'baz: narrow change (2->2+)'
   $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:4, startrev=20, descend=True)' --graph
   @  33: baz: narrow change (2->2+)
   |
   o    32: merge forgetting about baz rewrite
   |\
   | o  31: baz: mostly rewrite with some content from 24
   | :
   | : o  30: baz:3->+3
   | :/
   +---o  27: baz:3+->3-
   | :
   o :  24: baz:3->3+
   :/
   o    20: baz:4
   |\
   ~ ~
 
 An integer as a line range, which is parsed as '1:1'
 
   $ hg log -r 'followlines(baz, 1)'
   changeset:   22:2174d0bf352a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added two lines with 0
   
 
 check error cases
   $ hg up 24 --quiet
   $ hg log -r 'followlines()'
   hg: parse error: followlines takes at least 1 positional arguments
   [255]
   $ hg log -r 'followlines(baz)'
   hg: parse error: followlines requires a line range
   [255]
   $ hg log -r 'followlines(baz, x)'
   hg: parse error: followlines expects a line number or a range
   [255]
   $ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))'
   hg: parse error: followlines expects exactly one revision
   [255]
   $ hg log -r 'followlines("glob:*", 1:2)'
   hg: parse error: followlines expects exactly one file
   [255]
   $ hg log -r 'followlines(baz, 1:)'
   hg: parse error: line range bounds must be integers
   [255]
   $ hg log -r 'followlines(baz, :1)'
   hg: parse error: line range bounds must be integers
   [255]
   $ hg log -r 'followlines(baz, x:4)'
   hg: parse error: line range bounds must be integers
   [255]
   $ hg log -r 'followlines(baz, 5:4)'
   hg: parse error: line range must be positive
   [255]
   $ hg log -r 'followlines(baz, 0:4)'
   hg: parse error: fromline must be strictly positive
   [255]
   $ hg log -r 'followlines(baz, 2:40)'
   abort: line range exceeds file size
   [255]
   $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'
   hg: parse error at 43: not a prefix: [
   (followlines(baz, 2:4, startrev=20, descend=[1])
                                               ^ here)
   [255]
   $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'
   hg: parse error: descend argument must be a boolean
   [255]
 
 Test empty annotate output
 
   $ printf '\0' > binary
   $ touch empty
   $ hg ci -qAm 'add binary and empty files'
 
   $ hg annotate binary empty
   binary: binary file
 
   $ hg annotate -Tjson binary empty
   [
    {
     "path": "binary"
    },
    {
     "lines": [],
     "path": "empty"
    }
   ]
 
 Test annotate with whitespace options
 
   $ cd ..
   $ hg init repo-ws
   $ cd repo-ws
   $ cat > a <<EOF
   > aa
   > 
   > b b
   > EOF
   $ hg ci -Am "adda"
   adding a
   $ sed 's/EOL$//g' > a <<EOF
   > a  a
   > 
   >  EOL
   > b  b
   > EOF
   $ hg ci -m "changea"
 
 Annotate with no option
 
   $ hg annotate a
   1: a  a
   0: 
   1:  
   1: b  b
 
 Annotate with --ignore-space-change
 
   $ hg annotate --ignore-space-change a
   1: a  a
   1: 
   0:  
   0: b  b
 
 Annotate with --ignore-all-space
 
   $ hg annotate --ignore-all-space a
   0: a  a
   0: 
   1:  
   0: b  b
 
 Annotate with --ignore-blank-lines (similar to no options case)
 
   $ hg annotate --ignore-blank-lines a
   1: a  a
   0: 
   1:  
   1: b  b
 
   $ cd ..
 
 Annotate with orphaned CR (issue5798)
 -------------------------------------
 
   $ hg init repo-cr
   $ cd repo-cr
 
   $ cat <<'EOF' >> "$TESTTMP/substcr.py"
   > import sys
   > from mercurial.utils import procutil
   > procutil.setbinary(sys.stdin)
   > procutil.setbinary(sys.stdout)
   > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
   > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
   > stdout.write(stdin.read().replace(b'\r', b'[CR]'))
   > EOF
 
   >>> with open('a', 'wb') as f:
   ...     f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') and None
   $ hg ci -qAm0
   >>> with open('a', 'wb') as f:
   ...     f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') and None
   $ hg ci -m1
 
   $ hg annotate -r0 a | "$PYTHON" "$TESTTMP/substcr.py"
   0: 0a[CR]0b[CR]
   0: 0c[CR]0d[CR]
   0: 0e
   0: 0f
   0: 0g
   $ hg annotate -r1 a | "$PYTHON" "$TESTTMP/substcr.py"
   0: 0a[CR]0b[CR]
   1: 1c[CR]1d[CR]
   0: 0e
   1: 1f
   0: 0g
 
   $ cd ..
 
 Annotate with linkrev pointing to another branch
 ------------------------------------------------
 
 create history with a filerev whose linkrev points to another branch
 
   $ hg init branchedlinkrev
   $ cd branchedlinkrev
   $ echo A > a
   $ hg commit -Am 'contentA'
   adding a
   $ echo B >> a
   $ hg commit -m 'contentB'
   $ hg up --rev 'desc(contentA)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo unrelated > unrelated
   $ hg commit -Am 'unrelated'
   adding unrelated
   created new head
   $ hg graft -r 'desc(contentB)'
   grafting 1:fd27c222e3e6 "contentB"
   $ echo C >> a
   $ hg commit -m 'contentC'
   $ echo W >> a
   $ hg log -G
   @  changeset:   4:072f1e8df249
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     contentC
   |
   o  changeset:   3:ff38df03cc4b
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     contentB
   |
   o  changeset:   2:62aaf3f6fc06
   |  parent:      0:f0932f74827e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     unrelated
   |
   | o  changeset:   1:fd27c222e3e6
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     contentB
   |
   o  changeset:   0:f0932f74827e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     contentA
   
 
 Annotate should list ancestor of starting revision only
 
   $ hg annotate a
   0: A
   3: B
   4: C
 
   $ hg annotate a -r 'wdir()'
   0 : A
   3 : B
   4 : C
   4+: W
 
 Even when the starting revision is the linkrev-shadowed one:
 
   $ hg annotate a -r 3
   0: A
   3: B
 
   $ cd ..
 
 Issue5360: Deleted chunk in p1 of a merge changeset
 
   $ hg init repo-5360
   $ cd repo-5360
   $ echo 1 > a
   $ hg commit -A a -m 1
   $ echo 2 >> a
   $ hg commit -m 2
   $ echo a > a
   $ hg commit -m a
   $ hg update '.^' -q
   $ echo 3 >> a
   $ hg commit -m 3 -q
   $ hg merge 2 -q
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ cat a
   <<<<<<< working copy: 0a068f0261cf - test: 3
   1
   2
   3
   ||||||| base
   1
   2
   =======
   a
   >>>>>>> merge rev:    9409851bc20a - test: a
   $ cat > a << EOF
   > b
   > 1
   > 2
   > 3
   > a
   > EOF
   $ hg resolve --mark -q
   $ rm a.orig
   $ hg commit -m m
   $ hg annotate a
   4: b
   0: 1
   1: 2
   3: 3
   2: a
 
   $ cd ..

tests/test-fastannotate-hg.t

@@ -1,819 +1,819 b''
 (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
   ||||||| base
   =======
   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
 
 linkrev vs rev with -l
 
   $ hg annotate -r tip -nl a
   0:1: a
   1:2: a
   1:3: a
 
 Issue589: "undelete" sequence leads to crash
 
 annotate was crashing when trying to --follow something
 
 like A -> B -> A
 
 generate ABA rename configuration
 
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m addfoo
   $ hg rename foo bar
   $ hg ci -m renamefoo
   $ hg rename bar foo
   $ hg ci -m renamebar
 
 annotate after ABA with follow
 
   $ hg annotate --follow foo
   foo: foo
 
 missing file
 
   $ hg ann nosuchfile
   abort: nosuchfile: no such file in rev e9e6b4fa872f
   [255]
 
 annotate file without '\n' on last line
 
   $ printf "" > c
   $ hg ci -A -m test -u nobody -d '1 0'
   adding c
   $ hg annotate c
   $ printf "a\nb" > c
   $ hg ci -m test
   $ hg annotate c
   [0-9]+: a (re)
   [0-9]+: b (re)
 
 Issue3841: check annotation of the file of which filelog includes
 merging between the revision and its ancestor
 
 to reproduce the situation with recent Mercurial, this script uses (1)
 "hg debugsetparents" to merge without ancestor check by "hg merge",
 and (2) the extension to allow filelog merging between the revision
 and its ancestor by overriding "repo._filecommit".
 
   $ cat > ../legacyrepo.py <<EOF
   > from __future__ import absolute_import
   > from mercurial import commit, error, extensions, node
   > def _filecommit(orig, repo, fctx, manifest1, manifest2,
-  >                 linkrev, tr, includecopymeta):
+  >                 linkrev, tr, includecopymeta, ms):
   >     fname = fctx.path()
   >     text = fctx.data()
   >     flog = repo.file(fname)
   >     fparent1 = manifest1.get(fname, node.nullid)
   >     fparent2 = manifest2.get(fname, node.nullid)
   >     meta = {}
   >     copy = fctx.copysource()
   >     if copy and copy != fname:
   >         raise error.Abort('copying is not supported')
   >     if fparent2 != node.nullid:
   >         return flog.add(text, meta, tr, linkrev,
   >                         fparent1, fparent2), 'modified'
   >     raise error.Abort('only merging is supported')
   > def uisetup(ui):
   >     extensions.wrapfunction(commit, '_filecommit', _filecommit)
   > EOF
 
   $ cat > baz <<EOF
   > 1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg add baz
   $ hg commit -m "baz:0"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2
   > 3
   > 4
   > 5
   > EOF
   $ hg commit -m "baz:1"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3
   > 4
   > 5
   > EOF
   $ hg debugsetparents 17 17
   $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:2"
   $ hg debugindexdot baz
   digraph G {
   	-1 -> 0
   	0 -> 1
   	1 -> 2
   	1 -> 2
   }
   $ hg annotate baz
   17: 1 baz:1
   18: 2 baz:2
   16: 3
   16: 4
   16: 5
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3 baz:3
   > 4
   > 5
   > EOF
   $ hg commit -m "baz:3"
 
   $ cat > baz <<EOF
   > 1 baz:1
   > 2 baz:2
   > 3 baz:3
   > 4 baz:4
   > 5
   > EOF
   $ hg debugsetparents 19 18
   $ hg --config extensions.legacyrepo=../legacyrepo.py  commit -m "baz:4"
   $ hg debugindexdot baz
   digraph G {
   	-1 -> 0
   	0 -> 1
   	1 -> 2
   	1 -> 2
   	2 -> 3
   	3 -> 4
   	2 -> 4
   }
   $ hg annotate baz
   17: 1 baz:1
   18: 2 baz:2
   19: 3 baz:3
   20: 4 baz:4
   16: 5
 
 annotate clean file
 
   $ hg annotate -ncr "wdir()" foo
   11 472b18db256d : foo
 
 annotate modified file
 
   $ echo foofoo >> foo
   $ hg annotate -r "wdir()" foo
   11 : foo
   20+: foofoo
 
   $ hg annotate -cr "wdir()" foo
   472b18db256d : foo
   b6bedd5477e7+: foofoo
 
   $ hg annotate -ncr "wdir()" foo
   11 472b18db256d : foo
   20 b6bedd5477e7+: foofoo
 
   $ hg annotate --debug -ncr "wdir()" foo
   11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo
   20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo
 
   $ hg annotate -udr "wdir()" foo
   test Thu Jan 01 00:00:00 1970 +0000: foo
   test [A-Za-z0-9:+ ]+: foofoo (re)
 
   $ hg annotate -ncr "wdir()" -Tjson foo
   [
    {
     "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": "ffffffffffffffffffffffffffffffffffffffff", "rev": 2147483647}],
     "path": "foo"
    }
   ]
 
 annotate added file
 
   $ echo bar > bar
   $ hg add bar
   $ hg annotate -ncr "wdir()" bar
   20 b6bedd5477e7+: bar
 
 annotate renamed file
 
   $ hg rename foo renamefoo2
   $ hg annotate -ncr "wdir()" renamefoo2
   11 472b18db256d : foo
   20 b6bedd5477e7+: foofoo
 
 annotate missing file
 
   $ rm baz
   $ hg annotate -ncr "wdir()" baz
   abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
   abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
   [255]
 
 annotate removed file
 
   $ hg rm baz
   $ hg annotate -ncr "wdir()" baz
   abort: $TESTTMP/repo/baz: $ENOENT$ (windows !)
   abort: $ENOENT$: '$TESTTMP/repo/baz' (no-windows !)
   [255]
 
 Test annotate with whitespace options
 
   $ cd ..
   $ hg init repo-ws
   $ cd repo-ws
   $ cat > a <<EOF
   > aa
   > 
   > b b
   > EOF
   $ hg ci -Am "adda"
   adding a
   $ sed 's/EOL$//g' > a <<EOF
   > a  a
   > 
   >  EOL
   > b  b
   > EOF
   $ hg ci -m "changea"
 
 Annotate with no option
 
   $ hg annotate a
   1: a  a
   0: 
   1:  
   1: b  b
 
 Annotate with --ignore-space-change
 
   $ hg annotate --ignore-space-change a
   1: a  a
   1: 
   0:  
   0: b  b
 
 Annotate with --ignore-all-space
 
   $ hg annotate --ignore-all-space a
   0: a  a
   0: 
   1:  
   0: b  b
 
 Annotate with --ignore-blank-lines (similar to no options case)
 
   $ hg annotate --ignore-blank-lines a
   1: a  a
   0: 
   1:  
   1: b  b
 
   $ cd ..
 
 Annotate with linkrev pointing to another branch
 ------------------------------------------------
 
 create history with a filerev whose linkrev points to another branch
 
   $ hg init branchedlinkrev
   $ cd branchedlinkrev
   $ echo A > a
   $ hg commit -Am 'contentA'
   adding a
   $ echo B >> a
   $ hg commit -m 'contentB'
   $ hg up --rev 'desc(contentA)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo unrelated > unrelated
   $ hg commit -Am 'unrelated'
   adding unrelated
   created new head
   $ hg graft -r 'desc(contentB)'
   grafting 1:fd27c222e3e6 "contentB"
   $ echo C >> a
   $ hg commit -m 'contentC'
   $ echo W >> a
   $ hg log -G
   @  changeset:   4:072f1e8df249
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     contentC
   |
   o  changeset:   3:ff38df03cc4b
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     contentB
   |
   o  changeset:   2:62aaf3f6fc06
   |  parent:      0:f0932f74827e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     unrelated
   |
   | o  changeset:   1:fd27c222e3e6
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     contentB
   |
   o  changeset:   0:f0932f74827e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     contentA
   
 
 Annotate should list ancestor of starting revision only
 
   $ hg annotate a
   0: A
   3: B
   4: C
 
   $ hg annotate a -r 'wdir()'
   0 : A
   3 : B
   4 : C
   4+: W
 
 Even when the starting revision is the linkrev-shadowed one:
 
   $ hg annotate a -r 3
   0: A
   3: B
 
   $ cd ..
 
 Issue5360: Deleted chunk in p1 of a merge changeset
 
   $ hg init repo-5360
   $ cd repo-5360
   $ echo 1 > a
   $ hg commit -A a -m 1
   $ echo 2 >> a
   $ hg commit -m 2
   $ echo a > a
   $ hg commit -m a
   $ hg update '.^' -q
   $ echo 3 >> a
   $ hg commit -m 3 -q
   $ hg merge 2 -q
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ cat a
   <<<<<<< working copy: 0a068f0261cf - test: 3
   1
   2
   3
   ||||||| base
   1
   2
   =======
   a
   >>>>>>> merge rev:    9409851bc20a - test: a
   $ cat > a << EOF
   > b
   > 1
   > 2
   > 3
   > a
   > EOF
   $ hg resolve --mark -q
   $ rm a.orig
   $ hg commit -m m
   $ hg annotate a
   4: b
   0: 1
   1: 2
   3: 3
   2: a
 
   $ cd ..