Show More
@@ -761,11 +761,12 b' class manifest(revlog.revlog):' | |||||
761 | usemanifestv2 = opts.get('manifestv2', usemanifestv2) |
|
761 | usemanifestv2 = opts.get('manifestv2', usemanifestv2) | |
762 | self._mancache = util.lrucachedict(cachesize) |
|
762 | self._mancache = util.lrucachedict(cachesize) | |
763 | revlog.revlog.__init__(self, opener, "00manifest.i") |
|
763 | revlog.revlog.__init__(self, opener, "00manifest.i") | |
764 |
self._ |
|
764 | self._treeinmem = usetreemanifest | |
|
765 | self._treeondisk = usetreemanifest | |||
765 | self._usemanifestv2 = usemanifestv2 |
|
766 | self._usemanifestv2 = usemanifestv2 | |
766 |
|
767 | |||
767 | def _newmanifest(self, data=''): |
|
768 | def _newmanifest(self, data=''): | |
768 |
if self._ |
|
769 | if self._treeinmem: | |
769 | return treemanifest('', data) |
|
770 | return treemanifest('', data) | |
770 | return manifestdict(data) |
|
771 | return manifestdict(data) | |
771 |
|
772 | |||
@@ -782,7 +783,7 b' class manifest(revlog.revlog):' | |||||
782 | return md |
|
783 | return md | |
783 |
|
784 | |||
784 | def readdelta(self, node): |
|
785 | def readdelta(self, node): | |
785 |
if self._usemanifestv2 or self._ |
|
786 | if self._usemanifestv2 or self._treeondisk: | |
786 | return self._slowreaddelta(node) |
|
787 | return self._slowreaddelta(node) | |
787 | r = self.rev(node) |
|
788 | r = self.rev(node) | |
788 | d = mdiff.patchtext(self.revdiff(self.deltaparent(r), r)) |
|
789 | d = mdiff.patchtext(self.revdiff(self.deltaparent(r), r)) | |
@@ -817,7 +818,7 b' class manifest(revlog.revlog):' | |||||
817 | return None, None |
|
818 | return None, None | |
818 |
|
819 | |||
819 | def add(self, m, transaction, link, p1, p2, added, removed): |
|
820 | def add(self, m, transaction, link, p1, p2, added, removed): | |
820 |
if (p1 in self._mancache and not self._ |
|
821 | if (p1 in self._mancache and not self._treeinmem | |
821 | and not self._usemanifestv2): |
|
822 | and not self._usemanifestv2): | |
822 | # If our first parent is in the manifest cache, we can |
|
823 | # If our first parent is in the manifest cache, we can | |
823 | # compute a delta here using properties we know about the |
|
824 | # compute a delta here using properties we know about the |
General Comments 0
You need to be logged in to leave comments.
Login now