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

annotate mercurial/discovery.py @ 17033:0413f68da85c

tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.

author	Mads Kiilerich <mads@kiilerich.com>
date	Tue, 26 Jun 2012 03:35:22 +0200
parents	25f7d40fe735
children	6f89c3f0192d

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
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16657 diff changeset	89 def findcommonoutgoing(repo, other, onlyheads=None, force=False,
16746 9acb5cd19162 merge with stable Matt Mackall <mpm@selenic.com> parents: 16683 16736 diff changeset	90 commoninc=None, portable=False):
15837 cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15713 diff changeset	91 '''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	92 not in other.
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	93
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16657 diff changeset	94 If onlyheads is given, only nodes ancestral to nodes in onlyheads
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16657 diff changeset	95 (inclusive) are included. If you already know the local repo's heads,
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16657 diff changeset	96 passing them in onlyheads is faster than letting them be recomputed here.
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	97
30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	98 If commoninc is given, it must the the result of a prior call to
16736 025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	99 findcommonincoming(repo, other, force) to avoid recomputing it here.
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	100
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	101 If portable is given, compute more conservative common and missingheads,
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	102 to make bundles created from the instance more portable.'''
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	103 # 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	104 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	105
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	106 # 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	107 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	108 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	109 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	110
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	111 # compute outgoing
16657 b6081c2c4647 phases: introduce phasecache Patrick Mezard <patrick@mezard.eu> parents: 16535 diff changeset	112 if not repo._phasecache.phaseroots[phases.secret]:
15838 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.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	114 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	115 # 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	116 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	117 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	118 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	119 # 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	120 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	121 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	122 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	123 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	124 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	125 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	126 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	127 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	128 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	129 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	130 # 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	131 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	132 else:
7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	133 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	134 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	135
16736 025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	136 if portable:
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	137 # recompute common and missingheads as if -r<rev> had been given for
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	138 # each head of missing, and --base <rev> for each head of the proper
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	139 # ancestors of missing
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	140 og._computecommonmissing()
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	141 cl = repo.changelog
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	142 missingrevs = set(cl.rev(n) for n in og._missing)
16866 91f3ac205816 revlog: ancestors(revs) becomes ancestors(revs) (API) Bryan O'Sullivan <bryano@fb.com>* parents: 16835 diff changeset	143 og._common = set(cl.ancestors(missingrevs)) - missingrevs
16736 025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	144 commonheads = set(og.commonheads)
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	145 og.missingheads = [h for h in og.missingheads if h not in commonheads]
025b3b763ba9 bundle: make bundles more portable (isue3441) Sune Foldager <cryo@cyanite.org> parents: 16535 diff changeset	146
15838 7299e09a85a2 phases: make outgoing object and discovery aware of exclusion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15837 diff changeset	147 return og
14213 30273f0c776b discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 14184 diff changeset	148
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	149 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	150 """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	151
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	152 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	153 """
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	154 if remoteheads == [nullid]:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	155 # 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	156 return
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	157
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	158 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	159 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	160 # 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	161 # 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	162 # - unknown locally
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	163 # - 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	164 # - 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	165 # 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	166
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	167 # 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	168 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	169
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	170 # 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	171 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	172 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	173 else:
39d1f83eb05d branchmap: server should not advertise secret changeset in branchmap (Issue3303) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15986 diff changeset	174 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	175 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	176 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	177 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	178 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	179 % branchnames,
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	180 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	181 " new remote branches"))
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	182 branches.difference_update(newbranches)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	183
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	184 # 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	185 # 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	186 # 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	187 # 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	188 # 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	189 # 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	190 oldmap = {}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	191 newmap = {}
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	192 unsynced = set()
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	193 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	194 remotebrheads = remotemap[branch]
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	195 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	196 oldmap[branch] = prunedbrheads
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	197 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	198 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	199 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	200
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	201 # 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	202 # 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	203 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	204 repo._updatebranchcache(newmap, ctxgen)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	205
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	206 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	207 # 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	208 # 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	209 # (code based on _updatebranchcache)
17011 25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	210 oldheadrevs = set(cl.rev(h) for h in remoteheads if h in cl.nodemap)
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	211 missingrevs = [cl.rev(node) for node in outgoing.missing]
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	212 newheadrevs = oldheadrevs.union(missingrevs)
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	213 if len(newheadrevs) > 1:
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	214 for latest in sorted(missingrevs, reverse=True):
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	215 if latest not in newheadrevs:
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	216 continue
17011 25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	217 reachable = cl.ancestors([latest], min(newheadrevs))
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	218 newheadrevs.difference_update(reachable)
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	219 branches = set([None])
17011 25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	220 newmap = {None: [cl.node(rev) for rev in newheadrevs]}
25f7d40fe735 discovery: convert legacy part of checkheads to revs from nodes Joshua Redstone <joshua.redstone@fb.com> parents: 17009 diff changeset	221 oldmap = {None: [cl.node(rev) for rev in oldheadrevs]}
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	222 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	223
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	224 # 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	225 # 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	226 # 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	227 error = None
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	228 remotebookmarks = remote.listkeys('bookmarks')
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	229 localbookmarks = repo._bookmarks
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	230
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	231 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	232 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	233 oldhs = set(oldmap[branch])
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	234 dhs = None
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	235 if len(newhs) > len(oldhs):
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	236 # strip updates to existing remote heads from the new heads list
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	237 bookmarkedheads = set([repo[bm].node() for bm in localbookmarks
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	238 if bm in remotebookmarks and
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	239 remote[bm] == repo[bm].ancestor(remote[bm])])
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	240 dhs = list(newhs - bookmarkedheads - oldhs)
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16746 diff changeset	241 if dhs:
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	242 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	243 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	244 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	245 "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	246 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	247 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	248 ) % short(dhs[0])
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	249 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	250 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	251 "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	252 else:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	253 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	254 "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	255 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	256 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	257 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	258 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	259 if error:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	260 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	261
15932 4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	262 # 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	263 if unsynced:
4154338f0bc0 discovery: diet discovery.prepush from non-discovery code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15893 diff changeset	264 repo.ui.warn(_("note: unsynced remote changes!\n"))

Mercurial > public > mercurial-scm > hg

annotate mercurial/discovery.py @ 17033:0413f68da85c