479 |
479 |
480 $ cat > ../legacyrepo.py <<EOF |
480 $ cat > ../legacyrepo.py <<EOF |
481 > from __future__ import absolute_import |
481 > from __future__ import absolute_import |
482 > from mercurial import commit, error, extensions, node |
482 > from mercurial import commit, error, extensions, node |
483 > def _filecommit(orig, repo, fctx, manifest1, manifest2, |
483 > def _filecommit(orig, repo, fctx, manifest1, manifest2, |
484 > linkrev, tr, includecopymeta): |
484 > linkrev, tr, includecopymeta, ms): |
485 > fname = fctx.path() |
485 > fname = fctx.path() |
486 > text = fctx.data() |
486 > text = fctx.data() |
487 > flog = repo.file(fname) |
487 > flog = repo.file(fname) |
488 > fparent1 = manifest1.get(fname, node.nullid) |
488 > fparent1 = manifest1.get(fname, node.nullid) |
489 > fparent2 = manifest2.get(fname, node.nullid) |
489 > fparent2 = manifest2.get(fname, node.nullid) |