--- a/tests/test-fastannotate-hg.t Mon Jul 06 23:14:52 2020 +0200
+++ b/tests/test-fastannotate-hg.t Tue Jul 07 00:18:15 2020 +0200
@@ -481,25 +481,25 @@
and its ancestor by overriding "repo._filecommit".
$ cat > ../legacyrepo.py <<EOF
- > from mercurial import error, node
- > def reposetup(ui, repo):
- > class legacyrepo(repo.__class__):
- > def _filecommit(self, fctx, manifest1, manifest2,
- > linkrev, tr, includecopymeta):
- > fname = fctx.path()
- > text = fctx.data()
- > flog = self.file(fname)
- > fparent1 = manifest1.get(fname, node.nullid)
- > fparent2 = manifest2.get(fname, node.nullid)
- > meta = {}
- > copy = fctx.renamed()
- > if copy and copy[0] != 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')
- > repo.__class__ = legacyrepo
+ > from __future__ import absolute_import
+ > from mercurial import commit, error, extensions, node
+ > def _filecommit(orig, repo, fctx, manifest1, manifest2,
+ > linkrev, tr, includecopymeta):
+ > 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