--- a/tests/test-fastannotate-hg.t Mon Apr 19 20:38:52 2021 -0400
+++ b/tests/test-fastannotate-hg.t Mon Mar 29 01:52:06 2021 +0200
@@ -482,19 +482,19 @@
$ cat > ../legacyrepo.py <<EOF
> from __future__ import absolute_import
- > from mercurial import commit, error, extensions, node
+ > from mercurial import commit, error, extensions
> def _filecommit(orig, repo, fctx, manifest1, manifest2,
> 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)
+ > fparent1 = manifest1.get(fname, repo.nullid)
+ > fparent2 = manifest2.get(fname, repo.nullid)
> meta = {}
> copy = fctx.copysource()
> if copy and copy != fname:
> raise error.Abort('copying is not supported')
- > if fparent2 != node.nullid:
+ > if fparent2 != repo.nullid:
> return flog.add(text, meta, tr, linkrev,
> fparent1, fparent2), 'modified'
> raise error.Abort('only merging is supported')