mercurial-scm/hg: comparison mercurial/bundlerepo.py

equal deleted inserted replaced

-:add129811176
+:d959277ff1b5
 raise NotImplementedError
 def release(self):
 raise NotImplementedError
-def getremotechanges(ui, repo, other, onlyheads=None, bundlename=None,
+def getremotechanges(ui, repo, peer, onlyheads=None, bundlename=None,
 force=False):
-'''obtains a bundle of changes incoming from other
+'''obtains a bundle of changes incoming from peer
 "onlyheads" restricts the returned changes to those reachable from the
 specified heads.
 "bundlename", if given, stores the bundle to this file path permanently;
 otherwise it's stored to a temp file and gets deleted again when you call
 Returns a tuple (local, csets, cleanupfn):
 "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.
+original "peer" is remote.
 "csets" lists the incoming changeset node ids.
 "cleanupfn" must be called without arguments when you're done processing
-the changes; it closes both the original "other" and the one returned
+the changes; it closes both the original "peer" and the one returned
 here.
 '''
-tmp = discovery.findcommonincoming(repo, other, heads=onlyheads,
+tmp = discovery.findcommonincoming(repo, peer, heads=onlyheads,
 force=force)
 common, incoming, rheads = tmp
 if not incoming:
 try:
 if bundlename:
 os.unlink(bundlename)
 except OSError:
 pass
-return repo, [], other.close
+return repo, [], peer.close
 commonset = set(common)
 rheads = [x for x in rheads if x not in commonset]
 bundle = None
 bundlerepo = None
-localrepo = other.local()
+localrepo = peer.local()
 if bundlename or not localrepo:
-# create a bundle (uncompressed if other repo is not local)
+# create a bundle (uncompressed if peer repo is not local)
 # developer config: devel.legacy.exchange
 legexc = ui.configlist('devel', 'legacy.exchange')
 forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc
 canbundle2 = (not forcebundle1
-and other.capable('getbundle')
+and peer.capable('getbundle')
-and other.capable('bundle2'))
+and peer.capable('bundle2'))
 if canbundle2:
 kwargs = {}
 kwargs[r'common'] = common
 kwargs[r'heads'] = rheads
 kwargs[r'bundlecaps'] = exchange.caps20to10(repo, role='client')
 kwargs[r'cg'] = True
-b2 = other.getbundle('incoming', **kwargs)
+b2 = peer.getbundle('incoming', **kwargs)
 fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(),
 bundlename)
 else:
-if other.capable('getbundle'):
+if peer.capable('getbundle'):
-cg = other.getbundle('incoming', common=common, heads=rheads)
+cg = peer.getbundle('incoming', common=common, heads=rheads)
-elif onlyheads is None and not other.capable('changegroupsubset'):
+elif onlyheads is None and not peer.capable('changegroupsubset'):
 # compat with older servers when pulling all remote heads
-with other.commandexecutor() as e:
+with peer.commandexecutor() as e:
 cg = e.callcommand('changegroup', {
 'nodes': incoming,
 'source': 'incoming',
 }).result()
 rheads = None
 else:
-with other.commandexecutor() as e:
+with peer.commandexecutor() as e:
 cg = e.callcommand('changegroupsubset', {
 'bases': incoming,
 'heads': rheads,
 'source': 'incoming',
 }).result()
 bundle = None
 if not localrepo:
 # use the created uncompressed bundlerepo
 localrepo = bundlerepo = bundlerepository(repo.baseui, repo.root,
 fname)
-# this repo contains local and other now, so filter out local again
+# this repo contains local and peer now, so filter out local again
 common = repo.heads()
 if localrepo:
 # Part of common may be remotely filtered
 # So use an unfiltered version
 # The discovery process probably need cleanup to avoid that
 csets = localrepo.changelog.findmissing(common, rheads)
 if bundlerepo:
 reponodes = [ctx.node() for ctx in bundlerepo[bundlerepo.firstnewrev:]]
-remotephases = other.listkeys('phases')
+remotephases = peer.listkeys('phases')
-pullop = exchange.pulloperation(bundlerepo, other, heads=reponodes)
+pullop = exchange.pulloperation(bundlerepo, peer, heads=reponodes)
 pullop.trmanager = bundletransactionmanager()
 exchange._pullapplyphases(pullop, remotephases)
 def cleanup():
 if bundlerepo:
 bundlerepo.close()
 if bundle:
 os.unlink(bundle)
-other.close()
+peer.close()
 return (localrepo, csets, cleanup)

changeset 37642	d959277ff1b5
parent 37635	cc8c06835097
child 37643	1aa4d646d0de