# HG changeset patch # User Durham Goode # Date 1478856013 28800 # Node ID f2d146d1e8d6aa85b453360c18e0306e39c85dd9 # Parent 31de088945cdbb5a19038939d73221e23ec8c363 manifest: add unionmanifestlog support As part of deprecating manifest, we need to make the union repo support manifestlog. diff -r 31de088945cd -r f2d146d1e8d6 mercurial/unionrepo.py --- a/mercurial/unionrepo.py Fri Nov 11 01:15:59 2016 -0800 +++ b/mercurial/unionrepo.py Fri Nov 11 01:20:13 2016 -0800 @@ -152,18 +152,18 @@ def baserevdiff(self, rev1, rev2): return changelog.changelog.revdiff(self, rev1, rev2) -class unionmanifest(unionrevlog, manifest.manifest): +class unionmanifest(unionrevlog, manifest.manifestrevlog): def __init__(self, opener, opener2, linkmapper): - manifest.manifest.__init__(self, opener) - manifest2 = manifest.manifest(opener2) + manifest.manifestrevlog.__init__(self, opener) + manifest2 = manifest.manifestrevlog(opener2) unionrevlog.__init__(self, opener, self.indexfile, manifest2, linkmapper) def baserevision(self, nodeorrev): - return manifest.manifest.revision(self, nodeorrev) + return manifest.manifestrevlog.revision(self, nodeorrev) def baserevdiff(self, rev1, rev2): - return manifest.manifest.revdiff(self, rev1, rev2) + return manifest.manifestrevlog.revdiff(self, rev1, rev2) class unionfilelog(unionrevlog, filelog.filelog): def __init__(self, opener, path, opener2, linkmapper, repo):