[PATCH 07 of 10 V2] manifest: add unionmanifestlog support
Durham Goode
durham at fb.com
Fri Nov 11 04:26:40 EST 2016
# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1478856013 28800
# Fri Nov 11 01:20:13 2016 -0800
# Node ID 3b92bdb4ad589cdf473b0923ef100165d508c151
# Parent 68e5e96c9634a9bb8b37fced04eefb9233c801f1
manifest: add unionmanifestlog support
As part of deprecating manifest, we need to make the union repo support
manifestlog.
diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py
--- a/mercurial/unionrepo.py
+++ b/mercurial/unionrepo.py
@@ -152,18 +152,18 @@ class unionchangelog(unionrevlog, change
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):
More information about the Mercurial-devel
mailing list