Show More
@@ -50,7 +50,7 b' class bundlerevlog(revlog.revlog):' | |||
|
50 | 50 | continue |
|
51 | 51 | for p in (p1, p2): |
|
52 | 52 | if not p in self.nodemap: |
|
53 | raise RevlogError(_("unknown parent %s") % short(p1)) | |
|
53 | raise revlog.RevlogError(_("unknown parent %s") % short(p1)) | |
|
54 | 54 | if linkmapper is None: |
|
55 | 55 | link = n |
|
56 | 56 | else: |
@@ -76,12 +76,12 b' class bundlerevlog(revlog.revlog):' | |||
|
76 | 76 | return False |
|
77 | 77 | return rev in self.basemap |
|
78 | 78 | def bundlebase(self, rev): return self.basemap[rev] |
|
79 | def chunk(self, rev, df=None): | |
|
79 | def chunk(self, rev, df=None, cachelen=4096): | |
|
80 | 80 | # Warning: in case of bundle, the diff is against bundlebase, |
|
81 | 81 | # not against rev - 1 |
|
82 | 82 | # XXX: could use some caching |
|
83 | 83 | if not self.bundle(rev): |
|
84 | return revlog.revlog.chunk(self, rev) | |
|
84 | return revlog.revlog.chunk(self, rev, df, cachelen) | |
|
85 | 85 | self.bundlefile.seek(self.start(rev)) |
|
86 | 86 | return self.bundlefile.read(self.length(rev)) |
|
87 | 87 | |
@@ -123,7 +123,7 b' class bundlerevlog(revlog.revlog):' | |||
|
123 | 123 | |
|
124 | 124 | p1, p2 = self.parents(node) |
|
125 | 125 | if node != revlog.hash(text, p1, p2): |
|
126 | raise RevlogError(_("integrity check failed on %s:%d") | |
|
126 | raise revlog.RevlogError(_("integrity check failed on %s:%d") | |
|
127 | 127 | % (self.datafile, self.rev(node))) |
|
128 | 128 | |
|
129 | 129 | self.cache = (node, self.rev(node), text) |
@@ -160,7 +160,6 b' class bundlerepository(localrepo.localre' | |||
|
160 | 160 | def __init__(self, ui, path, bundlename): |
|
161 | 161 | localrepo.localrepository.__init__(self, ui, path) |
|
162 | 162 | f = open(bundlename, "rb") |
|
163 | s = util.fstat(f) | |
|
164 | 163 | self.bundlefile = f |
|
165 | 164 | header = self.bundlefile.read(6) |
|
166 | 165 | if not header.startswith("HG"): |
General Comments 0
You need to be logged in to leave comments.
Login now