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

annotate mercurial/discovery.py @ 16535:39d1f83eb05d stable

branchmap: server should not advertise secret changeset in branchmap (Issue3303) Discovery now use an overlay above branchmap to prune invisible "secret" changeset from branchmap. To minimise impact on the code during the code freeze, this is achieve by recomputing non-secret heads on the fly when any secret changeset exists. This is a computation heavy approach similar to the one used for visible heads. But few sever should contains secret changeset anyway. See comment in code for more robust approach. On local repo the wrapper is applied explicitly while the wire-protocol take care of wrapping branchmap call in a transparent way. This could be unified by the Peter Arrenbrecht and Sune Foldager proposal of a `peer` object. An inappropriate `(+i heads)` may still appear when pushing new changes on a repository with secret changeset. (see Issue3394 for details)

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Tue, 24 Apr 2012 16:32:44 +0200
parents	ba959f6e10f8
children	b6081c2c4647 025b3b763ba9

rev	line source
11313 0bb14798cd07 discovery: fix description line Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11301 diff changeset	1 # discovery.py - protocol changeset discovery functions
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
11313 0bb14798cd07 discovery: fix description line Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11301 diff changeset	3 # Copyright 2010 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9954 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	8 from node import nullid, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	10 import util, setdiscovery, treediscovery, phases
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	11
14073 72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	12 def findcommonincoming(repo, remote, heads=None, force=False):
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	13 """Return a tuple (common, anyincoming, heads) used to identify the common
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	14 subset of nodes between repo and remote.
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	15
14073 72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	16 "common" is a list of (at least) the heads of the common subset.
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	17 "anyincoming" is testable as a boolean indicating if any nodes are missing
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	18 locally. If remote does not support getbundle, this actually is a list of
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	19 roots of the nodes that would be incoming, to be supplied to
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	20 changegroupsubset. No code except for pull should be relying on this fact
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	21 any longer.
72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	22 "heads" is either the supplied heads, or else the remote's heads.
14164 cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	23
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	24 If you pass heads and they are all known locally, the reponse lists justs
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	25 these heads in "common" and in "heads".
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	26
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	27 Please use findcommonoutgoing to compute the set of outgoing nodes to give
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	28 extensions a good hook into outgoing.
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	29 """
14073 72c84f24b420 discovery: drop findoutgoing and simplify findcommonincoming's api Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13742 diff changeset	30
14164 cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	31 if not remote.capable('getbundle'):
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	32 return treediscovery.findcommonincoming(repo, remote, heads, force)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	33
14164 cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	34 if heads:
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	35 allknown = True
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	36 nm = repo.changelog.nodemap
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	37 for h in heads:
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	38 if nm.get(h) is None:
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	39 allknown = False
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	40 break
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	41 if allknown:
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	42 return (heads, False, heads)
8404 a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	43
14164 cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	44 res = setdiscovery.findcommonheads(repo.ui, repo, remote,
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	45 abortwhenunrelated=not force)
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	46 common, anyinc, srvheads = res
cb98fed52495 discovery: add new set-based discovery Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14073 diff changeset	47 return (list(common), anyinc, heads or list(srvheads))
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	48
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	49 class outgoing(object):
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	50 '''Represents the set of nodes present in a local repo but not in a
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	51 (possibly) remote one.
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	52
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	53 Members:
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	54
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	55 missing is a list of all nodes present in local but not in remote.
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	56 common is a list of all nodes shared between the two repos.
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	57 excluded is the list of missing changeset that shouldn't be sent remotely.
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	58 missingheads is the list of heads of missing.
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	59 commonheads is the list of heads of common.
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	60
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	61 The sets are computed on demand from the heads, unless provided upfront
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	62 by discovery.'''
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	63
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	64 def __init__(self, revlog, commonheads, missingheads):
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	65 self.commonheads = commonheads
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	66 self.missingheads = missingheads
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	67 self._revlog = revlog
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	68 self._common = None
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	69 self._missing = None
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	70 self.excluded = []
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	71
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	72 def _computecommonmissing(self):
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	73 sets = self._revlog.findcommonmissing(self.commonheads,
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	74 self.missingheads)
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	75 self._common, self._missing = sets
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	76
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	77 @util.propertycache
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	78 def common(self):
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	79 if self._common is None:
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	80 self._computecommonmissing()
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	81 return self._common
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	82
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	83 @util.propertycache
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	84 def missing(self):
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	85 if self._missing is None:
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	86 self._computecommonmissing()
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	87 return self._missing
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	88
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	89 def findcommonoutgoing(repo, other, onlyheads=None, force=False, commoninc=None):
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	90 '''Return an outgoing instance to identify the nodes present in repo but
cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	91 not in other.
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	92
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	93 If onlyheads is given, only nodes ancestral to nodes in onlyheads (inclusive)
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	94 are included. If you already know the local repo's heads, passing them in
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	95 onlyheads is faster than letting them be recomputed here.
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	96
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	97 If commoninc is given, it must the the result of a prior call to
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	98 findcommonincoming(repo, other, force) to avoid recomputing it here.'''
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	99 # declare an empty outgoing object to be filled later
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	100 og = outgoing(repo.changelog, None, None)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	101
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	102 # get common set if not provided
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	103 if commoninc is None:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	104 commoninc = findcommonincoming(repo, other, force=force)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	105 og.commonheads, _any, _hds = commoninc
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	106
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	107 # compute outgoing
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	108 if not repo._phaseroots[phases.secret]:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	109 og.missingheads = onlyheads or repo.heads()
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	110 elif onlyheads is None:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	111 # use visible heads as it should be cached
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	112 og.missingheads = phases.visibleheads(repo)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	113 og.excluded = [ctx.node() for ctx in repo.set('secret()')]
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	114 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	115 # compute common, missing and exclude secret stuff
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	116 sets = repo.changelog.findcommonmissing(og.commonheads, onlyheads)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	117 og._common, allmissing = sets
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	118 og._missing = missing = []
15951 bd84fc0b5f64 phases: properly register excluded changeset when revision are specified Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15932 diff changeset	119 og.excluded = excluded = []
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	120 for node in allmissing:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	121 if repo[node].phase() >= phases.secret:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	122 excluded.append(node)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	123 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	124 missing.append(node)
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	125 if excluded:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	126 # update missing heads
15955 5a14f48d6b9a discovery: ensure that missingheads are always heads of everything we tried Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15951 diff changeset	127 missingheads = phases.newheads(repo, onlyheads, excluded)
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	128 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	129 missingheads = onlyheads
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	130 og.missingheads = missingheads
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	131
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	132 return og
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	133
15986 ba959f6e10f8 discovery: fix regression when checking heads for pre 1.4 client (issue3218) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15955 diff changeset	134 def checkheads(repo, remote, outgoing, remoteheads, newbranch=False, inc=False):
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	135 """Check that a push won't add any outgoing head
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	136
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	137 raise Abort error and display ui message as needed.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	138 """
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	139 if remoteheads == [nullid]:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	140 # remote is empty, nothing to check.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	141 return
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	142
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	143 cl = repo.changelog
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	144 if remote.capable('branchmap'):
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	145 # Check for each named branch if we're creating new remote heads.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	146 # To be a remote head after push, node must be either:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	147 # - unknown locally
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	148 # - a local outgoing head descended from update
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	149 # - a remote head that's known locally and not
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	150 # ancestral to an outgoing head
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	151
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	152 # 1. Create set of branches involved in the push.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	153 branches = set(repo[n].branch() for n in outgoing.missing)
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	154
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	155 # 2. Check for new branches on the remote.
16535 39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15986 diff changeset	156 if remote.local():
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15986 diff changeset	157 remotemap = phases.visiblebranchmap(remote)
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15986 diff changeset	158 else:
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15986 diff changeset	159 remotemap = remote.branchmap()
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	160 newbranches = branches - set(remotemap)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	161 if newbranches and not newbranch: # new branch requires --new-branch
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	162 branchnames = ', '.join(sorted(newbranches))
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	163 raise util.Abort(_("push creates new remote branches: %s!")
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	164 % branchnames,
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	165 hint=_("use 'hg push --new-branch' to create"
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	166 " new remote branches"))
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	167 branches.difference_update(newbranches)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	168
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	169 # 3. Construct the initial oldmap and newmap dicts.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	170 # They contain information about the remote heads before and
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	171 # after the push, respectively.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	172 # Heads not found locally are not included in either dict,
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	173 # since they won't be affected by the push.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	174 # unsynced contains all branches with incoming changesets.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	175 oldmap = {}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	176 newmap = {}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	177 unsynced = set()
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	178 for branch in branches:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	179 remotebrheads = remotemap[branch]
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	180 prunedbrheads = [h for h in remotebrheads if h in cl.nodemap]
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	181 oldmap[branch] = prunedbrheads
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	182 newmap[branch] = list(prunedbrheads)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	183 if len(remotebrheads) > len(prunedbrheads):
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	184 unsynced.add(branch)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	185
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	186 # 4. Update newmap with outgoing changes.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	187 # This will possibly add new heads and remove existing ones.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	188 ctxgen = (repo[n] for n in outgoing.missing)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	189 repo._updatebranchcache(newmap, ctxgen)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	190
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	191 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	192 # 1-4b. old servers: Check for new topological heads.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	193 # Construct {old,new}map with branch = None (topological branch).
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	194 # (code based on _updatebranchcache)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	195 oldheads = set(h for h in remoteheads if h in cl.nodemap)
15986 ba959f6e10f8 discovery: fix regression when checking heads for pre 1.4 client (issue3218) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15955 diff changeset	196 newheads = oldheads.union(outgoing.missing)
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	197 if len(newheads) > 1:
15986 ba959f6e10f8 discovery: fix regression when checking heads for pre 1.4 client (issue3218) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15955 diff changeset	198 for latest in reversed(outgoing.missing):
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	199 if latest not in newheads:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	200 continue
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	201 minhrev = min(cl.rev(h) for h in newheads)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	202 reachable = cl.reachable(latest, cl.node(minhrev))
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	203 reachable.remove(latest)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	204 newheads.difference_update(reachable)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	205 branches = set([None])
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	206 newmap = {None: newheads}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	207 oldmap = {None: oldheads}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	208 unsynced = inc and branches or set()
11578 bb7af1de5e38 discovery: remove duplication for new remote head discovery Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11577 diff changeset	209
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	210 # 5. Check for new heads.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	211 # If there are more heads after the push than before, a suitable
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	212 # error message, depending on unsynced status, is displayed.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	213 error = None
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	214 for branch in branches:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	215 newhs = set(newmap[branch])
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	216 oldhs = set(oldmap[branch])
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	217 if len(newhs) > len(oldhs):
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	218 dhs = list(newhs - oldhs)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	219 if error is None:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	220 if branch not in ('default', None):
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	221 error = _("push creates new remote head %s "
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	222 "on branch '%s'!") % (short(dhs[0]), branch)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	223 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	224 error = _("push creates new remote head %s!"
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	225 ) % short(dhs[0])
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	226 if branch in unsynced:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	227 hint = _("you should pull and merge or "
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	228 "use push -f to force")
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	229 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	230 hint = _("did you forget to merge? "
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	231 "use push -f to force")
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	232 if branch is not None:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	233 repo.ui.note(_("new remote heads on branch '%s'\n") % branch)
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	234 for h in dhs:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	235 repo.ui.note(_("new remote head %s\n") % short(h))
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	236 if error:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	237 raise util.Abort(error, hint=hint)
11578 bb7af1de5e38 discovery: remove duplication for new remote head discovery Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11577 diff changeset	238
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	239 # 6. Check for unsynced changes on involved branches.
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	240 if unsynced:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	241 repo.ui.warn(_("note: unsynced remote changes!\n"))

Mercurial > public > mercurial-scm > hg

annotate mercurial/discovery.py @ 16535:39d1f83eb05d stable