bundlerepo.py
563 lines
| 20.0 KiB
| text/x-python
|
PythonLexer
/ mercurial / bundlerepo.py
|
r8226 | # bundlerepo.py - repository class for viewing uncompressed bundles | ||
# | ||||
# Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r1942 | |||
|
r8227 | """Repository class for viewing uncompressed bundles. | ||
This provides a read-only repository interface to bundles as if they | ||||
were part of the actual repository. | ||||
""" | ||||
|
r25920 | from __future__ import absolute_import | ||
import os | ||||
import shutil | ||||
import tempfile | ||||
from .i18n import _ | ||||
from .node import nullid | ||||
from . import ( | ||||
bundle2, | ||||
changegroup, | ||||
changelog, | ||||
cmdutil, | ||||
discovery, | ||||
error, | ||||
exchange, | ||||
filelog, | ||||
localrepo, | ||||
manifest, | ||||
mdiff, | ||||
|
r28714 | node as nodemod, | ||
|
r25920 | pathutil, | ||
phases, | ||||
|
r30519 | pycompat, | ||
|
r25920 | revlog, | ||
util, | ||||
|
r31240 | vfs as vfsmod, | ||
|
r25920 | ) | ||
|
r1942 | |||
|
r1946 | class bundlerevlog(revlog.revlog): | ||
|
r14142 | def __init__(self, opener, indexfile, bundle, linkmapper): | ||
|
r1942 | # How it works: | ||
|
r18410 | # To retrieve a revision, we need to know the offset of the revision in | ||
# the bundle (an unbundle object). We store this offset in the index | ||||
|
r18643 | # (start). The base of the delta is stored in the base field. | ||
|
r1942 | # | ||
|
r18410 | # To differentiate a rev in the bundle from a rev in the revlog, we | ||
|
r18643 | # check revision against repotiprev. | ||
|
r31240 | opener = vfsmod.readonlyvfs(opener) | ||
|
r4257 | revlog.revlog.__init__(self, opener, indexfile) | ||
|
r12332 | self.bundle = bundle | ||
|
r6750 | n = len(self) | ||
|
r18643 | self.repotiprev = n - 1 | ||
|
r14142 | chain = None | ||
|
r18411 | self.bundlerevs = set() # used by 'bundle()' revset expression | ||
|
r29711 | getchunk = lambda: bundle.deltachunk(chain) | ||
for chunkdata in iter(getchunk, {}): | ||||
|
r14142 | node = chunkdata['node'] | ||
p1 = chunkdata['p1'] | ||||
p2 = chunkdata['p2'] | ||||
cs = chunkdata['cs'] | ||||
deltabase = chunkdata['deltabase'] | ||||
delta = chunkdata['delta'] | ||||
|
r31835 | flags = chunkdata['flags'] | ||
|
r14142 | |||
size = len(delta) | ||||
start = bundle.tell() - size | ||||
link = linkmapper(cs) | ||||
|
r1942 | if node in self.nodemap: | ||
|
r14142 | # this can happen if two branches make the same change | ||
chain = node | ||||
|
r18411 | self.bundlerevs.add(self.nodemap[node]) | ||
|
r1942 | continue | ||
|
r14142 | |||
|
r1942 | for p in (p1, p2): | ||
|
r16686 | if p not in self.nodemap: | ||
|
r9650 | raise error.LookupError(p, self.indexfile, | ||
|
r7633 | _("unknown parent")) | ||
|
r18416 | |||
if deltabase not in self.nodemap: | ||||
raise LookupError(deltabase, self.indexfile, | ||||
_('unknown delta base')) | ||||
baserev = self.rev(deltabase) | ||||
|
r5167 | # start, size, full unc. size, base (unused), link, p1, p2, node | ||
|
r31835 | e = (revlog.offset_type(start, flags), size, -1, baserev, link, | ||
|
r4979 | self.rev(p1), self.rev(p2), node) | ||
self.index.insert(-1, e) | ||||
|
r1942 | self.nodemap[node] = n | ||
|
r18411 | self.bundlerevs.add(n) | ||
|
r14142 | chain = node | ||
|
r1942 | n += 1 | ||
|
r9676 | def _chunk(self, rev): | ||
|
r18643 | # Warning: in case of bundle, the diff is against what we stored as | ||
# delta base, not against rev - 1 | ||||
|
r1942 | # XXX: could use some caching | ||
|
r18643 | if rev <= self.repotiprev: | ||
|
r9676 | return revlog.revlog._chunk(self, rev) | ||
|
r12332 | self.bundle.seek(self.start(rev)) | ||
return self.bundle.read(self.length(rev)) | ||||
|
r1942 | |||
def revdiff(self, rev1, rev2): | ||||
"""return or calculate a delta between two revisions""" | ||||
|
r18643 | if rev1 > self.repotiprev and rev2 > self.repotiprev: | ||
|
r1942 | # hot path for bundle | ||
|
r18643 | revb = self.index[rev2][3] | ||
|
r1942 | if revb == rev1: | ||
|
r9676 | return self._chunk(rev2) | ||
|
r18643 | elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: | ||
|
r4028 | return revlog.revlog.revdiff(self, rev1, rev2) | ||
|
r1942 | |||
|
r31837 | return mdiff.textdiff(self.revision(rev1, raw=True), | ||
self.revision(rev2, raw=True)) | ||||
|
r1942 | |||
|
r30743 | def revision(self, nodeorrev, raw=False): | ||
|
r16435 | """return an uncompressed revision of a given node or revision | ||
number. | ||||
""" | ||||
|
r16375 | if isinstance(nodeorrev, int): | ||
rev = nodeorrev | ||||
node = self.node(rev) | ||||
else: | ||||
node = nodeorrev | ||||
rev = self.rev(node) | ||||
|
r10282 | if node == nullid: | ||
return "" | ||||
|
r1942 | |||
|
r31836 | rawtext = None | ||
|
r1942 | chain = [] | ||
|
r18415 | iterrev = rev | ||
|
r1942 | # reconstruct the revision if it is from a changegroup | ||
|
r18643 | while iterrev > self.repotiprev: | ||
|
r18415 | if self._cache and self._cache[1] == iterrev: | ||
|
r31836 | rawtext = self._cache[2] | ||
|
r1942 | break | ||
|
r18415 | chain.append(iterrev) | ||
|
r18643 | iterrev = self.index[iterrev][3] | ||
|
r31836 | if rawtext is None: | ||
rawtext = self.baserevision(iterrev) | ||||
|
r1942 | |||
while chain: | ||||
|
r9676 | delta = self._chunk(chain.pop()) | ||
|
r31836 | rawtext = mdiff.patches(rawtext, [delta]) | ||
|
r1942 | |||
|
r31836 | text, validatehash = self._processflags(rawtext, self.flags(rev), | ||
|
r30745 | 'read', raw=raw) | ||
if validatehash: | ||||
self.checkhash(text, node, rev=rev) | ||||
|
r31836 | self._cache = (node, rev, rawtext) | ||
|
r1942 | return text | ||
|
r19629 | def baserevision(self, nodeorrev): | ||
# Revlog subclasses may override 'revision' method to modify format of | ||||
# content retrieved from revlog. To use bundlerevlog with such class one | ||||
# needs to override 'baserevision' and make more specific call here. | ||||
|
r31834 | return revlog.revlog.revision(self, nodeorrev, raw=True) | ||
|
r19629 | |||
|
r1942 | def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): | ||
raise NotImplementedError | ||||
|
r34216 | def addgroup(self, deltas, transaction, addrevisioncb=None): | ||
|
r1942 | raise NotImplementedError | ||
def strip(self, rev, minlink): | ||||
raise NotImplementedError | ||||
def checksize(self): | ||||
raise NotImplementedError | ||||
|
r1946 | class bundlechangelog(bundlerevlog, changelog.changelog): | ||
|
r12332 | def __init__(self, opener, bundle): | ||
|
r1946 | changelog.changelog.__init__(self, opener) | ||
|
r14142 | linkmapper = lambda x: x | ||
bundlerevlog.__init__(self, opener, self.indexfile, bundle, | ||||
linkmapper) | ||||
|
r1942 | |||
|
r19629 | def baserevision(self, nodeorrev): | ||
# Although changelog doesn't override 'revision' method, some extensions | ||||
# may replace this class with another that does. Same story with | ||||
# manifest and filelog classes. | ||||
|
r24882 | |||
# This bypasses filtering on changelog.node() and rev() because we need | ||||
# revision text of the bundle base even if it is hidden. | ||||
oldfilter = self.filteredrevs | ||||
try: | ||||
self.filteredrevs = () | ||||
|
r31834 | return changelog.changelog.revision(self, nodeorrev, raw=True) | ||
|
r24882 | finally: | ||
self.filteredrevs = oldfilter | ||||
|
r19629 | |||
|
r30373 | class bundlemanifest(bundlerevlog, manifest.manifestrevlog): | ||
|
r29715 | def __init__(self, opener, bundle, linkmapper, dirlogstarts=None, dir=''): | ||
|
r30373 | manifest.manifestrevlog.__init__(self, opener, dir=dir) | ||
|
r12332 | bundlerevlog.__init__(self, opener, self.indexfile, bundle, | ||
|
r4257 | linkmapper) | ||
|
r29715 | if dirlogstarts is None: | ||
dirlogstarts = {} | ||||
if self.bundle.version == "03": | ||||
dirlogstarts = _getfilestarts(self.bundle) | ||||
self._dirlogstarts = dirlogstarts | ||||
self._linkmapper = linkmapper | ||||
|
r1942 | |||
|
r19629 | def baserevision(self, nodeorrev): | ||
|
r26399 | node = nodeorrev | ||
if isinstance(node, int): | ||||
node = self.node(node) | ||||
|
r29925 | if node in self.fulltextcache: | ||
|
r31346 | result = '%s' % self.fulltextcache[node] | ||
|
r26399 | else: | ||
|
r31834 | result = manifest.manifestrevlog.revision(self, nodeorrev, raw=True) | ||
|
r26399 | return result | ||
|
r19629 | |||
|
r29715 | def dirlog(self, d): | ||
if d in self._dirlogstarts: | ||||
self.bundle.seek(self._dirlogstarts[d]) | ||||
return bundlemanifest( | ||||
self.opener, self.bundle, self._linkmapper, | ||||
self._dirlogstarts, dir=d) | ||||
return super(bundlemanifest, self).dirlog(d) | ||||
|
r1946 | class bundlefilelog(bundlerevlog, filelog.filelog): | ||
|
r24921 | def __init__(self, opener, path, bundle, linkmapper): | ||
|
r1946 | filelog.filelog.__init__(self, opener, path) | ||
|
r12332 | bundlerevlog.__init__(self, opener, self.indexfile, bundle, | ||
|
r4257 | linkmapper) | ||
|
r14287 | |||
|
r19629 | def baserevision(self, nodeorrev): | ||
|
r31834 | return filelog.filelog.revision(self, nodeorrev, raw=True) | ||
|
r19629 | |||
|
r17193 | class bundlepeer(localrepo.localpeer): | ||
def canpush(self): | ||||
return False | ||||
|
r23631 | class bundlephasecache(phases.phasecache): | ||
def __init__(self, *args, **kwargs): | ||||
super(bundlephasecache, self).__init__(*args, **kwargs) | ||||
if util.safehasattr(self, 'opener'): | ||||
|
r31240 | self.opener = vfsmod.readonlyvfs(self.opener) | ||
|
r23631 | |||
def write(self): | ||||
raise NotImplementedError | ||||
def _write(self, fp): | ||||
raise NotImplementedError | ||||
def _updateroots(self, phase, newroots, tr): | ||||
self.phaseroots[phase] = newroots | ||||
self.invalidate() | ||||
self.dirty = True | ||||
|
r29712 | def _getfilestarts(bundle): | ||
bundlefilespos = {} | ||||
for chunkdata in iter(bundle.filelogheader, {}): | ||||
fname = chunkdata['filename'] | ||||
bundlefilespos[fname] = bundle.tell() | ||||
for chunk in iter(lambda: bundle.deltachunk(None), {}): | ||||
pass | ||||
return bundlefilespos | ||||
|
r1946 | class bundlerepository(localrepo.localrepository): | ||
|
r1942 | def __init__(self, ui, path, bundlename): | ||
|
r6314 | self._tempparent = None | ||
try: | ||||
localrepo.localrepository.__init__(self, ui, path) | ||||
|
r7637 | except error.RepoError: | ||
|
r6314 | self._tempparent = tempfile.mkdtemp() | ||
|
r9198 | localrepo.instance(ui, self._tempparent, 1) | ||
|
r6314 | localrepo.localrepository.__init__(self, ui, self._tempparent) | ||
|
r20790 | self.ui.setconfig('phases', 'publish', False, 'bundlerepo') | ||
|
r2673 | |||
|
r6129 | if path: | ||
|
r11154 | self._url = 'bundle:' + util.expandpath(path) + '+' + bundlename | ||
|
r6129 | else: | ||
self._url = 'bundle:' + bundlename | ||||
|
r2673 | |||
|
r2273 | self.tempfile = None | ||
|
r13274 | f = util.posixfile(bundlename, "rb") | ||
|
r24072 | self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlename) | ||
|
r12044 | |||
|
r24073 | if isinstance(self.bundle, bundle2.unbundle20): | ||
|
r33890 | hadchangegroup = False | ||
|
r26803 | for part in self.bundle.iterparts(): | ||
if part.type == 'changegroup': | ||||
|
r33890 | if hadchangegroup: | ||
|
r26803 | raise NotImplementedError("can't process " | ||
"multiple changegroups") | ||||
|
r33890 | hadchangegroup = True | ||
|
r24073 | |||
|
r33890 | self._handlebundle2part(part) | ||
|
r24073 | |||
|
r33890 | if not hadchangegroup: | ||
raise error.Abort(_("No changegroups found")) | ||||
|
r24073 | |||
|
r26801 | elif self.bundle.compressed(): | ||
|
r33888 | f = self._writetempbundle(self.bundle.read, '.hg10un', | ||
header='HG10UN') | ||||
|
r26801 | self.bundlefile = self.bundle = exchange.readbundle(ui, f, | ||
bundlename, | ||||
self.vfs) | ||||
|
r1942 | # dict with the mapping 'filename' -> position in the bundle | ||
self.bundlefilespos = {} | ||||
|
r5262 | |||
|
r23632 | self.firstnewrev = self.changelog.repotiprev + 1 | ||
phases.retractboundary(self, None, phases.draft, | ||||
[ctx.node() for ctx in self[self.firstnewrev:]]) | ||||
|
r33890 | def _handlebundle2part(self, part): | ||
if part.type == 'changegroup': | ||||
cgstream = part | ||||
version = part.params.get('version', '01') | ||||
legalcgvers = changegroup.supportedincomingversions(self) | ||||
if version not in legalcgvers: | ||||
msg = _('Unsupported changegroup version: %s') | ||||
raise error.Abort(msg % version) | ||||
if self.bundle.compressed(): | ||||
cgstream = self._writetempbundle(part.read, | ||||
".cg%sun" % version) | ||||
self.bundle = changegroup.getunbundler(version, cgstream, 'UN') | ||||
|
r33888 | def _writetempbundle(self, readfn, suffix, header=''): | ||
"""Write a temporary file to disk | ||||
""" | ||||
fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | ||||
suffix=".hg10un") | ||||
self.tempfile = temp | ||||
with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp: | ||||
fptemp.write(header) | ||||
while True: | ||||
chunk = readfn(2**18) | ||||
if not chunk: | ||||
break | ||||
fptemp.write(chunk) | ||||
return self.vfs.open(self.tempfile, mode="rb") | ||||
|
r18014 | @localrepo.unfilteredpropertycache | ||
|
r23631 | def _phasecache(self): | ||
return bundlephasecache(self, self._phasedefaults) | ||||
@localrepo.unfilteredpropertycache | ||||
|
r8260 | def changelog(self): | ||
|
r14144 | # consume the header if it exists | ||
self.bundle.changelogheader() | ||||
|
r23878 | c = bundlechangelog(self.svfs, self.bundle) | ||
|
r12332 | self.manstart = self.bundle.tell() | ||
|
r8260 | return c | ||
|
r30218 | def _constructmanifest(self): | ||
|
r12332 | self.bundle.seek(self.manstart) | ||
|
r14144 | # consume the header if it exists | ||
self.bundle.manifestheader() | ||||
|
r28221 | linkmapper = self.unfiltered().changelog.rev | ||
m = bundlemanifest(self.svfs, self.bundle, linkmapper) | ||||
|
r12332 | self.filestart = self.bundle.tell() | ||
|
r8260 | return m | ||
|
r18014 | @localrepo.unfilteredpropertycache | ||
|
r8260 | def manstart(self): | ||
self.changelog | ||||
return self.manstart | ||||
|
r18014 | @localrepo.unfilteredpropertycache | ||
|
r8260 | def filestart(self): | ||
|
r30375 | self.manifestlog | ||
|
r8260 | return self.filestart | ||
|
r1942 | |||
|
r2673 | def url(self): | ||
return self._url | ||||
|
r1942 | def file(self, f): | ||
|
r5262 | if not self.bundlefilespos: | ||
|
r12332 | self.bundle.seek(self.filestart) | ||
|
r29712 | self.bundlefilespos = _getfilestarts(self.bundle) | ||
|
r5262 | |||
|
r1942 | if f in self.bundlefilespos: | ||
|
r12332 | self.bundle.seek(self.bundlefilespos[f]) | ||
|
r28186 | linkmapper = self.unfiltered().changelog.rev | ||
return bundlefilelog(self.svfs, f, self.bundle, linkmapper) | ||||
|
r1942 | else: | ||
|
r23878 | return filelog.filelog(self.svfs, f) | ||
|
r1942 | |||
|
r12347 | def close(self): | ||
"""Close assigned bundle file immediately.""" | ||||
|
r24072 | self.bundlefile.close() | ||
|
r12962 | if self.tempfile is not None: | ||
|
r20981 | self.vfs.unlink(self.tempfile) | ||
|
r6314 | if self._tempparent: | ||
shutil.rmtree(self._tempparent, True) | ||||
|
r2740 | |||
|
r6315 | def cancopy(self): | ||
return False | ||||
|
r17193 | def peer(self): | ||
return bundlepeer(self) | ||||
|
r7435 | def getcwd(self): | ||
|
r30519 | return pycompat.getcwd() # always outside the repo | ||
|
r7435 | |||
|
r28714 | # Check if parents exist in localrepo before setting | ||
def setparents(self, p1, p2=nullid): | ||||
p1rev = self.changelog.rev(p1) | ||||
p2rev = self.changelog.rev(p2) | ||||
msg = _("setting parent to node %s that only exists in the bundle\n") | ||||
if self.changelog.repotiprev < p1rev: | ||||
self.ui.warn(msg % nodemod.hex(p1)) | ||||
if self.changelog.repotiprev < p2rev: | ||||
self.ui.warn(msg % nodemod.hex(p2)) | ||||
return super(bundlerepository, self).setparents(p1, p2) | ||||
|
r15597 | |||
|
r2740 | def instance(ui, path, create): | ||
if create: | ||||
|
r26587 | raise error.Abort(_('cannot create new bundle repository')) | ||
|
r25830 | # internal config: bundle.mainreporoot | ||
r33179 | parentpath = ui.config("bundle", "mainreporoot") | |||
|
r16042 | if not parentpath: | ||
# try to find the correct path to the working directory repo | ||||
|
r30519 | parentpath = cmdutil.findrepo(pycompat.getcwd()) | ||
|
r16042 | if parentpath is None: | ||
parentpath = '' | ||||
|
r5664 | if parentpath: | ||
# Try to make the full path relative so we get a nice, short URL. | ||||
# In particular, we don't want temp dir names in test outputs. | ||||
|
r30519 | cwd = pycompat.getcwd() | ||
|
r5664 | if parentpath == cwd: | ||
parentpath = '' | ||||
else: | ||||
|
r24834 | cwd = pathutil.normasprefix(cwd) | ||
|
r5664 | if parentpath.startswith(cwd): | ||
parentpath = parentpath[len(cwd):] | ||||
|
r14076 | u = util.url(path) | ||
|
r13826 | path = u.localpath() | ||
if u.scheme == 'bundle': | ||||
|
r2740 | s = path.split("+", 1) | ||
if len(s) == 1: | ||||
|
r5664 | repopath, bundlename = parentpath, s[0] | ||
|
r2740 | else: | ||
repopath, bundlename = s | ||||
else: | ||||
|
r5664 | repopath, bundlename = parentpath, path | ||
|
r2740 | return bundlerepository(ui, repopath, bundlename) | ||
|
r12734 | |||
|
r23633 | class bundletransactionmanager(object): | ||
def transaction(self): | ||||
return None | ||||
def close(self): | ||||
raise NotImplementedError | ||||
def release(self): | ||||
raise NotImplementedError | ||||
|
r14161 | def getremotechanges(ui, repo, other, onlyheads=None, bundlename=None, | ||
|
r14073 | force=False): | ||
|
r14161 | '''obtains a bundle of changes incoming from other | ||
"onlyheads" restricts the returned changes to those reachable from the | ||||
specified heads. | ||||
"bundlename", if given, stores the bundle to this file path permanently; | ||||
|
r14190 | otherwise it's stored to a temp file and gets deleted again when you call | ||
the returned "cleanupfn". | ||||
|
r14161 | "force" indicates whether to proceed on unrelated repos. | ||
Returns a tuple (local, csets, cleanupfn): | ||||
|
r16683 | "local" is a local repo from which to obtain the actual incoming | ||
changesets; it is a bundlerepo for the obtained bundle when the | ||||
original "other" is remote. | ||||
|
r14161 | "csets" lists the incoming changeset node ids. | ||
|
r16683 | "cleanupfn" must be called without arguments when you're done processing | ||
the changes; it closes both the original "other" and the one returned | ||||
here. | ||||
|
r14161 | ''' | ||
|
r16683 | tmp = discovery.findcommonincoming(repo, other, heads=onlyheads, | ||
force=force) | ||||
|
r12734 | common, incoming, rheads = tmp | ||
if not incoming: | ||||
try: | ||||
|
r15091 | if bundlename: | ||
|
r21694 | os.unlink(bundlename) | ||
|
r14004 | except OSError: | ||
|
r12734 | pass | ||
|
r18138 | return repo, [], other.close | ||
|
r12734 | |||
|
r22182 | commonset = set(common) | ||
rheads = [x for x in rheads if x not in commonset] | ||||
|
r12734 | bundle = None | ||
|
r14161 | bundlerepo = None | ||
|
r17191 | localrepo = other.local() | ||
if bundlename or not localrepo: | ||||
|
r12734 | # create a bundle (uncompressed if other repo is not local) | ||
|
r29684 | # developer config: devel.legacy.exchange | ||
legexc = ui.configlist('devel', 'legacy.exchange') | ||||
|
r29689 | forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc | ||
|
r29684 | canbundle2 = (not forcebundle1 | ||
|
r26544 | and other.capable('getbundle') | ||
and other.capable('bundle2')) | ||||
if canbundle2: | ||||
kwargs = {} | ||||
kwargs['common'] = common | ||||
kwargs['heads'] = rheads | ||||
kwargs['bundlecaps'] = exchange.caps20to10(repo) | ||||
kwargs['cg'] = True | ||||
b2 = other.getbundle('incoming', **kwargs) | ||||
fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(), | ||||
bundlename) | ||||
else: | ||||
|
r26543 | if other.capable('getbundle'): | ||
cg = other.getbundle('incoming', common=common, heads=rheads) | ||||
elif onlyheads is None and not other.capable('changegroupsubset'): | ||||
# compat with older servers when pulling all remote heads | ||||
cg = other.changegroup(incoming, "incoming") | ||||
rheads = None | ||||
else: | ||||
cg = other.changegroupsubset(incoming, rheads, 'incoming') | ||||
if localrepo: | ||||
bundletype = "HG10BZ" | ||||
else: | ||||
bundletype = "HG10UN" | ||||
|
r28666 | fname = bundle = bundle2.writebundle(ui, cg, bundlename, | ||
|
r26543 | bundletype) | ||
|
r12734 | # keep written bundle? | ||
if bundlename: | ||||
bundle = None | ||||
|
r17191 | if not localrepo: | ||
|
r12734 | # use the created uncompressed bundlerepo | ||
|
r18825 | localrepo = bundlerepo = bundlerepository(repo.baseui, repo.root, | ||
fname) | ||||
|
r14161 | # this repo contains local and other now, so filter out local again | ||
common = repo.heads() | ||||
|
r18568 | if localrepo: | ||
# Part of common may be remotely filtered | ||||
# So use an unfiltered version | ||||
# The discovery process probably need cleanup to avoid that | ||||
localrepo = localrepo.unfiltered() | ||||
|
r14161 | |||
|
r14412 | csets = localrepo.changelog.findmissing(common, rheads) | ||
|
r12734 | |||
|
r23633 | if bundlerepo: | ||
reponodes = [ctx.node() for ctx in bundlerepo[bundlerepo.firstnewrev:]] | ||||
remotephases = other.listkeys('phases') | ||||
pullop = exchange.pulloperation(bundlerepo, other, heads=reponodes) | ||||
pullop.trmanager = bundletransactionmanager() | ||||
exchange._pullapplyphases(pullop, remotephases) | ||||
|
r14161 | def cleanup(): | ||
if bundlerepo: | ||||
bundlerepo.close() | ||||
if bundle: | ||||
|
r21694 | os.unlink(bundle) | ||
|
r14190 | other.close() | ||
|
r14161 | |||
return (localrepo, csets, cleanup) | ||||