Mercurial > hg-stable
changeset 30384:f2d146d1e8d6
manifest: add unionmanifestlog support
As part of deprecating manifest, we need to make the union repo support
manifestlog.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Fri, 11 Nov 2016 01:20:13 -0800 |
| parents | 31de088945cd |
| children | 11b8b740d54a |
| files | mercurial/unionrepo.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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):