discovery.py
522 lines
| 20.1 KiB
| text/x-python
|
PythonLexer
/ mercurial / discovery.py
|
r11313 | # discovery.py - protocol changeset discovery functions | ||
|
r11301 | # | ||
|
r11313 | # Copyright 2010 Matt Mackall <mpm@selenic.com> | ||
|
r11301 | # | ||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2 or any later version. | ||||
|
r25944 | from __future__ import absolute_import | ||
|
r32009 | import functools | ||
|
r25944 | from .i18n import _ | ||
from .node import ( | ||||
|
r32009 | hex, | ||
|
r25944 | nullid, | ||
short, | ||||
) | ||||
from . import ( | ||||
bookmarks, | ||||
branchmap, | ||||
|
r26587 | error, | ||
|
r25944 | phases, | ||
setdiscovery, | ||||
treediscovery, | ||||
util, | ||||
) | ||||
|
r11301 | |||
|
r14073 | def findcommonincoming(repo, remote, heads=None, force=False): | ||
"""Return a tuple (common, anyincoming, heads) used to identify the common | ||||
subset of nodes between repo and remote. | ||||
|
r11301 | |||
|
r14073 | "common" is a list of (at least) the heads of the common subset. | ||
"anyincoming" is testable as a boolean indicating if any nodes are missing | ||||
locally. If remote does not support getbundle, this actually is a list of | ||||
roots of the nodes that would be incoming, to be supplied to | ||||
changegroupsubset. No code except for pull should be relying on this fact | ||||
any longer. | ||||
"heads" is either the supplied heads, or else the remote's heads. | ||||
|
r14164 | |||
|
r17424 | If you pass heads and they are all known locally, the response lists just | ||
|
r14164 | these heads in "common" and in "heads". | ||
|
r14213 | |||
Please use findcommonoutgoing to compute the set of outgoing nodes to give | ||||
extensions a good hook into outgoing. | ||||
|
r11301 | """ | ||
|
r14073 | |||
|
r14164 | if not remote.capable('getbundle'): | ||
return treediscovery.findcommonincoming(repo, remote, heads, force) | ||||
|
r11301 | |||
|
r14164 | if heads: | ||
allknown = True | ||||
|
r20225 | knownnode = repo.changelog.hasnode # no nodemap until it is filtered | ||
|
r14164 | for h in heads: | ||
|
r20225 | if not knownnode(h): | ||
|
r14164 | allknown = False | ||
break | ||||
if allknown: | ||||
return (heads, False, heads) | ||||
|
r11301 | |||
|
r14164 | res = setdiscovery.findcommonheads(repo.ui, repo, remote, | ||
abortwhenunrelated=not force) | ||||
common, anyinc, srvheads = res | ||||
return (list(common), anyinc, heads or list(srvheads)) | ||||
|
r11301 | |||
|
r15837 | class outgoing(object): | ||
'''Represents the set of nodes present in a local repo but not in a | ||||
(possibly) remote one. | ||||
Members: | ||||
missing is a list of all nodes present in local but not in remote. | ||||
common is a list of all nodes shared between the two repos. | ||||
|
r15838 | excluded is the list of missing changeset that shouldn't be sent remotely. | ||
|
r15837 | missingheads is the list of heads of missing. | ||
commonheads is the list of heads of common. | ||||
The sets are computed on demand from the heads, unless provided upfront | ||||
by discovery.''' | ||||
|
r29806 | def __init__(self, repo, commonheads=None, missingheads=None, | ||
missingroots=None): | ||||
# at least one of them must not be set | ||||
assert None in (commonheads, missingroots) | ||||
|
r29805 | cl = repo.changelog | ||
|
r29901 | if missingheads is None: | ||
|
r29805 | missingheads = cl.heads() | ||
|
r29806 | if missingroots: | ||
discbases = [] | ||||
for n in missingroots: | ||||
discbases.extend([p for p in cl.parents(n) if p != nullid]) | ||||
# TODO remove call to nodesbetween. | ||||
# TODO populate attributes on outgoing instance instead of setting | ||||
# discbases. | ||||
csets, roots, heads = cl.nodesbetween(missingroots, missingheads) | ||||
included = set(csets) | ||||
missingheads = heads | ||||
commonheads = [n for n in discbases if n not in included] | ||||
elif not commonheads: | ||||
|
r29805 | commonheads = [nullid] | ||
|
r15837 | self.commonheads = commonheads | ||
self.missingheads = missingheads | ||||
|
r29805 | self._revlog = cl | ||
|
r15837 | self._common = None | ||
self._missing = None | ||||
|
r15838 | self.excluded = [] | ||
|
r15837 | |||
def _computecommonmissing(self): | ||||
sets = self._revlog.findcommonmissing(self.commonheads, | ||||
self.missingheads) | ||||
self._common, self._missing = sets | ||||
@util.propertycache | ||||
def common(self): | ||||
if self._common is None: | ||||
self._computecommonmissing() | ||||
return self._common | ||||
@util.propertycache | ||||
def missing(self): | ||||
if self._missing is None: | ||||
self._computecommonmissing() | ||||
return self._missing | ||||
|
r16683 | def findcommonoutgoing(repo, other, onlyheads=None, force=False, | ||
|
r16746 | commoninc=None, portable=False): | ||
|
r15837 | '''Return an outgoing instance to identify the nodes present in repo but | ||
not in other. | ||||
|
r14213 | |||
|
r16683 | If onlyheads is given, only nodes ancestral to nodes in onlyheads | ||
(inclusive) are included. If you already know the local repo's heads, | ||||
passing them in onlyheads is faster than letting them be recomputed here. | ||||
|
r14213 | |||
|
r17251 | If commoninc is given, it must be the result of a prior call to | ||
|
r16736 | findcommonincoming(repo, other, force) to avoid recomputing it here. | ||
If portable is given, compute more conservative common and missingheads, | ||||
to make bundles created from the instance more portable.''' | ||||
|
r15838 | # declare an empty outgoing object to be filled later | ||
|
r29804 | og = outgoing(repo, None, None) | ||
|
r15838 | |||
# get common set if not provided | ||||
if commoninc is None: | ||||
commoninc = findcommonincoming(repo, other, force=force) | ||||
og.commonheads, _any, _hds = commoninc | ||||
# compute outgoing | ||||
|
r17206 | mayexclude = (repo._phasecache.phaseroots[phases.secret] or repo.obsstore) | ||
if not mayexclude: | ||||
|
r15838 | og.missingheads = onlyheads or repo.heads() | ||
elif onlyheads is None: | ||||
# use visible heads as it should be cached | ||||
|
r18382 | og.missingheads = repo.filtered("served").heads() | ||
|
r17248 | og.excluded = [ctx.node() for ctx in repo.set('secret() or extinct()')] | ||
|
r15838 | else: | ||
# compute common, missing and exclude secret stuff | ||||
sets = repo.changelog.findcommonmissing(og.commonheads, onlyheads) | ||||
og._common, allmissing = sets | ||||
og._missing = missing = [] | ||||
|
r15951 | og.excluded = excluded = [] | ||
|
r15838 | for node in allmissing: | ||
|
r17206 | ctx = repo[node] | ||
|
r17248 | if ctx.phase() >= phases.secret or ctx.extinct(): | ||
excluded.append(node) | ||||
else: | ||||
missing.append(node) | ||||
|
r17206 | if len(missing) == len(allmissing): | ||
missingheads = onlyheads | ||||
else: # update missing heads | ||||
|
r15955 | missingheads = phases.newheads(repo, onlyheads, excluded) | ||
|
r15838 | og.missingheads = missingheads | ||
|
r16736 | if portable: | ||
# recompute common and missingheads as if -r<rev> had been given for | ||||
# each head of missing, and --base <rev> for each head of the proper | ||||
# ancestors of missing | ||||
og._computecommonmissing() | ||||
cl = repo.changelog | ||||
missingrevs = set(cl.rev(n) for n in og._missing) | ||||
|
r16866 | og._common = set(cl.ancestors(missingrevs)) - missingrevs | ||
|
r16736 | commonheads = set(og.commonheads) | ||
og.missingheads = [h for h in og.missingheads if h not in commonheads] | ||||
|
r15838 | return og | ||
|
r14213 | |||
r32706 | def _headssummary(pushop): | |||
|
r17209 | """compute a summary of branch and heads status before and after push | ||
|
r17211 | return {'branch': ([remoteheads], [newheads], [unsyncedheads])} mapping | ||
- branch: the branch name | ||||
- remoteheads: the list of remote heads known locally | ||||
|
r20381 | None if the branch is new | ||
|
r17211 | - newheads: the new remote heads (known locally) with outgoing pushed | ||
- unsyncedheads: the list of remote heads unknown locally. | ||||
|
r17209 | """ | ||
r32706 | repo = pushop.repo.unfiltered() | |||
remote = pushop.remote | ||||
outgoing = pushop.outgoing | ||||
|
r17209 | cl = repo.changelog | ||
|
r17211 | headssum = {} | ||
|
r17209 | # A. Create set of branches involved in the push. | ||
branches = set(repo[n].branch() for n in outgoing.missing) | ||||
remotemap = remote.branchmap() | ||||
newbranches = branches - set(remotemap) | ||||
branches.difference_update(newbranches) | ||||
|
r17211 | # A. register remote heads | ||
remotebranches = set() | ||||
for branch, heads in remote.branchmap().iteritems(): | ||||
remotebranches.add(branch) | ||||
known = [] | ||||
unsynced = [] | ||||
|
r20225 | knownnode = cl.hasnode # do not use nodemap until it is filtered | ||
|
r17211 | for h in heads: | ||
|
r20225 | if knownnode(h): | ||
|
r17211 | known.append(h) | ||
else: | ||||
unsynced.append(h) | ||||
headssum[branch] = (known, list(known), unsynced) | ||||
# B. add new branch data | ||||
missingctx = list(repo[n] for n in outgoing.missing) | ||||
touchedbranches = set() | ||||
for ctx in missingctx: | ||||
branch = ctx.branch() | ||||
touchedbranches.add(branch) | ||||
if branch not in headssum: | ||||
headssum[branch] = (None, [], []) | ||||
|
r17209 | |||
|
r17211 | # C drop data about untouched branches: | ||
for branch in remotebranches - touchedbranches: | ||||
del headssum[branch] | ||||
|
r17209 | |||
|
r17211 | # D. Update newmap with outgoing changes. | ||
|
r17209 | # This will possibly add new heads and remove existing ones. | ||
|
r18124 | newmap = branchmap.branchcache((branch, heads[1]) | ||
for branch, heads in headssum.iteritems() | ||||
if heads[0] is not None) | ||||
|
r18305 | newmap.update(repo, (ctx.rev() for ctx in missingctx)) | ||
|
r17211 | for branch, newheads in newmap.iteritems(): | ||
headssum[branch][1][:] = newheads | ||||
r32672 | for branch, items in headssum.iteritems(): | |||
for l in items: | ||||
if l is not None: | ||||
l.sort() | ||||
|
r17211 | return headssum | ||
|
r17209 | |||
|
r17211 | def _oldheadssummary(repo, remoteheads, outgoing, inc=False): | ||
|
r17209 | """Compute branchmapsummary for repo without branchmap support""" | ||
# 1-4b. old servers: Check for new topological heads. | ||||
# Construct {old,new}map with branch = None (topological branch). | ||||
|
r18120 | # (code based on update) | ||
|
r20225 | knownnode = repo.changelog.hasnode # no nodemap until it is filtered | ||
r32672 | oldheads = sorted(h for h in remoteheads if knownnode(h)) | |||
|
r17209 | # all nodes in outgoing.missing are children of either: | ||
# - an element of oldheads | ||||
# - another element of outgoing.missing | ||||
# - nullrev | ||||
# This explains why the new head are very simple to compute. | ||||
r = repo.set('heads(%ln + %ln)', oldheads, outgoing.missing) | ||||
r32672 | newheads = sorted(c.node() for c in r) | |||
|
r22178 | # set some unsynced head to issue the "unsynced changes" warning | ||
|
r24306 | if inc: | ||
r32671 | unsynced = [None] | |||
|
r24306 | else: | ||
r32671 | unsynced = [] | |||
|
r17211 | return {None: (oldheads, newheads, unsynced)} | ||
|
r17209 | |||
|
r26936 | def _nowarnheads(pushop): | ||
|
r26862 | # Compute newly pushed bookmarks. We don't warn about bookmarked heads. | ||
|
r26936 | repo = pushop.repo.unfiltered() | ||
remote = pushop.remote | ||||
|
r26862 | localbookmarks = repo._bookmarks | ||
remotebookmarks = remote.listkeys('bookmarks') | ||||
bookmarkedheads = set() | ||||
|
r29229 | |||
# internal config: bookmarks.pushing | ||||
newbookmarks = [localbookmarks.expandname(b) | ||||
for b in pushop.ui.configlist('bookmarks', 'pushing')] | ||||
|
r26862 | for bm in localbookmarks: | ||
rnode = remotebookmarks.get(bm) | ||||
if rnode and rnode in repo: | ||||
lctx, rctx = repo[bm], repo[rnode] | ||||
if bookmarks.validdest(repo, rctx, lctx): | ||||
bookmarkedheads.add(lctx.node()) | ||||
else: | ||||
if bm in newbookmarks and bm not in remotebookmarks: | ||||
bookmarkedheads.add(repo[bm].node()) | ||||
return bookmarkedheads | ||||
|
r26935 | def checkheads(pushop): | ||
|
r15932 | """Check that a push won't add any outgoing head | ||
|
r11301 | |||
|
r15932 | raise Abort error and display ui message as needed. | ||
""" | ||||
|
r26935 | |||
repo = pushop.repo.unfiltered() | ||||
remote = pushop.remote | ||||
outgoing = pushop.outgoing | ||||
remoteheads = pushop.remoteheads | ||||
newbranch = pushop.newbranch | ||||
inc = bool(pushop.incoming) | ||||
|
r17209 | # Check for each named branch if we're creating new remote heads. | ||
# To be a remote head after push, node must be either: | ||||
# - unknown locally | ||||
# - a local outgoing head descended from update | ||||
# - a remote head that's known locally and not | ||||
# ancestral to an outgoing head | ||||
|
r15932 | if remoteheads == [nullid]: | ||
# remote is empty, nothing to check. | ||||
return | ||||
|
r11301 | |||
|
r15932 | if remote.capable('branchmap'): | ||
r32706 | headssum = _headssummary(pushop) | |||
|
r17209 | else: | ||
|
r17211 | headssum = _oldheadssummary(repo, remoteheads, outgoing, inc) | ||
newbranches = [branch for branch, heads in headssum.iteritems() | ||||
if heads[0] is None] | ||||
|
r17209 | # 1. Check for new branches on the remote. | ||
if newbranches and not newbranch: # new branch requires --new-branch | ||||
branchnames = ', '.join(sorted(newbranches)) | ||||
|
r26587 | raise error.Abort(_("push creates new remote branches: %s!") | ||
|
r17209 | % branchnames, | ||
hint=_("use 'hg push --new-branch' to create" | ||||
" new remote branches")) | ||||
|
r11301 | |||
|
r26862 | # 2. Find heads that we need not warn about | ||
|
r26936 | nowarnheads = _nowarnheads(pushop) | ||
|
r17212 | |||
# 3. Check for new heads. | ||||
|
r15932 | # If there are more heads after the push than before, a suitable | ||
# error message, depending on unsynced status, is displayed. | ||||
|
r26585 | errormsg = None | ||
r32705 | # If there are no obsstore, no post-processing are needed. | |||
|
r24702 | if repo.obsstore: | ||
allmissing = set(outgoing.missing) | ||||
cctx = repo.set('%ld', outgoing.common) | ||||
allfuturecommon = set(c.node() for c in cctx) | ||||
allfuturecommon.update(allmissing) | ||||
r32705 | for branch, heads in sorted(headssum.iteritems()): | |||
remoteheads, newheads, unsyncedheads = heads | ||||
result = _postprocessobsolete(pushop, allfuturecommon, newheads) | ||||
newheads = sorted(result[0]) | ||||
headssum[branch] = (remoteheads, newheads, unsyncedheads) | ||||
|
r18361 | for branch, heads in sorted(headssum.iteritems()): | ||
|
r20381 | remoteheads, newheads, unsyncedheads = heads | ||
|
r17214 | # add unsynced data | ||
|
r20381 | if remoteheads is None: | ||
|
r19840 | oldhs = set() | ||
else: | ||||
|
r20381 | oldhs = set(remoteheads) | ||
oldhs.update(unsyncedheads) | ||||
dhs = None # delta heads, the new heads on branch | ||||
r32675 | newhs = set(newheads) | |||
r32673 | newhs.update(unsyncedheads) | |||
r32674 | if unsyncedheads: | |||
if None in unsyncedheads: | ||||
|
r22178 | # old remote, no heads data | ||
heads = None | ||||
r32674 | elif len(unsyncedheads) <= 4 or repo.ui.verbose: | |||
heads = ' '.join(short(h) for h in unsyncedheads) | ||||
|
r21198 | else: | ||
r32674 | heads = (' '.join(short(h) for h in unsyncedheads[:4]) + | |||
' ' + _("and %s others") % (len(unsyncedheads) - 4)) | ||||
|
r22178 | if heads is None: | ||
repo.ui.status(_("remote has heads that are " | ||||
"not known locally\n")) | ||||
elif branch is None: | ||||
|
r20502 | repo.ui.status(_("remote has heads that are " | ||
"not known locally: %s\n") % heads) | ||||
|
r20501 | else: | ||
|
r20502 | repo.ui.status(_("remote has heads on branch '%s' that are " | ||
"not known locally: %s\n") % (branch, heads)) | ||||
|
r20381 | if remoteheads is None: | ||
if len(newhs) > 1: | ||||
|
r19840 | dhs = list(newhs) | ||
|
r26585 | if errormsg is None: | ||
errormsg = (_("push creates new branch '%s' " | ||||
"with multiple heads") % (branch)) | ||||
|
r19840 | hint = _("merge or" | ||
|
r29973 | " see 'hg help push' for details about" | ||
|
r19840 | " pushing new heads") | ||
elif len(newhs) > len(oldhs): | ||||
|
r20381 | # remove bookmarked or existing remote heads from the new heads list | ||
|
r26862 | dhs = sorted(newhs - nowarnheads - oldhs) | ||
|
r16835 | if dhs: | ||
|
r26585 | if errormsg is None: | ||
|
r15932 | if branch not in ('default', None): | ||
|
r26585 | errormsg = _("push creates new remote head %s " | ||
"on branch '%s'!") % (short(dhs[0]), branch) | ||||
|
r21580 | elif repo[dhs[0]].bookmarks(): | ||
|
r26585 | errormsg = _("push creates new remote head %s " | ||
"with bookmark '%s'!") % ( | ||||
short(dhs[0]), repo[dhs[0]].bookmarks()[0]) | ||||
|
r15932 | else: | ||
|
r26585 | errormsg = _("push creates new remote head %s!" | ||
) % short(dhs[0]) | ||||
|
r20381 | if unsyncedheads: | ||
|
r19934 | hint = _("pull and merge or" | ||
|
r29973 | " see 'hg help push' for details about" | ||
|
r19934 | " pushing new heads") | ||
|
r15932 | else: | ||
|
r19934 | hint = _("merge or" | ||
|
r29973 | " see 'hg help push' for details about" | ||
|
r19934 | " pushing new heads") | ||
|
r20051 | if branch is None: | ||
repo.ui.note(_("new remote heads:\n")) | ||||
else: | ||||
repo.ui.note(_("new remote heads on branch '%s':\n") % branch) | ||||
|
r15932 | for h in dhs: | ||
|
r20051 | repo.ui.note((" %s\n") % short(h)) | ||
|
r26585 | if errormsg: | ||
|
r26587 | raise error.Abort(errormsg, hint=hint) | ||
|
r31586 | |||
def _postprocessobsolete(pushop, futurecommon, candidate_newhs): | ||||
"""post process the list of new heads with obsolescence information | ||||
|
r32009 | Exists as a sub-function to contain the complexity and allow extensions to | ||
|
r31586 | experiment with smarter logic. | ||
|
r32009 | |||
|
r31586 | Returns (newheads, discarded_heads) tuple | ||
""" | ||||
|
r32009 | # known issue | ||
|
r31586 | # | ||
|
r32009 | # * We "silently" skip processing on all changeset unknown locally | ||
|
r31586 | # | ||
|
r32009 | # * if <nh> is public on the remote, it won't be affected by obsolete | ||
# marker and a new is created | ||||
# define various utilities and containers | ||||
|
r31586 | repo = pushop.repo | ||
|
r32009 | unfi = repo.unfiltered() | ||
tonode = unfi.changelog.node | ||||
r32331 | torev = unfi.changelog.rev | |||
|
r32009 | public = phases.public | ||
getphase = unfi._phasecache.phase | ||||
ispublic = (lambda r: getphase(unfi, r) == public) | ||||
hasoutmarker = functools.partial(pushingmarkerfor, unfi.obsstore, | ||||
futurecommon) | ||||
successorsmarkers = unfi.obsstore.successors | ||||
newhs = set() # final set of new heads | ||||
discarded = set() # new head of fully replaced branch | ||||
localcandidate = set() # candidate heads known locally | ||||
unknownheads = set() # candidate heads unknown locally | ||||
for h in candidate_newhs: | ||||
if h in unfi: | ||||
localcandidate.add(h) | ||||
else: | ||||
if successorsmarkers.get(h) is not None: | ||||
msg = ('checkheads: remote head unknown locally has' | ||||
' local marker: %s\n') | ||||
repo.ui.debug(msg % hex(h)) | ||||
unknownheads.add(h) | ||||
# fast path the simple case | ||||
if len(localcandidate) == 1: | ||||
return unknownheads | set(candidate_newhs), set() | ||||
# actually process branch replacement | ||||
while localcandidate: | ||||
nh = localcandidate.pop() | ||||
# run this check early to skip the evaluation of the whole branch | ||||
r32331 | if (nh in futurecommon or ispublic(torev(nh))): | |||
|
r32009 | newhs.add(nh) | ||
continue | ||||
# Get all revs/nodes on the branch exclusive to this head | ||||
# (already filtered heads are "ignored")) | ||||
branchrevs = unfi.revs('only(%n, (%ln+%ln))', | ||||
nh, localcandidate, newhs) | ||||
branchnodes = [tonode(r) for r in branchrevs] | ||||
# The branch won't be hidden on the remote if | ||||
# * any part of it is public, | ||||
# * any part of it is considered part of the result by previous logic, | ||||
# * if we have no markers to push to obsolete it. | ||||
if (any(ispublic(r) for r in branchrevs) | ||||
or any(n in futurecommon for n in branchnodes) | ||||
or any(not hasoutmarker(n) for n in branchnodes)): | ||||
|
r31586 | newhs.add(nh) | ||
else: | ||||
|
r32009 | # note: there is a corner case if there is a merge in the branch. | ||
# we might end up with -more- heads. However, these heads are not | ||||
# "added" by the push, but more by the "removal" on the remote so I | ||||
# think is a okay to ignore them, | ||||
discarded.add(nh) | ||||
newhs |= unknownheads | ||||
|
r31586 | return newhs, discarded | ||
|
r32009 | |||
def pushingmarkerfor(obsstore, pushset, node): | ||||
"""true if some markers are to be pushed for node | ||||
We cannot just look in to the pushed obsmarkers from the pushop because | ||||
discovery might have filtered relevant markers. In addition listing all | ||||
markers relevant to all changesets in the pushed set would be too expensive | ||||
(O(len(repo))) | ||||
(note: There are cache opportunity in this function. but it would requires | ||||
a two dimensional stack.) | ||||
""" | ||||
successorsmarkers = obsstore.successors | ||||
stack = [node] | ||||
seen = set(stack) | ||||
while stack: | ||||
current = stack.pop() | ||||
if current in pushset: | ||||
return True | ||||
markers = successorsmarkers.get(current, ()) | ||||
# markers fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents') | ||||
for m in markers: | ||||
nexts = m[1] # successors | ||||
if not nexts: # this is a prune marker | ||||
|
r32096 | nexts = m[5] or () # parents | ||
|
r32009 | for n in nexts: | ||
if n not in seen: | ||||
seen.add(n) | ||||
stack.append(n) | ||||
return False | ||||