mercurial-scm/hg: mercurial/exchange.py annotate

annotate mercurial/exchange.py @ 20472:b97a453b8c27

pull: introduce a pulloperation object This object will hold all data and state gathered through the pull. This will allow us to split the long function into multiple small one. Smaller function will be easier to maintains and wrap. The idea is to blindly store all information related to the pull in this object so that each step and extension can use them if necessary. We start by putting the `repo` variable in the object. More migration in other function.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Thu, 30 Jan 2014 17:24:49 -0800
parents	6b4c789d618d
children	1516daaca632

rev	line source
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1 # exchange.py - utily to exchange data between repo.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	7
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	8 from i18n import _
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	9 from node import hex, nullid
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	10 import errno
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	11 import util, scmutil, changegroup
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	12 import discovery, phases, obsolete, bookmarks
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	13
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	14
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	15 class pushoperation(object):
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	16 """A object that represent a single push operation
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	17
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	18 It purpose is to carry push related state and very common operation.
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	19
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	20 A new should be created at the begining of each push and discarded
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	21 afterward.
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	22 """
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	23
20351 c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	24 def __init__(self, repo, remote, force=False, revs=None, newbranch=False):
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	25 # repo we push from
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	26 self.repo = repo
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	27 self.ui = repo.ui
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	28 # repo we push to
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	29 self.remote = remote
20349 89f90457979e push: move `force` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20348 diff changeset	30 # force option provided
89f90457979e push: move `force` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20348 diff changeset	31 self.force = force
20350 8c85d968ee65 push: move `revs` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20349 diff changeset	32 # revs to be pushed (None is "all")
8c85d968ee65 push: move `revs` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20349 diff changeset	33 self.revs = revs
20351 c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	34 # allow push of new branch
c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	35 self.newbranch = newbranch
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	36 # did a local lock get acquired?
2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	37 self.locallocked = None
20439 0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	38 # Integer version of the push result
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	39 # - None means nothing to push
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	40 # - 0 means HTTP error
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	41 # - 1 means we pushed and remote head count is unchanged or
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	42 # we have outgoing changesets but refused to push
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	43 # - other values as described by addchangegroup()
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	44 self.ret = None
20440 400da8bc7786 push: move outgoing object in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20439 diff changeset	45 # discover.outgoing object (contains common and outgoin data)
400da8bc7786 push: move outgoing object in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20439 diff changeset	46 self.outgoing = None
20462 0031ef5df586 push: move `remoteheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20441 diff changeset	47 # all remote heads before the push
0031ef5df586 push: move `remoteheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20441 diff changeset	48 self.remoteheads = None
20464 d032417db243 push: move `incoming` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20463 diff changeset	49 # testable as a boolean indicating if any nodes are missing locally.
d032417db243 push: move `incoming` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20463 diff changeset	50 self.incoming = None
20467 ef880ced6d07 push: move `commonheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20466 diff changeset	51 # set of all heads common after changeset bundle push
ef880ced6d07 push: move `commonheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20466 diff changeset	52 self.commonheads = None
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	53
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	54 def push(repo, remote, force=False, revs=None, newbranch=False):
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	55 '''Push outgoing changesets (limited by revs) from a local
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	56 repository to remote. Return an integer:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	57 - None means nothing to push
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	58 - 0 means HTTP error
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	59 - 1 means we pushed and remote head count is unchanged or
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	60 we have outgoing changesets but refused to push
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	61 - other values as described by addchangegroup()
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	62 '''
20351 c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	63 pushop = pushoperation(repo, remote, force, revs, newbranch)
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	64 if pushop.remote.local():
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	65 missing = (set(pushop.repo.requirements)
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	66 - pushop.remote.local().supported)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	67 if missing:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	68 msg = _("required features are not"
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	69 " supported in the destination:"
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	70 " %s") % (', '.join(sorted(missing)))
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	71 raise util.Abort(msg)
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	72
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	73 # there are two ways to push to remote repo:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	74 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	75 # addchangegroup assumes local user can lock remote
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	76 # repo (local filesystem, old ssh servers).
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	77 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	78 # unbundle assumes local user cannot lock remote repo (new ssh
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	79 # servers, http servers).
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	80
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	81 if not pushop.remote.canpush():
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	82 raise util.Abort(_("destination does not support push"))
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	83 # get local lock as we might write phase data
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	84 locallock = None
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	85 try:
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	86 locallock = pushop.repo.lock()
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	87 pushop.locallocked = True
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	88 except IOError, err:
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	89 pushop.locallocked = False
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	90 if err.errno != errno.EACCES:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	91 raise
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	92 # source repo cannot be locked.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	93 # We do not abort the push, but just disable the local phase
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	94 # synchronisation.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	95 msg = 'cannot lock source repository: %s\n' % err
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	96 pushop.ui.debug(msg)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	97 try:
20350 8c85d968ee65 push: move `revs` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20349 diff changeset	98 pushop.repo.checkpush(pushop.force, pushop.revs)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	99 lock = None
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	100 unbundle = pushop.remote.capable('unbundle')
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	101 if not unbundle:
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	102 lock = pushop.remote.lock()
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	103 try:
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	104 _pushdiscovery(pushop)
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	105 if _pushcheckoutgoing(pushop):
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	106 _pushchangeset(pushop)
20468 7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	107 _pushcomputecommonheads(pushop)
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	108 _pushsyncphase(pushop)
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	109 _pushobsolete(pushop)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	110 finally:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	111 if lock is not None:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	112 lock.release()
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	113 finally:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	114 if locallock is not None:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	115 locallock.release()
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	116
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	117 _pushbookmark(pushop)
20439 0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	118 return pushop.ret
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	119
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	120 def _pushdiscovery(pushop):
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	121 # discovery
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	122 unfi = pushop.repo.unfiltered()
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	123 fci = discovery.findcommonincoming
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	124 commoninc = fci(unfi, pushop.remote, force=pushop.force)
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	125 common, inc, remoteheads = commoninc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	126 fco = discovery.findcommonoutgoing
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	127 outgoing = fco(unfi, pushop.remote, onlyheads=pushop.revs,
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	128 commoninc=commoninc, force=pushop.force)
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	129 pushop.outgoing = outgoing
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	130 pushop.remoteheads = remoteheads
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	131 pushop.incoming = inc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	132
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	133 def _pushcheckoutgoing(pushop):
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	134 outgoing = pushop.outgoing
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	135 unfi = pushop.repo.unfiltered()
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	136 if not outgoing.missing:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	137 # nothing to push
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	138 scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded)
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	139 return False
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	140 # something to push
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	141 if not pushop.force:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	142 # if repo.obsstore == False --> no obsolete
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	143 # then, save the iteration
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	144 if unfi.obsstore:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	145 # this message are here for 80 char limit reason
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	146 mso = _("push includes obsolete changeset: %s!")
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	147 mst = "push includes %s changeset: %s!"
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	148 # plain versions for i18n tool to detect them
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	149 _("push includes unstable changeset: %s!")
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	150 _("push includes bumped changeset: %s!")
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	151 _("push includes divergent changeset: %s!")
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	152 # If we are to push if there is at least one
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	153 # obsolete or unstable changeset in missing, at
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	154 # least one of the missinghead will be obsolete or
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	155 # unstable. So checking heads only is ok
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	156 for node in outgoing.missingheads:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	157 ctx = unfi[node]
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	158 if ctx.obsolete():
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	159 raise util.Abort(mso % ctx)
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	160 elif ctx.troubled():
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	161 raise util.Abort(_(mst)
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	162 % (ctx.troubles()[0],
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	163 ctx))
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	164 newbm = pushop.ui.configlist('bookmarks', 'pushing')
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	165 discovery.checkheads(unfi, pushop.remote, outgoing,
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	166 pushop.remoteheads,
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	167 pushop.newbranch,
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	168 bool(pushop.incoming),
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	169 newbm)
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	170 return True
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	171
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	172 def _pushchangeset(pushop):
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	173 """Make the actual push of changeset bundle to remote repo"""
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	174 outgoing = pushop.outgoing
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	175 unbundle = pushop.remote.capable('unbundle')
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	176 # TODO: get bundlecaps from remote
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	177 bundlecaps = None
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	178 # create a changegroup from local
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	179 if pushop.revs is None and not (outgoing.excluded
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	180 or pushop.repo.changelog.filteredrevs):
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	181 # push everything,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	182 # use the fast path, no race possible on push
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	183 bundler = changegroup.bundle10(pushop.repo, bundlecaps)
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	184 cg = pushop.repo._changegroupsubset(outgoing,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	185 bundler,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	186 'push',
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	187 fastpath=True)
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	188 else:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	189 cg = pushop.repo.getlocalbundle('push', outgoing, bundlecaps)
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	190
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	191 # apply changegroup to remote
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	192 if unbundle:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	193 # local repo finds heads on server, finds out what
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	194 # revs it must push. once revs transferred, if server
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	195 # finds it has different heads (someone else won
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	196 # commit/push race), server aborts.
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	197 if pushop.force:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	198 remoteheads = ['force']
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	199 else:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	200 remoteheads = pushop.remoteheads
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	201 # ssh: return remote's addchangegroup()
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	202 # http: return remote's addchangegroup() or 0 for error
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	203 pushop.ret = pushop.remote.unbundle(cg, remoteheads,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	204 'push')
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	205 else:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	206 # we return an integer indicating remote head count
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	207 # change
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	208 pushop.ret = pushop.remote.addchangegroup(cg, 'push',
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	209 pushop.repo.url())
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	210
20468 7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	211 def _pushcomputecommonheads(pushop):
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	212 unfi = pushop.repo.unfiltered()
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	213 if pushop.ret:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	214 # push succeed, synchronize target of the push
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	215 cheads = pushop.outgoing.missingheads
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	216 elif pushop.revs is None:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	217 # All out push fails. synchronize all common
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	218 cheads = pushop.outgoing.commonheads
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	219 else:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	220 # I want cheads = heads(::missingheads and ::commonheads)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	221 # (missingheads is revs with secret changeset filtered out)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	222 #
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	223 # This can be expressed as:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	224 # cheads = ( (missingheads and ::commonheads)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	225 # + (commonheads and ::missingheads))"
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	226 # )
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	227 #
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	228 # while trying to push we already computed the following:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	229 # common = (::commonheads)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	230 # missing = ((commonheads::missingheads) - commonheads)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	231 #
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	232 # We can pick:
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	233 # * missingheads part of common (::commonheads)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	234 common = set(pushop.outgoing.common)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	235 nm = pushop.repo.changelog.nodemap
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	236 cheads = [node for node in pushop.revs if nm[node] in common]
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	237 # and
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	238 # * commonheads parents on missing
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	239 revset = unfi.set('%ln and parents(roots(%ln))',
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	240 pushop.outgoing.commonheads,
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	241 pushop.outgoing.missing)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	242 cheads.extend(c.node() for c in revset)
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	243 pushop.commonheads = cheads
7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	244
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	245 def _pushsyncphase(pushop):
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	246 """synchronise phase information locally and remotly"""
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	247 unfi = pushop.repo.unfiltered()
20468 7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	248 cheads = pushop.commonheads
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	249 if pushop.ret:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	250 # push succeed, synchronize target of the push
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	251 cheads = pushop.outgoing.missingheads
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	252 elif pushop.revs is None:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	253 # All out push fails. synchronize all common
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	254 cheads = pushop.outgoing.commonheads
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	255 else:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	256 # I want cheads = heads(::missingheads and ::commonheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	257 # (missingheads is revs with secret changeset filtered out)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	258 #
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	259 # This can be expressed as:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	260 # cheads = ( (missingheads and ::commonheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	261 # + (commonheads and ::missingheads))"
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	262 # )
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	263 #
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	264 # while trying to push we already computed the following:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	265 # common = (::commonheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	266 # missing = ((commonheads::missingheads) - commonheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	267 #
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	268 # We can pick:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	269 # * missingheads part of common (::commonheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	270 common = set(pushop.outgoing.common)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	271 nm = pushop.repo.changelog.nodemap
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	272 cheads = [node for node in pushop.revs if nm[node] in common]
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	273 # and
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	274 # * commonheads parents on missing
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	275 revset = unfi.set('%ln and parents(roots(%ln))',
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	276 pushop.outgoing.commonheads,
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	277 pushop.outgoing.missing)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	278 cheads.extend(c.node() for c in revset)
20467 ef880ced6d07 push: move `commonheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20466 diff changeset	279 pushop.commonheads = cheads
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	280 # even when we don't push, exchanging phase data is useful
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	281 remotephases = pushop.remote.listkeys('phases')
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	282 if (pushop.ui.configbool('ui', '_usedassubrepo', False)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	283 and remotephases # server supports phases
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	284 and pushop.ret is None # nothing was pushed
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	285 and remotephases.get('publishing', False)):
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	286 # When:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	287 # - this is a subrepo push
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	288 # - and remote support phase
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	289 # - and no changeset was pushed
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	290 # - and remote is publishing
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	291 # We may be in issue 3871 case!
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	292 # We drop the possible phase synchronisation done by
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	293 # courtesy to publish changesets possibly locally draft
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	294 # on the remote.
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	295 remotephases = {'publishing': 'True'}
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	296 if not remotephases: # old server or public only rer
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	297 _localphasemove(pushop, cheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	298 # don't push any phase data as there is nothing to push
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	299 else:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	300 ana = phases.analyzeremotephases(pushop.repo, cheads,
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	301 remotephases)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	302 pheads, droots = ana
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	303 ### Apply remote phase on local
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	304 if remotephases.get('publishing', False):
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	305 _localphasemove(pushop, cheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	306 else: # publish = False
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	307 _localphasemove(pushop, pheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	308 _localphasemove(pushop, cheads, phases.draft)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	309 ### Apply local phase on remote
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	310
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	311 # Get the list of all revs draft on remote by public here.
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	312 # XXX Beware that revset break if droots is not strictly
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	313 # XXX root we may want to ensure it is but it is costly
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	314 outdated = unfi.set('heads((%ln::%ln) and public())',
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	315 droots, cheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	316 for newremotehead in outdated:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	317 r = pushop.remote.pushkey('phases',
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	318 newremotehead.hex(),
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	319 str(phases.draft),
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	320 str(phases.public))
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	321 if not r:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	322 pushop.ui.warn(_('updating %s to public failed!\n')
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	323 % newremotehead)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	324
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	325 def _localphasemove(pushop, nodes, phase=phases.public):
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	326 """move <nodes> to <phase> in the local source repo"""
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	327 if pushop.locallocked:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	328 phases.advanceboundary(pushop.repo, phase, nodes)
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	329 else:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	330 # repo is not locked, do not change any phases!
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	331 # Informs the user that phases should have been moved when
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	332 # applicable.
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	333 actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()]
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	334 phasestr = phases.phasenames[phase]
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	335 if actualmoves:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	336 pushop.ui.status(_('cannot lock source repo, skipping '
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	337 'local %s phase update\n') % phasestr)
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	338
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	339 def _pushobsolete(pushop):
20434 e009e59e4566 push: drop now outdated comment Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20433 diff changeset	340 """utility function to push obsolete markers to a remote"""
20435 46ede894d5a4 push: move obsolescence related message into _pushobsolescence function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20434 diff changeset	341 pushop.ui.debug('try to push obsolete markers to remote\n')
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	342 repo = pushop.repo
6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	343 remote = pushop.remote
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	344 if (obsolete._enabled and repo.obsstore and
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	345 'obsolete' in remote.listkeys('namespaces')):
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	346 rslts = []
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	347 remotedata = repo.listkeys('obsolete')
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	348 for key in sorted(remotedata, reverse=True):
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	349 # reverse sort to ensure we end with dump0
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	350 data = remotedata[key]
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	351 rslts.append(remote.pushkey('obsolete', key, '', data))
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	352 if [r for r in rslts if not r]:
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	353 msg = _('failed to push some obsolete markers!\n')
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	354 repo.ui.warn(msg)
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	355
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	356 def _pushbookmark(pushop):
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	357 """Update bookmark position on remote"""
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	358 ui = pushop.ui
bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	359 repo = pushop.repo.unfiltered()
bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	360 remote = pushop.remote
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	361 ui.debug("checking for updated bookmarks\n")
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	362 revnums = map(repo.changelog.rev, pushop.revs or [])
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	363 ancestors = [a for a in repo.changelog.ancestors(revnums, inclusive=True)]
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	364 (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	365 ) = bookmarks.compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	366 srchex=hex)
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	367
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	368 for b, scid, dcid in advsrc:
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	369 if ancestors and repo[scid].rev() not in ancestors:
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	370 continue
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	371 if remote.pushkey('bookmarks', b, dcid, scid):
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	372 ui.status(_("updating bookmark %s\n") % b)
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	373 else:
58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	374 ui.warn(_('updating bookmark %s failed!\n') % b)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	375
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	376 class pulloperation(object):
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	377 """A object that represent a single pull operation
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	378
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	379 It purpose is to carry push related state and very common operation.
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	380
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	381 A new should be created at the begining of each push and discarded
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	382 afterward.
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	383 """
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	384
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	385 def __init__(self, repo):
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	386 # repo we pull from
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	387 self.repo = repo
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	388
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	389 def pull(repo, remote, heads=None, force=False):
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	390 pullop = pulloperation(repo)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	391 if remote.local():
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	392 missing = set(remote.requirements) - pullop.repo.supported
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	393 if missing:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	394 msg = _("required features are not"
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	395 " supported in the destination:"
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	396 " %s") % (', '.join(sorted(missing)))
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	397 raise util.Abort(msg)
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	398
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	399 # don't open transaction for nothing or you break future useful
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	400 # rollback call
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	401 tr = None
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	402 trname = 'pull\n' + util.hidepassword(remote.url())
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	403 lock = pullop.repo.lock()
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	404 try:
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	405 tmp = discovery.findcommonincoming(pullop.repo.unfiltered(), remote,
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	406 heads=heads, force=force)
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	407 common, fetch, rheads = tmp
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	408 if not fetch:
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	409 pullop.repo.ui.status(_("no changes found\n"))
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	410 result = 0
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	411 else:
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	412 tr = pullop.repo.transaction(trname)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	413 if heads is None and list(common) == [nullid]:
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	414 pullop.repo.ui.status(_("requesting all changes\n"))
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	415 elif heads is None and remote.capable('changegroupsubset'):
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	416 # issue1320, avoid a race if remote changed after discovery
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	417 heads = rheads
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	418
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	419 if remote.capable('getbundle'):
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	420 # TODO: get bundlecaps from remote
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	421 cg = remote.getbundle('pull', common=common,
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	422 heads=heads or rheads)
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	423 elif heads is None:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	424 cg = remote.changegroup(fetch, 'pull')
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	425 elif not remote.capable('changegroupsubset'):
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	426 raise util.Abort(_("partial pull cannot be done because "
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	427 "other repository doesn't support "
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	428 "changegroupsubset."))
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	429 else:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	430 cg = remote.changegroupsubset(fetch, heads, 'pull')
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	431 result = pullop.repo.addchangegroup(cg, 'pull', remote.url())
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	432
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	433 # compute target subset
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	434 if heads is None:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	435 # We pulled every thing possible
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	436 # sync on everything common
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	437 subset = common + rheads
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	438 else:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	439 # We pulled a specific subset
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	440 # sync on this subset
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	441 subset = heads
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	442
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	443 # Get remote phases data from remote
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	444 remotephases = remote.listkeys('phases')
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	445 publishing = bool(remotephases.get('publishing', False))
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	446 if remotephases and not publishing:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	447 # remote is new and unpublishing
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	448 pheads, _dr = phases.analyzeremotephases(pullop.repo, subset,
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	449 remotephases)
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	450 phases.advanceboundary(pullop.repo, phases.public, pheads)
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	451 phases.advanceboundary(pullop.repo, phases.draft, subset)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	452 else:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	453 # Remote is old or publishing all common changesets
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	454 # should be seen as public
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	455 phases.advanceboundary(pullop.repo, phases.public, subset)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	456
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	457 def gettransaction():
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	458 if tr is None:
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	459 return pullop.repo.transaction(trname)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	460 return tr
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	461
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	462 obstr = obsolete.syncpull(pullop.repo, remote, gettransaction)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	463 if obstr is not None:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	464 tr = obstr
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	465
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	466 if tr is not None:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	467 tr.close()
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	468 finally:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	469 if tr is not None:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	470 tr.release()
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	471 lock.release()
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	472
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	473 return result

Mercurial > public > mercurial-scm > hg

annotate mercurial/exchange.py @ 20472:b97a453b8c27