Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/bundlerepo.py @ 4029:9210fba03d16
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 15 Jan 2007 18:23:21 +0100 |
parents | 540d1059c802 01d98d68d697 |
children | 1b5c38e9d7aa |
comparison
equal
deleted
inserted
replaced
4028:540d1059c802 | 4029:9210fba03d16 |
---|---|
9 This software may be used and distributed according to the terms | 9 This software may be used and distributed according to the terms |
10 of the GNU General Public License, incorporated herein by reference. | 10 of the GNU General Public License, incorporated herein by reference. |
11 """ | 11 """ |
12 | 12 |
13 from node import * | 13 from node import * |
14 from i18n import gettext as _ | 14 from i18n import _ |
15 from demandload import demandload | 15 import changegroup, util, os, struct, bz2, tempfile |
16 demandload(globals(), "changegroup util os struct bz2 tempfile") | |
17 | 16 |
18 import localrepo, changelog, manifest, filelog, revlog | 17 import localrepo, changelog, manifest, filelog, revlog |
19 | 18 |
20 class bundlerevlog(revlog.revlog): | 19 class bundlerevlog(revlog.revlog): |
21 def __init__(self, opener, indexfile, datafile, bundlefile, | 20 def __init__(self, opener, indexfile, datafile, bundlefile, |
48 if node in self.nodemap: | 47 if node in self.nodemap: |
49 prev = node | 48 prev = node |
50 continue | 49 continue |
51 for p in (p1, p2): | 50 for p in (p1, p2): |
52 if not p in self.nodemap: | 51 if not p in self.nodemap: |
53 raise revlog.RevlogError(_("unknown parent %s") % short(p1)) | 52 raise revlog.LookupError(_("unknown parent %s") % short(p1)) |
54 if linkmapper is None: | 53 if linkmapper is None: |
55 link = n | 54 link = n |
56 else: | 55 else: |
57 link = linkmapper(cs) | 56 link = linkmapper(cs) |
58 | 57 |