Patchwork [06,of,10] manifest: add bundlemanifestlog support

login
register
mail settings
Submitter Durham Goode
Date Nov. 11, 2016, 9:26 a.m.
Message ID <68e5e96c9634a9bb8b37.1478856373@dev111.prn1.facebook.com>
Download mbox | patch
Permalink /patch/17484/
State Superseded
Headers show

Comments

Durham Goode - Nov. 11, 2016, 9:26 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1478855759 28800
#      Fri Nov 11 01:15:59 2016 -0800
# Node ID 68e5e96c9634a9bb8b37fced04eefb9233c801f1
# Parent  dfffa0ee1b405f24d674b2d1f87bc55f0e8944c6
manifest: add bundlemanifestlog support

As part of deprecating manifest.manifest we need to make bundlerepo support
manifestlog.

Patch

diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -187,9 +187,9 @@  class bundlechangelog(bundlerevlog, chan
         finally:
             self.filteredrevs = oldfilter
 
-class bundlemanifest(bundlerevlog, manifest.manifest):
+class bundlemanifest(bundlerevlog, manifest.manifestrevlog):
     def __init__(self, opener, bundle, linkmapper, dirlogstarts=None, dir=''):
-        manifest.manifest.__init__(self, opener, dir=dir)
+        manifest.manifestrevlog.__init__(self, opener, dir=dir)
         bundlerevlog.__init__(self, opener, self.indexfile, bundle,
                               linkmapper)
         if dirlogstarts is None:
@@ -207,7 +207,7 @@  class bundlemanifest(bundlerevlog, manif
         if node in self.fulltextcache:
             result = self.fulltextcache[node].tostring()
         else:
-            result = manifest.manifest.revision(self, nodeorrev)
+            result = manifest.manifestrevlog.revision(self, nodeorrev)
         return result
 
     def dirlog(self, d):