Mercurial > hg
changeset 2256:4b71f37cbdb7
fix errors spotted by pychecker (mostly scope problems)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 11 May 2006 11:15:23 +0200 |
| parents | 3f38e872f39a |
| children | 8dafccbcede9 |
| files | mercurial/bundlerepo.py |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py Wed May 10 15:26:56 2006 -0700 +++ b/mercurial/bundlerepo.py Thu May 11 11:15:23 2006 +0200 @@ -50,7 +50,7 @@ continue for p in (p1, p2): if not p in self.nodemap: - raise RevlogError(_("unknown parent %s") % short(p1)) + raise revlog.RevlogError(_("unknown parent %s") % short(p1)) if linkmapper is None: link = n else: @@ -76,12 +76,12 @@ return False return rev in self.basemap def bundlebase(self, rev): return self.basemap[rev] - def chunk(self, rev, df=None): + def chunk(self, rev, df=None, cachelen=4096): # Warning: in case of bundle, the diff is against bundlebase, # not against rev - 1 # XXX: could use some caching if not self.bundle(rev): - return revlog.revlog.chunk(self, rev) + return revlog.revlog.chunk(self, rev, df, cachelen) self.bundlefile.seek(self.start(rev)) return self.bundlefile.read(self.length(rev)) @@ -123,7 +123,7 @@ p1, p2 = self.parents(node) if node != revlog.hash(text, p1, p2): - raise RevlogError(_("integrity check failed on %s:%d") + raise revlog.RevlogError(_("integrity check failed on %s:%d") % (self.datafile, self.rev(node))) self.cache = (node, self.rev(node), text) @@ -160,7 +160,6 @@ def __init__(self, ui, path, bundlename): localrepo.localrepository.__init__(self, ui, path) f = open(bundlename, "rb") - s = util.fstat(f) self.bundlefile = f header = self.bundlefile.read(6) if not header.startswith("HG"):