discovery.py
628 lines
| 22.2 KiB
| text/x-python
|
PythonLexer
/ mercurial / discovery.py
|
r11313 | # discovery.py - protocol changeset discovery functions | ||
|
r11301 | # | ||
|
r47575 | # Copyright 2010 Olivia Mackall <olivia@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 | short, | ||
) | ||||
from . import ( | ||||
bookmarks, | ||||
branchmap, | ||||
|
r26587 | error, | ||
|
r25944 | phases, | ||
|
r43376 | pycompat, | ||
|
r35185 | scmutil, | ||
|
r25944 | setdiscovery, | ||
treediscovery, | ||||
util, | ||||
) | ||||
|
r11301 | |||
|
r43346 | |||
|
r35306 | def findcommonincoming(repo, remote, heads=None, force=False, ancestorsof=None): | ||
|
r14073 | """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. | ||||
|
r35306 | "ancestorsof" if not None, restrict the discovery to a subset defined by | ||
|
r45702 | these nodes. Changeset outside of this set won't be considered (but may | ||
still appear in "common"). | ||||
|
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 | |||
|
r43347 | if not remote.capable(b'getbundle'): | ||
|
r14164 | return treediscovery.findcommonincoming(repo, remote, heads, force) | ||
|
r11301 | |||
|
r14164 | if heads: | ||
|
r43346 | knownnode = repo.changelog.hasnode # no nodemap until it is filtered | ||
|
r35897 | if all(knownnode(h) for h in heads): | ||
|
r14164 | return (heads, False, heads) | ||
|
r11301 | |||
|
r43346 | res = setdiscovery.findcommonheads( | ||
repo.ui, | ||||
repo, | ||||
remote, | ||||
abortwhenunrelated=not force, | ||||
ancestorsof=ancestorsof, | ||||
) | ||||
|
r14164 | common, anyinc, srvheads = res | ||
r45166 | if heads and not anyinc: | |||
# server could be lying on the advertised heads | ||||
has_node = repo.changelog.hasnode | ||||
anyinc = any(not has_node(n) for n in heads) | ||||
|
r14164 | return (list(common), anyinc, heads or list(srvheads)) | ||
|
r11301 | |||
|
r43346 | |||
|
r15837 | class outgoing(object): | ||
|
r46554 | """Represents the result of a findcommonoutgoing() call. | ||
|
r15837 | |||
Members: | ||||
|
r45703 | ancestorsof is a list of the nodes whose ancestors are included in the | ||
outgoing operation. | ||||
missing is a list of those ancestors of ancestorsof that are present in | ||||
local but not in remote. | ||||
common is a set containing revs common between the local and the remote | ||||
repository (at least all of those that are ancestors of ancestorsof). | ||||
|
r15837 | commonheads is the list of heads of common. | ||
|
r45703 | excluded is the list of missing changeset that shouldn't be sent | ||
remotely. | ||||
Some members are computed on demand from the heads, unless provided upfront | ||||
|
r46554 | by discovery.""" | ||
|
r15837 | |||
|
r43346 | def __init__( | ||
|
r45704 | self, repo, commonheads=None, ancestorsof=None, missingroots=None | ||
|
r43346 | ): | ||
|
r29806 | # at least one of them must not be set | ||
assert None in (commonheads, missingroots) | ||||
|
r29805 | cl = repo.changelog | ||
|
r45704 | if ancestorsof is None: | ||
ancestorsof = cl.heads() | ||||
|
r29806 | if missingroots: | ||
discbases = [] | ||||
for n in missingroots: | ||||
|
r47771 | discbases.extend([p for p in cl.parents(n) if p != repo.nullid]) | ||
|
r29806 | # TODO remove call to nodesbetween. | ||
# TODO populate attributes on outgoing instance instead of setting | ||||
# discbases. | ||||
|
r45704 | csets, roots, heads = cl.nodesbetween(missingroots, ancestorsof) | ||
|
r29806 | included = set(csets) | ||
|
r45704 | ancestorsof = heads | ||
|
r29806 | commonheads = [n for n in discbases if n not in included] | ||
elif not commonheads: | ||||
|
r47771 | commonheads = [repo.nullid] | ||
|
r15837 | self.commonheads = commonheads | ||
|
r45704 | self.ancestorsof = ancestorsof | ||
|
r29805 | self._revlog = cl | ||
|
r15837 | self._common = None | ||
self._missing = None | ||||
|
r15838 | self.excluded = [] | ||
|
r15837 | |||
def _computecommonmissing(self): | ||||
|
r43346 | sets = self._revlog.findcommonmissing( | ||
|
r45704 | self.commonheads, self.ancestorsof | ||
|
r43346 | ) | ||
|
r15837 | 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 | ||||
|
r45703 | @property | ||
|
r45704 | def missingheads(self): | ||
util.nouideprecwarn( | ||||
b'outgoing.missingheads never contained what the name suggests and ' | ||||
b'was renamed to outgoing.ancestorsof. check your code for ' | ||||
b'correctness.', | ||||
b'5.5', | ||||
stacklevel=2, | ||||
) | ||||
return self.ancestorsof | ||||
|
r45703 | |||
|
r43346 | |||
def findcommonoutgoing( | ||||
repo, other, onlyheads=None, force=False, commoninc=None, portable=False | ||||
): | ||||
|
r46554 | """Return an outgoing instance to identify the nodes present in repo but | ||
|
r15837 | 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. | ||
|
r45704 | If portable is given, compute more conservative common and ancestorsof, | ||
|
r46554 | 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: | ||||
|
r43346 | commoninc = findcommonincoming( | ||
repo, other, force=force, ancestorsof=onlyheads | ||||
) | ||||
|
r15838 | og.commonheads, _any, _hds = commoninc | ||
# compute outgoing | ||||
|
r43346 | mayexclude = repo._phasecache.phaseroots[phases.secret] or repo.obsstore | ||
|
r17206 | if not mayexclude: | ||
|
r45704 | og.ancestorsof = onlyheads or repo.heads() | ||
|
r15838 | elif onlyheads is None: | ||
# use visible heads as it should be cached | ||||
|
r45704 | og.ancestorsof = repo.filtered(b"served").heads() | ||
|
r43347 | og.excluded = [ctx.node() for ctx in repo.set(b'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): | ||
|
r45704 | ancestorsof = onlyheads | ||
|
r43346 | else: # update missing heads | ||
|
r45704 | ancestorsof = phases.newheads(repo, onlyheads, excluded) | ||
og.ancestorsof = ancestorsof | ||||
|
r16736 | if portable: | ||
|
r45704 | # recompute common and ancestorsof as if -r<rev> had been given for | ||
|
r16736 | # each head of missing, and --base <rev> for each head of the proper | ||
# ancestors of missing | ||||
og._computecommonmissing() | ||||
cl = repo.changelog | ||||
|
r44937 | missingrevs = {cl.rev(n) for n in og._missing} | ||
|
r16866 | og._common = set(cl.ancestors(missingrevs)) - missingrevs | ||
|
r16736 | commonheads = set(og.commonheads) | ||
|
r45704 | og.ancestorsof = [h for h in og.ancestorsof if h not in commonheads] | ||
|
r16736 | |||
|
r15838 | return og | ||
|
r14213 | |||
|
r43346 | |||
r32706 | def _headssummary(pushop): | |||
|
r17209 | """compute a summary of branch and heads status before and after push | ||
r32708 | return {'branch': ([remoteheads], [newheads], | |||
[unsyncedheads], [discardedheads])} mapping | ||||
|
r17211 | |||
r32708 | - branch: the branch name, | |||
|
r17211 | - remoteheads: the list of remote heads known locally | ||
r32708 | None if the branch is new, | |||
- newheads: the new remote heads (known locally) with outgoing pushed, | ||||
- unsyncedheads: the list of remote heads unknown locally, | ||||
- discardedheads: the list of heads made obsolete by the push. | ||||
|
r17209 | """ | ||
r32706 | repo = pushop.repo.unfiltered() | |||
remote = pushop.remote | ||||
outgoing = pushop.outgoing | ||||
|
r17209 | cl = repo.changelog | ||
|
r17211 | headssum = {} | ||
|
r42193 | missingctx = set() | ||
|
r17209 | # A. Create set of branches involved in the push. | ||
|
r42193 | branches = set() | ||
for n in outgoing.missing: | ||||
ctx = repo[n] | ||||
missingctx.add(ctx) | ||||
branches.add(ctx.branch()) | ||||
|
r37655 | |||
with remote.commandexecutor() as e: | ||||
|
r43347 | remotemap = e.callcommand(b'branchmap', {}).result() | ||
|
r37655 | |||
|
r43346 | knownnode = cl.hasnode # do not use nodemap until it is filtered | ||
|
r42195 | # A. register remote heads of branches which are in outgoing set | ||
|
r43376 | for branch, heads in pycompat.iteritems(remotemap): | ||
|
r42195 | # don't add head info about branches which we don't have locally | ||
if branch not in branches: | ||||
continue | ||||
|
r17211 | known = [] | ||
unsynced = [] | ||||
for h in heads: | ||||
|
r20225 | if knownnode(h): | ||
|
r17211 | known.append(h) | ||
else: | ||||
unsynced.append(h) | ||||
headssum[branch] = (known, list(known), unsynced) | ||||
|
r42195 | |||
|
r17211 | # B. add new branch data | ||
|
r42194 | for branch in branches: | ||
|
r17211 | if branch not in headssum: | ||
headssum[branch] = (None, [], []) | ||||
|
r17209 | |||
|
r42195 | # C. Update newmap with outgoing changes. | ||
|
r17209 | # This will possibly add new heads and remove existing ones. | ||
|
r43346 | newmap = branchmap.remotebranchcache( | ||
|
r47538 | repo, | ||
( | ||||
(branch, heads[1]) | ||||
for branch, heads in pycompat.iteritems(headssum) | ||||
if heads[0] is not None | ||||
), | ||||
|
r43346 | ) | ||
|
r18305 | newmap.update(repo, (ctx.rev() for ctx in missingctx)) | ||
|
r43376 | for branch, newheads in pycompat.iteritems(newmap): | ||
|
r17211 | headssum[branch][1][:] = newheads | ||
|
r43376 | for branch, items in pycompat.iteritems(headssum): | ||
r32672 | for l in items: | |||
if l is not None: | ||||
l.sort() | ||||
r32708 | headssum[branch] = items + ([],) | |||
r32707 | # If there are no obsstore, no post processing are needed. | |||
if repo.obsstore: | ||||
r32791 | torev = repo.changelog.rev | |||
|
r45704 | futureheads = {torev(h) for h in outgoing.ancestorsof} | ||
|
r44937 | futureheads |= {torev(h) for h in outgoing.commonheads} | ||
r32792 | allfuturecommon = repo.changelog.ancestors(futureheads, inclusive=True) | |||
|
r43376 | for branch, heads in sorted(pycompat.iteritems(headssum)): | ||
r32708 | remoteheads, newheads, unsyncedheads, placeholder = heads | |||
r32707 | result = _postprocessobsolete(pushop, allfuturecommon, newheads) | |||
|
r43346 | headssum[branch] = ( | ||
remoteheads, | ||||
sorted(result[0]), | ||||
unsyncedheads, | ||||
sorted(result[1]), | ||||
) | ||||
|
r17211 | return headssum | ||
|
r17209 | |||
|
r43346 | |||
|
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) | ||
|
r43346 | 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. | ||||
|
r43347 | r = repo.set(b'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 = [] | |||
r32708 | return {None: (oldheads, newheads, unsynced, [])} | |||
|
r17209 | |||
|
r43346 | |||
|
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 | ||
|
r37655 | |||
with remote.commandexecutor() as e: | ||||
|
r43346 | remotebookmarks = e.callcommand( | ||
|
r46554 | b'listkeys', | ||
{ | ||||
b'namespace': b'bookmarks', | ||||
}, | ||||
|
r43346 | ).result() | ||
|
r37655 | |||
|
r26862 | bookmarkedheads = set() | ||
|
r29229 | |||
# internal config: bookmarks.pushing | ||||
|
r43346 | newbookmarks = [ | ||
localbookmarks.expandname(b) | ||||
|
r43347 | for b in pushop.ui.configlist(b'bookmarks', b'pushing') | ||
|
r43346 | ] | ||
|
r29229 | |||
|
r26862 | for bm in localbookmarks: | ||
rnode = remotebookmarks.get(bm) | ||||
if rnode and rnode in repo: | ||||
|
r43248 | lctx, rctx = repo[localbookmarks[bm]], repo[rnode] | ||
|
r26862 | if bookmarks.validdest(repo, rctx, lctx): | ||
bookmarkedheads.add(lctx.node()) | ||||
else: | ||||
if bm in newbookmarks and bm not in remotebookmarks: | ||||
|
r37469 | bookmarkedheads.add(localbookmarks[bm]) | ||
|
r26862 | |||
return bookmarkedheads | ||||
|
r43346 | |||
|
r26935 | def checkheads(pushop): | ||
|
r15932 | """Check that a push won't add any outgoing head | ||
|
r11301 | |||
|
r46735 | raise StateError error and display ui message as needed. | ||
|
r15932 | """ | ||
|
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 | ||||
|
r47771 | if remoteheads == [repo.nullid]: | ||
|
r15932 | # remote is empty, nothing to check. | ||
return | ||||
|
r11301 | |||
|
r43347 | if remote.capable(b'branchmap'): | ||
r32706 | headssum = _headssummary(pushop) | |||
|
r17209 | else: | ||
|
r17211 | headssum = _oldheadssummary(repo, remoteheads, outgoing, inc) | ||
r32709 | pushop.pushbranchmap = headssum | |||
|
r43346 | newbranches = [ | ||
|
r43376 | branch | ||
for branch, heads in pycompat.iteritems(headssum) | ||||
if heads[0] is None | ||||
|
r43346 | ] | ||
|
r17209 | # 1. Check for new branches on the remote. | ||
if newbranches and not newbranch: # new branch requires --new-branch | ||||
|
r43347 | branchnames = b', '.join(sorted(newbranches)) | ||
|
r42402 | # Calculate how many of the new branches are closed branches | ||
closedbranches = set() | ||||
for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | ||||
if isclosed: | ||||
closedbranches.add(tag) | ||||
|
r43346 | closedbranches = closedbranches & set(newbranches) | ||
|
r42389 | if closedbranches: | ||
|
r46520 | errmsg = _(b"push creates new remote branches: %s (%d closed)") % ( | ||
|
r43346 | branchnames, | ||
len(closedbranches), | ||||
) | ||||
|
r42389 | else: | ||
|
r46520 | errmsg = _(b"push creates new remote branches: %s") % branchnames | ||
|
r43347 | hint = _(b"use 'hg push --new-branch' to create new remote branches") | ||
|
r46735 | raise error.StateError(errmsg, hint=hint) | ||
|
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 | ||
|
r43376 | for branch, heads in sorted(pycompat.iteritems(headssum)): | ||
r32708 | remoteheads, newheads, unsyncedheads, discardedheads = heads | |||
|
r17214 | # add unsynced data | ||
|
r20381 | if remoteheads is None: | ||
|
r19840 | oldhs = set() | ||
else: | ||||
|
r20381 | oldhs = set(remoteheads) | ||
oldhs.update(unsyncedheads) | ||||
|
r43346 | 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 | ||||
|
r21198 | else: | ||
|
r35185 | heads = scmutil.nodesummaries(repo, unsyncedheads) | ||
|
r22178 | if heads is None: | ||
|
r43346 | repo.ui.status( | ||
|
r43387 | _(b"remote has heads that are not known locally\n") | ||
|
r43346 | ) | ||
|
r22178 | elif branch is None: | ||
|
r43346 | repo.ui.status( | ||
|
r43387 | _(b"remote has heads that are not known locally: %s\n") | ||
|
r43346 | % heads | ||
) | ||||
|
r20501 | else: | ||
|
r43346 | repo.ui.status( | ||
_( | ||||
|
r43347 | b"remote has heads on branch '%s' that are " | ||
b"not known locally: %s\n" | ||||
|
r43346 | ) | ||
% (branch, heads) | ||||
) | ||||
|
r20381 | if remoteheads is None: | ||
if len(newhs) > 1: | ||||
|
r19840 | dhs = list(newhs) | ||
|
r26585 | if errormsg is None: | ||
|
r43319 | errormsg = ( | ||
|
r43347 | _(b"push creates new branch '%s' with multiple heads") | ||
|
r43346 | % branch | ||
|
r43319 | ) | ||
|
r43346 | hint = _( | ||
|
r43347 | b"merge or" | ||
b" see 'hg help push' for details about" | ||||
b" pushing new heads" | ||||
|
r43346 | ) | ||
|
r19840 | 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: | ||
|
r43347 | if branch not in (b'default', None): | ||
|
r43346 | errormsg = _( | ||
|
r46520 | b"push creates new remote head %s on branch '%s'" | ||
|
r46554 | ) % ( | ||
short(dhs[0]), | ||||
branch, | ||||
) | ||||
|
r21580 | elif repo[dhs[0]].bookmarks(): | ||
|
r43346 | errormsg = _( | ||
|
r43347 | b"push creates new remote head %s " | ||
|
r46520 | b"with bookmark '%s'" | ||
|
r43346 | ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) | ||
|
r15932 | else: | ||
|
r46520 | errormsg = _(b"push creates new remote head %s") % short( | ||
|
r43346 | dhs[0] | ||
) | ||||
|
r20381 | if unsyncedheads: | ||
|
r43346 | hint = _( | ||
|
r43347 | b"pull and merge or" | ||
b" see 'hg help push' for details about" | ||||
b" pushing new heads" | ||||
|
r43346 | ) | ||
|
r15932 | else: | ||
|
r43346 | hint = _( | ||
|
r43347 | b"merge or" | ||
b" see 'hg help push' for details about" | ||||
b" pushing new heads" | ||||
|
r43346 | ) | ||
|
r20051 | if branch is None: | ||
|
r43347 | repo.ui.note(_(b"new remote heads:\n")) | ||
|
r20051 | else: | ||
|
r43347 | repo.ui.note(_(b"new remote heads on branch '%s':\n") % branch) | ||
|
r15932 | for h in dhs: | ||
|
r43347 | repo.ui.note(b" %s\n" % short(h)) | ||
|
r26585 | if errormsg: | ||
|
r46735 | raise error.StateError(errormsg, hint=hint) | ||
|
r31586 | |||
|
r43346 | |||
|
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() | ||
r43960 | torev = unfi.changelog.index.get_rev | |||
|
r32009 | public = phases.public | ||
getphase = unfi._phasecache.phase | ||||
|
r43346 | ispublic = lambda r: getphase(unfi, r) == public | ||
ispushed = lambda n: torev(n) in futurecommon | ||||
r32789 | hasoutmarker = functools.partial(pushingmarkerfor, unfi.obsstore, ispushed) | |||
|
r32009 | successorsmarkers = unfi.obsstore.successors | ||
|
r43346 | newhs = set() # final set of new heads | ||
discarded = set() # new head of fully replaced branch | ||||
|
r32009 | |||
|
r43346 | localcandidate = set() # candidate heads known locally | ||
unknownheads = set() # candidate heads unknown locally | ||||
|
r32009 | for h in candidate_newhs: | ||
if h in unfi: | ||||
localcandidate.add(h) | ||||
else: | ||||
if successorsmarkers.get(h) is not None: | ||||
|
r43346 | msg = ( | ||
|
r43347 | b'checkheads: remote head unknown locally has' | ||
b' local marker: %s\n' | ||||
|
r43346 | ) | ||
|
r32009 | 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() | ||||
r44949 | current_branch = unfi[nh].branch() | |||
|
r32009 | # run this check early to skip the evaluation of the whole branch | ||
|
r43346 | if torev(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")) | ||||
|
r43347 | branchrevs = unfi.revs( | ||
b'only(%n, (%ln+%ln))', nh, localcandidate, newhs | ||||
) | ||||
r44949 | ||||
branchnodes = [] | ||||
for r in branchrevs: | ||||
c = unfi[r] | ||||
if c.branch() == current_branch: | ||||
branchnodes.append(c.node()) | ||||
|
r32009 | |||
# 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. | ||||
|
r43346 | if ( | ||
any(ispublic(r) for r in branchrevs) | ||||
or any(torev(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 | |||
|
r43346 | |||
r32789 | def pushingmarkerfor(obsstore, ispushed, node): | |||
|
r32009 | """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() | ||||
r32789 | if ispushed(current): | |||
|
r32009 | return True | ||
markers = successorsmarkers.get(current, ()) | ||||
# markers fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents') | ||||
for m in markers: | ||||
|
r43346 | nexts = m[1] # successors | ||
if not nexts: # this is a prune marker | ||||
nexts = m[5] or () # parents | ||||
|
r32009 | for n in nexts: | ||
if n not in seen: | ||||
seen.add(n) | ||||
stack.append(n) | ||||
return False | ||||