Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: add unionmanifestlog support
authorDurham Goode <durham@fb.com>
Fri, 11 Nov 2016 01:20:13 -0800
changeset 30374 f2d146d1e8d6
parent 30373 31de088945cd
child 30375 11b8b740d54a
manifest: add unionmanifestlog support As part of deprecating manifest, we need to make the union repo support manifestlog.
mercurial/unionrepo.py file | annotate | diff | comparison | revisions 
--- 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):
mercurial