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

annotate mercurial/exchange.py @ 32548:e70d6dbde713

bundle2: move function building obsmarker-part in the bundle2 module We move it next to similar part building functions. We will need it for the "writenewbundle" logic. This will allow us to easily include obsmarkers in on-disk bundle, a necessary step before having `hg strip` also operate on markers. (Yes, the bundle2 module was already too large, but there any many interdependencies between its components so it is non-trivial to split, this is a quest for another adventure.)

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sun, 28 May 2017 11:48:18 -0700
parents	bd872f64a8ba
children	9929af2b09b4

rev	line source
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1 # exchange.py - utility to exchange data between repos.
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	7
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	8 from __future__ import absolute_import
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	9
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	10 import errno
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29064 diff changeset	11 import hashlib
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	12
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	13 from .i18n import _
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	14 from .node import (
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	15 hex,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	16 nullid,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	17 )
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	18 from . import (
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	19 bookmarks as bookmod,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	20 bundle2,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	21 changegroup,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	22 discovery,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	23 error,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	24 lock as lockmod,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	25 obsolete,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	26 phases,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	27 pushkey,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	28 scmutil,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	29 sslutil,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	30 streamclone,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	31 url as urlmod,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	32 util,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	33 )
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	34
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	35 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	36 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	37
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	38 # Maps bundle version human names to changegroup versions.
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	39 _bundlespeccgversions = {'v1': '01',
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	40 'v2': '02',
26756 9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	41 'packed1': 's1',
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	42 'bundle2': '02', #legacy
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	43 }
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	44
30889 ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	45 # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE.
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32327 diff changeset	46 _bundlespecv1compengines = {'gzip', 'bzip2', 'none'}
30889 ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	47
26646 77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	48 def parsebundlespec(repo, spec, strict=True, externalnames=False):
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	49 """Parse a bundle string specification into parts.
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	50
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	51 Bundle specifications denote a well-defined bundle/exchange format.
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	52 The content of a given specification should not change over time in
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	53 order to ensure that bundles produced by a newer version of Mercurial are
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	54 readable from an older version.
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	55
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	56 The string currently has the form:
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	57
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	58 <compression>-<type>[;<parameter0>[;<parameter1>]]
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	59
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	60 Where <compression> is one of the supported compression formats
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	61 and <type> is (currently) a version string. A ";" can follow the type and
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30187 diff changeset	62 all text afterwards is interpreted as URI encoded, ";" delimited key=value
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	63 pairs.
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	64
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	65 If ``strict`` is True (the default) <compression> is required. Otherwise,
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	66 it is optional.
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	67
26646 77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	68 If ``externalnames`` is False (the default), the human-centric names will
77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	69 be converted to their internal representation.
77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	70
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	71 Returns a 3-tuple of (compression, version, parameters). Compression will
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	72 be ``None`` if not in strict mode and a compression isn't defined.
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	73
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	74 An ``InvalidBundleSpecification`` is raised when the specification is
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	75 not syntactically well formed.
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	76
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	77 An ``UnsupportedBundleSpecification`` is raised when the compression or
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	78 bundle type/version is not recognized.
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	79
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	80 Note: this function will likely eventually return a more complex data
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	81 structure, including bundle2 part information.
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	82 """
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	83 def parseparams(s):
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	84 if ';' not in s:
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	85 return s, {}
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	86
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	87 params = {}
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	88 version, paramstr = s.split(';', 1)
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	89
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	90 for p in paramstr.split(';'):
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	91 if '=' not in p:
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	92 raise error.InvalidBundleSpecification(
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	93 _('invalid bundle specification: '
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	94 'missing "=" in parameter: %s') % p)
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	95
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	96 key, value = p.split('=', 1)
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	97 key = urlreq.unquote(key)
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	98 value = urlreq.unquote(value)
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	99 params[key] = value
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	100
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	101 return version, params
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	102
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	103
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	104 if strict and '-' not in spec:
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	105 raise error.InvalidBundleSpecification(
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	106 _('invalid bundle specification; '
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	107 'must be prefixed with compression: %s') % spec)
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	108
92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	109 if '-' in spec:
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	110 compression, version = spec.split('-', 1)
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	111
30449 c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	112 if compression not in util.compengines.supportedbundlenames:
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	113 raise error.UnsupportedBundleSpecification(
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	114 _('%s compression is not supported') % compression)
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	115
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	116 version, params = parseparams(version)
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	117
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	118 if version not in _bundlespeccgversions:
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	119 raise error.UnsupportedBundleSpecification(
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	120 _('%s is not a recognized bundle version') % version)
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	121 else:
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	122 # Value could be just the compression or just the version, in which
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	123 # case some defaults are assumed (but only when not in strict mode).
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	124 assert not strict
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	125
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	126 spec, params = parseparams(spec)
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	127
30449 c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	128 if spec in util.compengines.supportedbundlenames:
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	129 compression = spec
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	130 version = 'v1'
30890 10c0ee338535 exchange: use v2 bundles for modern compression engines (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30889 diff changeset	131 # Generaldelta repos require v2.
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	132 if 'generaldelta' in repo.requirements:
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	133 version = 'v2'
30890 10c0ee338535 exchange: use v2 bundles for modern compression engines (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30889 diff changeset	134 # Modern compression engines require v2.
10c0ee338535 exchange: use v2 bundles for modern compression engines (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30889 diff changeset	135 if compression not in _bundlespecv1compengines:
10c0ee338535 exchange: use v2 bundles for modern compression engines (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30889 diff changeset	136 version = 'v2'
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	137 elif spec in _bundlespeccgversions:
26756 9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	138 if spec == 'packed1':
9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	139 compression = 'none'
9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	140 else:
9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	141 compression = 'bzip2'
26640 b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	142 version = spec
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	143 else:
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	144 raise error.UnsupportedBundleSpecification(
b13fdcc4e700 exchange: refactor bundle specification parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 26639 diff changeset	145 _('%s is not a recognized bundle specification') % spec)
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	146
30889 ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	147 # Bundle version 1 only supports a known set of compression engines.
ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	148 if version == 'v1' and compression not in _bundlespecv1compengines:
ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	149 raise error.UnsupportedBundleSpecification(
ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	150 _('compression engine %s is not supported on v1 bundles') %
ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	151 compression)
ffed3bf5cd4c exchange: reject new compression engines for v1 bundles (issue5506) Gregory Szorc <gregory.szorc@gmail.com> parents: 30875 diff changeset	152
26760 a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	153 # The specification for packed1 can optionally declare the data formats
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	154 # required to apply it. If we see this metadata, compare against what the
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	155 # repo supports and error if the bundle isn't compatible.
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	156 if version == 'packed1' and 'requirements' in params:
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	157 requirements = set(params['requirements'].split(','))
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	158 missingreqs = requirements - repo.supportedformats
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	159 if missingreqs:
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	160 raise error.UnsupportedBundleSpecification(
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	161 _('missing support for repository features: %s') %
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	162 ', '.join(sorted(missingreqs)))
a18ee7da38c2 exchange: parse requirements from stream clone specification string Gregory Szorc <gregory.szorc@gmail.com> parents: 26759 diff changeset	163
26646 77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	164 if not externalnames:
30449 c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	165 engine = util.compengines.forbundlename(compression)
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	166 compression = engine.bundletype()[1]
26646 77769354d4ad exchange: support preserving external names when parsing bundle specs Gregory Szorc <gregory.szorc@gmail.com> parents: 26645 diff changeset	167 version = _bundlespeccgversions[version]
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	168 return compression, version, params
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	169
21064 4d9d490d7bbe bundle2: add a ui argument to readbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21063 diff changeset	170 def readbundle(ui, fh, fname, vfs=None):
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	171 header = changegroup.readexactly(fh, 4)
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	172
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	173 alg = None
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	174 if not fname:
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	175 fname = "stream"
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	176 if not header.startswith('HG') and header.startswith('\0'):
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	177 fh = changegroup.headerlessfixup(fh, header)
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	178 header = "HG10"
f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	179 alg = 'UN'
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	180 elif vfs:
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	181 fname = vfs.join(fname)
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	182
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	183 magic, version = header[0:2], header[2:4]
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	184
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	185 if magic != 'HG':
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	186 raise error.Abort(_('%s: not a Mercurial bundle') % fname)
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	187 if version == '10':
f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	188 if alg is None:
f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	189 alg = changegroup.readexactly(fh, 2)
22390 e2806b8613ca changegroup: rename bundle-related functions and classes Sune Foldager <cryo@cyanite.org> parents: 22354 diff changeset	190 return changegroup.cg1unpacker(fh, alg)
24649 2d15c59a001b bundle2: detect bundle2 stream/request on /HG2./ instead of /HG2Y/ Pierre-Yves David <pierre-yves.david@fb.com> parents: 24641 diff changeset	191 elif version.startswith('2'):
25640 39f0064a3079 bundle2.getunbundler: rename "header" to "magicstring" Pierre-Yves David <pierre-yves.david@fb.com> parents: 25559 diff changeset	192 return bundle2.getunbundler(ui, fh, magicstring=magic + version)
26756 9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	193 elif version == 'S1':
9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	194 return streamclone.streamcloneapplier(fh)
21065 f9a9a6d63e89 bundle2: prepare readbundle to return more that one type of bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21064 diff changeset	195 else:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	196 raise error.Abort(_('%s: unknown bundle version %s') % (fname, version))
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	197
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	198 def getbundlespec(ui, fh):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	199 """Infer the bundlespec from a bundle file handle.
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	200
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	201 The input file handle is seeked and the original seek position is not
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	202 restored.
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	203 """
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	204 def speccompression(alg):
30449 c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	205 try:
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	206 return util.compengines.forbundletype(alg).bundletype()[0]
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	207 except KeyError:
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	208 return None
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	209
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	210 b = readbundle(ui, fh, None)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	211 if isinstance(b, changegroup.cg1unpacker):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	212 alg = b._type
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	213 if alg == '_truncatedBZ':
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	214 alg = 'BZ'
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	215 comp = speccompression(alg)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	216 if not comp:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	217 raise error.Abort(_('unknown compression algorithm: %s') % alg)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	218 return '%s-v1' % comp
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	219 elif isinstance(b, bundle2.unbundle20):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	220 if 'Compression' in b.params:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	221 comp = speccompression(b.params['Compression'])
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	222 if not comp:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	223 raise error.Abort(_('unknown compression algorithm: %s') % comp)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	224 else:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	225 comp = 'none'
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	226
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	227 version = None
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	228 for part in b.iterparts():
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	229 if part.type == 'changegroup':
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	230 version = part.params['version']
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	231 if version in ('01', '02'):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	232 version = 'v2'
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	233 else:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	234 raise error.Abort(_('changegroup version %s does not have '
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	235 'a known bundlespec') % version,
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	236 hint=_('try upgrading your Mercurial '
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	237 'client'))
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	238
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	239 if not version:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	240 raise error.Abort(_('could not identify changegroup version in '
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	241 'bundle'))
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	242
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	243 return '%s-%s' % (comp, version)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	244 elif isinstance(b, streamclone.streamcloneapplier):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	245 requirements = streamclone.readbundle1header(fh)[2]
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	246 params = 'requirements=%s' % ','.join(sorted(requirements))
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	247 return 'none-packed1;%s' % urlreq.quote(params)
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	248 else:
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	249 raise error.Abort(_('unknown bundle type: %s') % b)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	250
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	251 def _computeoutgoing(repo, heads, common):
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	252 """Computes which revs are outgoing given a set of common
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	253 and a set of heads.
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	254
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	255 This is a separate function so extensions can have access to
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	256 the logic.
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	257
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	258 Returns a discovery.outgoing object.
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	259 """
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	260 cl = repo.changelog
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	261 if common:
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	262 hasnode = cl.hasnode
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	263 common = [n for n in common if hasnode(n)]
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	264 else:
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	265 common = [nullid]
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	266 if not heads:
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	267 heads = cl.heads()
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	268 return discovery.outgoing(repo, common, heads)
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	269
29696 2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	270 def _forcebundle1(op):
2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	271 """return true if a pull/push must use bundle1
24650 b83a8f512a80 exchange: introduce a '_canusebundle2' function Pierre-Yves David <pierre-yves.david@fb.com> parents: 24649 diff changeset	272
29697 6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	273 This function is used to allow testing of the older bundle version"""
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	274 ui = op.repo.ui
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	275 forcebundle1 = False
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30187 diff changeset	276 # The goal is this config is to allow developer to choose the bundle
29697 6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	277 # version used during exchanged. This is especially handy during test.
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	278 # Value is a list of bundle version to be picked from, highest version
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	279 # should be used.
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	280 #
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	281 # developer config: devel.legacy.exchange
6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	282 exchange = ui.configlist('devel', 'legacy.exchange')
29703 39537bc64442 bundle2: remove 'experimental.bundle2-exp' boolean config (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29697 diff changeset	283 forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange
29697 6786c3f8684d bundle2: add a devel option controling bundle version used for exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29696 diff changeset	284 return forcebundle1 or not op.remote.capable('bundle2')
24650 b83a8f512a80 exchange: introduce a '_canusebundle2' function Pierre-Yves David <pierre-yves.david@fb.com> parents: 24649 diff changeset	285
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	286 class pushoperation(object):
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	287 """A object that represent a single push operation
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	288
28456 d9d51da7a850 pushoperation: fix language issues in docstring Nathan Goldbaum <ngoldbau@illinois.edu> parents: 28182 diff changeset	289 Its purpose is to carry push related state and very common operations.
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	290
28456 d9d51da7a850 pushoperation: fix language issues in docstring Nathan Goldbaum <ngoldbau@illinois.edu> parents: 28182 diff changeset	291 A new pushoperation should be created at the beginning of each push and
d9d51da7a850 pushoperation: fix language issues in docstring Nathan Goldbaum <ngoldbau@illinois.edu> parents: 28182 diff changeset	292 discarded afterward.
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	293 """
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	294
22623 cd7e17aa6040 push: pass list of bookmark to `exchange.push` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22622 diff changeset	295 def __init__(self, repo, remote, force=False, revs=None, newbranch=False,
cd7e17aa6040 push: pass list of bookmark to `exchange.push` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22622 diff changeset	296 bookmarks=()):
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	297 # repo we push from
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	298 self.repo = repo
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	299 self.ui = repo.ui
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	300 # repo we push to
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	301 self.remote = remote
20349 89f90457979e push: move `force` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20348 diff changeset	302 # force option provided
89f90457979e push: move `force` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20348 diff changeset	303 self.force = force
20350 8c85d968ee65 push: move `revs` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20349 diff changeset	304 # revs to be pushed (None is "all")
8c85d968ee65 push: move `revs` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20349 diff changeset	305 self.revs = revs
22623 cd7e17aa6040 push: pass list of bookmark to `exchange.push` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22622 diff changeset	306 # bookmark explicitly pushed
cd7e17aa6040 push: pass list of bookmark to `exchange.push` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22622 diff changeset	307 self.bookmarks = bookmarks
20351 c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	308 # allow push of new branch
c05ad450df23 push: move `newbranch` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20350 diff changeset	309 self.newbranch = newbranch
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	310 # did a local lock get acquired?
2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	311 self.locallocked = None
21901 8612c4ab7f54 push: add a ``pushop.stepsdone`` attribute Pierre-Yves David <pierre-yves.david@fb.com> parents: 21899 diff changeset	312 # step already performed
8612c4ab7f54 push: add a ``pushop.stepsdone`` attribute Pierre-Yves David <pierre-yves.david@fb.com> parents: 21899 diff changeset	313 # (used to check what steps have been already performed through bundle2)
8612c4ab7f54 push: add a ``pushop.stepsdone`` attribute Pierre-Yves David <pierre-yves.david@fb.com> parents: 21899 diff changeset	314 self.stepsdone = set()
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	315 # Integer version of the changegroup push result
20439 0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	316 # - None means nothing to push
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	317 # - 0 means HTTP error
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	318 # - 1 means we pushed and remote head count is unchanged or
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	319 # we have outgoing changesets but refused to push
0d3ccf285ff2 push: move push return value in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20438 diff changeset	320 # - other values as described by addchangegroup()
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	321 self.cgresult = None
22624 eef31f9a4c0f push: add `pushoperation.bkresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22623 diff changeset	322 # Boolean value for the bookmark push
eef31f9a4c0f push: add `pushoperation.bkresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22623 diff changeset	323 self.bkresult = None
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	324 # discover.outgoing object (contains common and outgoing data)
20440 400da8bc7786 push: move outgoing object in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20439 diff changeset	325 self.outgoing = None
20462 0031ef5df586 push: move `remoteheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20441 diff changeset	326 # all remote heads before the push
0031ef5df586 push: move `remoteheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20441 diff changeset	327 self.remoteheads = None
20464 d032417db243 push: move `incoming` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20463 diff changeset	328 # testable as a boolean indicating if any nodes are missing locally.
d032417db243 push: move `incoming` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20463 diff changeset	329 self.incoming = None
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	330 # phases changes that must be pushed along side the changesets
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	331 self.outdatedphases = None
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	332 # phases changes that must be pushed if changeset push fails
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	333 self.fallbackoutdatedphases = None
22034 5f57bc77657c push: move the list of obsmarker to push into the push operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 22033 diff changeset	334 # outgoing obsmarkers
22035 24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	335 self.outobsmarkers = set()
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	336 # outgoing bookmarks
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	337 self.outbookmarks = []
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	338 # transaction manager
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	339 self.trmanager = None
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	340 # map { pushkey partid -> callback handling failure}
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	341 # used to handle exception from mandatory pushkey part failure
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	342 self.pkfailcb = {}
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	343
22014 71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	344 @util.propertycache
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	345 def futureheads(self):
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	346 """future remote heads if the changeset push succeeds"""
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	347 return self.outgoing.missingheads
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	348
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	349 @util.propertycache
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	350 def fallbackheads(self):
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	351 """future remote heads if the changeset push fails"""
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	352 if self.revs is None:
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	353 # not target to push, all common are relevant
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	354 return self.outgoing.commonheads
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	355 unfi = self.repo.unfiltered()
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	356 # I want cheads = heads(::missingheads and ::commonheads)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	357 # (missingheads is revs with secret changeset filtered out)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	358 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	359 # This can be expressed as:
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	360 # cheads = ( (missingheads and ::commonheads)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	361 # + (commonheads and ::missingheads))"
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	362 # )
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	363 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	364 # while trying to push we already computed the following:
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	365 # common = (::commonheads)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	366 # missing = ((commonheads::missingheads) - commonheads)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	367 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	368 # We can pick:
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	369 # * missingheads part of common (::commonheads)
26184 327d09f0b5d4 exchange: allow fallbackheads to use lazy set behavior Durham Goode <durham@fb.com> parents: 25896 diff changeset	370 common = self.outgoing.common
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	371 nm = self.repo.changelog.nodemap
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	372 cheads = [node for node in self.revs if nm[node] in common]
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	373 # and
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	374 # * commonheads parents on missing
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	375 revset = unfi.set('%ln and parents(roots(%ln))',
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	376 self.outgoing.commonheads,
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	377 self.outgoing.missing)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	378 cheads.extend(c.node() for c in revset)
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	379 return cheads
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	380
22016 7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	381 @property
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	382 def commonheads(self):
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	383 """set of all common heads after changeset bundle push"""
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	384 if self.cgresult:
22016 7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	385 return self.futureheads
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	386 else:
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	387 return self.fallbackheads
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	388
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	389 # mapping of message used when pushing bookmark
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	390 bookmsgmap = {'update': (_("updating bookmark %s\n"),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	391 _('updating bookmark %s failed!\n')),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	392 'export': (_("exporting bookmark %s\n"),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	393 _('exporting bookmark %s failed!\n')),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	394 'delete': (_("deleting remote bookmark %s\n"),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	395 _('deleting remote bookmark %s failed!\n')),
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	396 }
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	397
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	398
26729 16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	399 def push(repo, remote, force=False, revs=None, newbranch=False, bookmarks=(),
16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	400 opargs=None):
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	401 '''Push outgoing changesets (limited by revs) from a local
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	402 repository to remote. Return an integer:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	403 - None means nothing to push
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	404 - 0 means HTTP error
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	405 - 1 means we pushed and remote head count is unchanged or
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	406 we have outgoing changesets but refused to push
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	407 - other values as described by addchangegroup()
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	408 '''
26729 16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	409 if opargs is None:
16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	410 opargs = {}
16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	411 pushop = pushoperation(repo, remote, force, revs, newbranch, bookmarks,
16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	412 **opargs)
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	413 if pushop.remote.local():
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	414 missing = (set(pushop.repo.requirements)
d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	415 - pushop.remote.local().supported)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	416 if missing:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	417 msg = _("required features are not"
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	418 " supported in the destination:"
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	419 " %s") % (', '.join(sorted(missing)))
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	420 raise error.Abort(msg)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	421
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	422 # there are two ways to push to remote repo:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	423 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	424 # addchangegroup assumes local user can lock remote
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	425 # repo (local filesystem, old ssh servers).
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	426 #
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	427 # unbundle assumes local user cannot lock remote repo (new ssh
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	428 # servers, http servers).
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	429
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	430 if not pushop.remote.canpush():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	431 raise error.Abort(_("destination does not support push"))
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	432 # get local lock as we might write phase data
24754 5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	433 localwlock = locallock = None
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	434 try:
24754 5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	435 # bundle2 push may receive a reply bundle touching bookmarks or other
5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	436 # things requiring the wlock. Take it now to ensure proper ordering.
5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	437 maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback')
29696 2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	438 if (not _forcebundle1(pushop)) and maypushback:
24754 5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	439 localwlock = pushop.repo.wlock()
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	440 locallock = pushop.repo.lock()
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	441 pushop.locallocked = True
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	442 except IOError as err:
20436 2f2e8d1c4856 push: move local lock logic in pushoperation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20435 diff changeset	443 pushop.locallocked = False
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	444 if err.errno != errno.EACCES:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	445 raise
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	446 # source repo cannot be locked.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	447 # We do not abort the push, but just disable the local phase
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	448 # synchronisation.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	449 msg = 'cannot lock source repository: %s\n' % err
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	450 pushop.ui.debug(msg)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	451 try:
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	452 if pushop.locallocked:
26672 90df14eb3d0e exchange: use pushop.repo instead of repo Sean Farley <sean@farley.io> parents: 26648 diff changeset	453 pushop.trmanager = transactionmanager(pushop.repo,
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	454 'push-response',
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	455 pushop.remote.url())
20924 e10000369b47 push: pass a `pushoperation` object to localrepo.checkpush Pierre-Yves David <pierre-yves.david@fb.com> parents: 20901 diff changeset	456 pushop.repo.checkpush(pushop)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	457 lock = None
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	458 unbundle = pushop.remote.capable('unbundle')
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	459 if not unbundle:
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	460 lock = pushop.remote.lock()
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	461 try:
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	462 _pushdiscovery(pushop)
29696 2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	463 if not _forcebundle1(pushop):
21903 48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	464 _pushbundle2(pushop)
48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	465 _pushchangeset(pushop)
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	466 _pushsyncphase(pushop)
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	467 _pushobsolete(pushop)
22224 f713de1d3916 push: update bookmarks within the remote lock Pierre-Yves David <pierre-yves.david@fb.com> parents: 22069 diff changeset	468 _pushbookmark(pushop)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	469 finally:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	470 if lock is not None:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	471 lock.release()
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	472 if pushop.trmanager:
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	473 pushop.trmanager.close()
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	474 finally:
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	475 if pushop.trmanager:
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	476 pushop.trmanager.release()
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	477 if locallock is not None:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	478 locallock.release()
24754 5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	479 if localwlock is not None:
5dc5cd7abbf5 push: acquire local 'wlock' if "pushback" is expected (BC) (issue4596) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	480 localwlock.release()
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	481
22616 cda85cfc8252 push: `exchange.push` now returns the `pushoperation` object Pierre-Yves David <pierre-yves.david@fb.com> parents: 22615 diff changeset	482 return pushop
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	483
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	484 # list of steps to perform discovery before push
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	485 pushdiscoveryorder = []
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	486
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	487 # Mapping between step name and function
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	488 #
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	489 # This exists to help extensions wrap steps if necessary
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	490 pushdiscoverymapping = {}
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	491
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	492 def pushdiscovery(stepname):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	493 """decorator for function performing discovery before push
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	494
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	495 The function is added to the step -> function mapping and appended to the
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	496 list of steps. Beware that decorated function will be added in order (this
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	497 may matter).
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	498
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	499 You can only use this decorator for a new step, if you want to wrap a step
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	500 from an extension, change the pushdiscovery dictionary directly."""
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	501 def dec(func):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	502 assert stepname not in pushdiscoverymapping
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	503 pushdiscoverymapping[stepname] = func
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	504 pushdiscoveryorder.append(stepname)
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	505 return func
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	506 return dec
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	507
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	508 def _pushdiscovery(pushop):
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	509 """Run all discovery steps"""
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	510 for stepname in pushdiscoveryorder:
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	511 step = pushdiscoverymapping[stepname]
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	512 step(pushop)
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	513
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	514 @pushdiscovery('changeset')
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	515 def _pushdiscoverychangeset(pushop):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	516 """discover the changeset that need to be pushed"""
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	517 fci = discovery.findcommonincoming
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	518 commoninc = fci(pushop.repo, pushop.remote, force=pushop.force)
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	519 common, inc, remoteheads = commoninc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	520 fco = discovery.findcommonoutgoing
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	521 outgoing = fco(pushop.repo, pushop.remote, onlyheads=pushop.revs,
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	522 commoninc=commoninc, force=pushop.force)
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	523 pushop.outgoing = outgoing
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	524 pushop.remoteheads = remoteheads
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	525 pushop.incoming = inc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	526
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	527 @pushdiscovery('phase')
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	528 def _pushdiscoveryphase(pushop):
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	529 """discover the phase that needs to be pushed
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	530
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	531 (computed for both success and failure case for changesets push)"""
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	532 outgoing = pushop.outgoing
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	533 unfi = pushop.repo.unfiltered()
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	534 remotephases = pushop.remote.listkeys('phases')
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	535 publishing = remotephases.get('publishing', False)
25337 636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	536 if (pushop.ui.configbool('ui', '_usedassubrepo', False)
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	537 and remotephases # server supports phases
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	538 and not pushop.outgoing.missing # no changesets to be pushed
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	539 and publishing):
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	540 # When:
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	541 # - this is a subrepo push
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	542 # - and remote support phase
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	543 # - and no changeset are to be pushed
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	544 # - and remote is publishing
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	545 # We may be in issue 3871 case!
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	546 # We drop the possible phase synchronisation done by
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	547 # courtesy to publish changesets possibly locally draft
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	548 # on the remote.
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	549 remotephases = {'publishing': 'True'}
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	550 ana = phases.analyzeremotephases(pushop.repo,
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	551 pushop.fallbackheads,
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	552 remotephases)
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	553 pheads, droots = ana
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	554 extracond = ''
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	555 if not publishing:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	556 extracond = ' and public()'
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	557 revset = 'heads((%%ln::%%ln) %s)' % extracond
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	558 # Get the list of all revs draft on remote by public here.
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	559 # XXX Beware that revset break if droots is not strictly
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	560 # XXX root we may want to ensure it is but it is costly
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	561 fallback = list(unfi.set(revset, droots, pushop.fallbackheads))
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	562 if not outgoing.missing:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	563 future = fallback
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	564 else:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	565 # adds changeset we are going to push as draft
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	566 #
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23082 diff changeset	567 # should not be necessary for publishing server, but because of an
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	568 # issue fixed in xxxxx we have to do it anyway.
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	569 fdroots = list(unfi.set('roots(%ln + %ln::)',
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	570 outgoing.missing, droots))
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	571 fdroots = [f.node() for f in fdroots]
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	572 future = list(unfi.set(revset, fdroots, pushop.futureheads))
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	573 pushop.outdatedphases = future
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	574 pushop.fallbackoutdatedphases = fallback
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	575
22035 24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	576 @pushdiscovery('obsmarker')
24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	577 def _pushdiscoveryobsmarkers(pushop):
22953 b1d694d3975e obsolete: add exchange option Durham Goode <durham@fb.com> parents: 22937 diff changeset	578 if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt)
22269 03cc81a28228 push: check if local and remote support evolution during discovery Pierre-Yves David <pierre-yves.david@fb.com> parents: 22244 diff changeset	579 and pushop.repo.obsstore
03cc81a28228 push: check if local and remote support evolution during discovery Pierre-Yves David <pierre-yves.david@fb.com> parents: 22244 diff changeset	580 and 'obsolete' in pushop.remote.listkeys('namespaces')):
22350 6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	581 repo = pushop.repo
6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	582 # very naive computation, that can be quite expensive on big repo.
6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	583 # However: evolution is currently slow on them anyway.
6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	584 nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads))
6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	585 pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes)
22035 24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	586
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	587 @pushdiscovery('bookmarks')
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	588 def _pushdiscoverybookmarks(pushop):
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	589 ui = pushop.ui
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	590 repo = pushop.repo.unfiltered()
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	591 remote = pushop.remote
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	592 ui.debug("checking for updated bookmarks\n")
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	593 ancestors = ()
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	594 if pushop.revs:
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	595 revnums = map(repo.changelog.rev, pushop.revs)
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	596 ancestors = repo.changelog.ancestors(revnums, inclusive=True)
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	597 remotebookmark = remote.listkeys('bookmarks')
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	598
28182 e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917) liscju <piotr.listkiewicz@gmail.com> parents: 27953 diff changeset	599 explicit = set([repo._bookmarks.expandname(bookmark)
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917) liscju <piotr.listkiewicz@gmail.com> parents: 27953 diff changeset	600 for bookmark in pushop.bookmarks])
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	601
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	602 remotebookmark = bookmod.unhexlifybookmarks(remotebookmark)
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	603 comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark)
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	604
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	605 def safehex(x):
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	606 if x is None:
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	607 return x
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	608 return hex(x)
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	609
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	610 def hexifycompbookmarks(bookmarks):
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	611 for b, scid, dcid in bookmarks:
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	612 yield b, safehex(scid), safehex(dcid)
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	613
8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	614 comp = [hexifycompbookmarks(marks) for marks in comp]
23081 e62c330a044f bookmarks: explicitly track identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23047 diff changeset	615 addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	616
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	617 for b, scid, dcid in advsrc:
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	618 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	619 explicit.remove(b)
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	620 if not ancestors or repo[scid].rev() in ancestors:
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	621 pushop.outbookmarks.append((b, dcid, scid))
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	622 # search added bookmark
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	623 for b, scid, dcid in addsrc:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	624 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	625 explicit.remove(b)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	626 pushop.outbookmarks.append((b, '', scid))
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	627 # search for overwritten bookmark
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	628 for b, scid, dcid in list(advdst) + list(diverge) + list(differ):
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	629 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	630 explicit.remove(b)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	631 pushop.outbookmarks.append((b, dcid, scid))
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	632 # search for bookmark to delete
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	633 for b, scid, dcid in adddst:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	634 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	635 explicit.remove(b)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	636 # treat as "deleted locally"
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	637 pushop.outbookmarks.append((b, dcid, ''))
23082 0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	638 # identical bookmarks shouldn't get reported
0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	639 for b, scid, dcid in same:
0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	640 if b in explicit:
0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	641 explicit.remove(b)
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	642
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	643 if explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	644 explicit = sorted(explicit)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	645 # we should probably list all of them
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	646 ui.warn(_('bookmark %s does not exist on the local '
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	647 'or remote repository!\n') % explicit[0])
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	648 pushop.bkresult = 2
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	649
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	650 pushop.outbookmarks.sort()
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	651
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	652 def _pushcheckoutgoing(pushop):
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	653 outgoing = pushop.outgoing
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	654 unfi = pushop.repo.unfiltered()
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	655 if not outgoing.missing:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	656 # nothing to push
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	657 scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded)
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	658 return False
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	659 # something to push
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	660 if not pushop.force:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	661 # if repo.obsstore == False --> no obsolete
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	662 # then, save the iteration
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	663 if unfi.obsstore:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	664 # this message are here for 80 char limit reason
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	665 mso = _("push includes obsolete changeset: %s!")
22628 2805d23e1f88 exchange: remove a broken i18n abuse Matt Mackall <mpm@selenic.com> parents: 22625 diff changeset	666 mst = {"unstable": _("push includes unstable changeset: %s!"),
2805d23e1f88 exchange: remove a broken i18n abuse Matt Mackall <mpm@selenic.com> parents: 22625 diff changeset	667 "bumped": _("push includes bumped changeset: %s!"),
2805d23e1f88 exchange: remove a broken i18n abuse Matt Mackall <mpm@selenic.com> parents: 22625 diff changeset	668 "divergent": _("push includes divergent changeset: %s!")}
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	669 # If we are to push if there is at least one
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	670 # obsolete or unstable changeset in missing, at
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	671 # least one of the missinghead will be obsolete or
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	672 # unstable. So checking heads only is ok
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	673 for node in outgoing.missingheads:
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	674 ctx = unfi[node]
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	675 if ctx.obsolete():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	676 raise error.Abort(mso % ctx)
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	677 elif ctx.troubled():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	678 raise error.Abort(mst[ctx.troubles()[0]] % ctx)
25836 dede675dc0c1 bookmarks: mark internal-only config option Matt Mackall <mpm@selenic.com> parents: 25668 diff changeset	679
26935 c4a7bbc78c74 exchange: pass pushop to discovery.checkheads Ryan McElroy <rmcelroy@fb.com> parents: 26855 diff changeset	680 discovery.checkheads(pushop)
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	681 return True
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	682
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	683 # List of names of steps to perform for an outgoing bundle2, order matters.
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	684 b2partsgenorder = []
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	685
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	686 # Mapping between step name and function
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	687 #
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	688 # This exists to help extensions wrap steps if necessary
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	689 b2partsgenmapping = {}
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	690
24731 88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	691 def b2partsgenerator(stepname, idx=None):
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	692 """decorator for function generating bundle2 part
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	693
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	694 The function is added to the step -> function mapping and appended to the
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	695 list of steps. Beware that decorated functions will be added in order
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	696 (this may matter).
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	697
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	698 You can only use this decorator for new steps, if you want to wrap a step
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	699 from an extension, attack the b2partsgenmapping dictionary directly."""
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	700 def dec(func):
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	701 assert stepname not in b2partsgenmapping
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	702 b2partsgenmapping[stepname] = func
24731 88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	703 if idx is None:
88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	704 b2partsgenorder.append(stepname)
88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	705 else:
88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	706 b2partsgenorder.insert(idx, stepname)
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	707 return func
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	708 return dec
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	709
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	710 def _pushb2ctxcheckheads(pushop, bundler):
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	711 """Generate race condition checking parts
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	712
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26779 diff changeset	713 Exists as an independent function to aid extensions
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	714 """
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	715 if not pushop.force:
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	716 bundler.newpart('check:heads', data=iter(pushop.remoteheads))
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	717
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	718 @b2partsgenerator('changeset')
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	719 def _pushb2ctx(pushop, bundler):
52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	720 """handle changegroup push through bundle2
52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	721
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	722 addchangegroup result is stored in the ``pushop.cgresult`` attribute.
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	723 """
21902 7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	724 if 'changesets' in pushop.stepsdone:
7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	725 return
7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	726 pushop.stepsdone.add('changesets')
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	727 # Send known heads to the server for race detection.
21903 48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	728 if not _pushcheckoutgoing(pushop):
48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	729 return
28876 79b8f052ee51 localrepo: refactor prepushoutgoinghook to take a pushop Mads Kiilerich <madski@unity3d.com> parents: 28668 diff changeset	730 pushop.repo.prepushoutgoinghooks(pushop)
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	731
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	732 _pushb2ctxcheckheads(pushop, bundler)
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	733
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	734 b2caps = bundle2.bundle2caps(pushop.remote)
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	735 version = '01'
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	736 cgversions = b2caps.get('changegroup')
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	737 if cgversions: # 3.1 and 3.2 ship with an empty value
27751 a40e2f7fe49d changegroup: hide packermap behind methods Martin von Zweigbergk <martinvonz@google.com> parents: 27738 diff changeset	738 cgversions = [v for v in cgversions
27953 88609cfa3745 changegroup: fix pulling to treemanifest repo from flat repo (issue5066) Martin von Zweigbergk <martinvonz@google.com> parents: 27938 diff changeset	739 if v in changegroup.supportedoutgoingversions(
88609cfa3745 changegroup: fix pulling to treemanifest repo from flat repo (issue5066) Martin von Zweigbergk <martinvonz@google.com> parents: 27938 diff changeset	740 pushop.repo)]
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	741 if not cgversions:
116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	742 raise ValueError(_('no common changegroup version'))
116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	743 version = max(cgversions)
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	744 cg = changegroup.getlocalchangegroupraw(pushop.repo, 'push',
07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	745 pushop.outgoing,
07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	746 version=version)
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	747 cgpart = bundler.newpart('changegroup', data=cg)
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	748 if cgversions:
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	749 cgpart.addparam('version', version)
27938 cabac7dfc621 exchange: set 'treemanifest' param on pushed changegroups too Martin von Zweigbergk <martinvonz@google.com> parents: 27883 diff changeset	750 if 'treemanifest' in pushop.repo.requirements:
cabac7dfc621 exchange: set 'treemanifest' param on pushed changegroups too Martin von Zweigbergk <martinvonz@google.com> parents: 27883 diff changeset	751 cgpart.addparam('treemanifest', '1')
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	752 def handlereply(op):
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23082 diff changeset	753 """extract addchangegroup returns from server reply"""
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	754 cgreplies = op.records.getreplies(cgpart.id)
52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	755 assert len(cgreplies['changegroup']) == 1
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	756 pushop.cgresult = cgreplies['changegroup'][0]['return']
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	757 return handlereply
52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	758
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	759 @b2partsgenerator('phase')
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	760 def _pushb2phases(pushop, bundler):
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	761 """handle phase push through bundle2"""
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	762 if 'phases' in pushop.stepsdone:
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	763 return
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	764 b2caps = bundle2.bundle2caps(pushop.remote)
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	765 if not 'pushkey' in b2caps:
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	766 return
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	767 pushop.stepsdone.add('phases')
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	768 part2node = []
25502 bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	769
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	770 def handlefailure(pushop, exc):
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	771 targetid = int(exc.partid)
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	772 for partid, node in part2node:
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	773 if partid == targetid:
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	774 raise error.Abort(_('updating %s to public failed') % node)
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	775
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	776 enc = pushkey.encode
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	777 for newremotehead in pushop.outdatedphases:
25502 bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	778 part = bundler.newpart('pushkey')
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	779 part.addparam('namespace', enc('phases'))
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	780 part.addparam('key', enc(newremotehead.hex()))
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	781 part.addparam('old', enc(str(phases.draft)))
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	782 part.addparam('new', enc(str(phases.public)))
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	783 part2node.append((part.id, newremotehead))
25502 bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	784 pushop.pkfailcb[part.id] = handlefailure
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	785
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	786 def handlereply(op):
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	787 for partid, node in part2node:
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	788 partrep = op.records.getreplies(partid)
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	789 results = partrep['pushkey']
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	790 assert len(results) <= 1
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	791 msg = None
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	792 if not results:
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	793 msg = _('server ignored update of %s to public!\n') % node
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	794 elif not int(results[0]['return']):
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	795 msg = _('updating %s to public failed!\n') % node
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	796 if msg is not None:
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	797 pushop.ui.warn(msg)
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	798 return handlereply
21904 5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	799
22347 7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	800 @b2partsgenerator('obsmarkers')
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	801 def _pushb2obsmarkers(pushop, bundler):
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	802 if 'obsmarkers' in pushop.stepsdone:
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	803 return
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	804 remoteversions = bundle2.obsmarkersversion(bundler.capabilities)
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	805 if obsolete.commonversion(remoteversions) is None:
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	806 return
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	807 pushop.stepsdone.add('obsmarkers')
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	808 if pushop.outobsmarkers:
25118 e632a2429982 obsolete: sort obsmarkers during exchange Pierre-Yves David <pierre-yves.david@fb.com> parents: 24878 diff changeset	809 markers = sorted(pushop.outobsmarkers)
32548 e70d6dbde713 bundle2: move function building obsmarker-part in the bundle2 module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32331 diff changeset	810 bundle2.buildobsmarkerspart(bundler, markers)
22347 7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	811
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	812 @b2partsgenerator('bookmarks')
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	813 def _pushb2bookmarks(pushop, bundler):
25895 c30b739c322f exchange: s/phase/bookmark/ in _pushb2bookmarks() Martin von Zweigbergk <martinvonz@google.com> parents: 25836 diff changeset	814 """handle bookmark push through bundle2"""
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	815 if 'bookmarks' in pushop.stepsdone:
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	816 return
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	817 b2caps = bundle2.bundle2caps(pushop.remote)
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	818 if 'pushkey' not in b2caps:
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	819 return
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	820 pushop.stepsdone.add('bookmarks')
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	821 part2book = []
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	822 enc = pushkey.encode
25501 a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	823
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	824 def handlefailure(pushop, exc):
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	825 targetid = int(exc.partid)
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	826 for partid, book, action in part2book:
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	827 if partid == targetid:
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	828 raise error.Abort(bookmsgmap[action][1].rstrip() % book)
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	829 # we should not be called for part we did not generated
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	830 assert False
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	831
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	832 for book, old, new in pushop.outbookmarks:
25501 a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	833 part = bundler.newpart('pushkey')
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	834 part.addparam('namespace', enc('bookmarks'))
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	835 part.addparam('key', enc(book))
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	836 part.addparam('old', enc(old))
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	837 part.addparam('new', enc(new))
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	838 action = 'update'
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	839 if not old:
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	840 action = 'export'
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	841 elif not new:
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	842 action = 'delete'
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	843 part2book.append((part.id, book, action))
25501 a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	844 pushop.pkfailcb[part.id] = handlefailure
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	845
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	846 def handlereply(op):
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	847 ui = pushop.ui
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	848 for partid, book, action in part2book:
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	849 partrep = op.records.getreplies(partid)
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	850 results = partrep['pushkey']
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	851 assert len(results) <= 1
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	852 if not results:
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	853 pushop.ui.warn(_('server ignored bookmark %s update\n') % book)
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	854 else:
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	855 ret = int(results[0]['return'])
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	856 if ret:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	857 ui.status(bookmsgmap[action][0] % book)
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	858 else:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	859 ui.warn(bookmsgmap[action][1] % book)
22649 1d7a2422b90c push: set bkresult when pushing bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22645 diff changeset	860 if pushop.bkresult is not None:
1d7a2422b90c push: set bkresult when pushing bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22645 diff changeset	861 pushop.bkresult = 1
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	862 return handlereply
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	863
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	864
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	865 def _pushbundle2(pushop):
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	866 """push data to the remote using bundle2
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	867
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	868 The only currently supported type of data is changegroup but this will
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	869 evolve in the future."""
21644 17755dd8c509 bundle2: introduce a bundle2caps function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21643 diff changeset	870 bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
23439 743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	871 pushback = (pushop.trmanager
743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	872 and pushop.ui.configbool('experimental', 'bundle2.pushback'))
743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	873
21142 15039ce3e4a3 bundle2: include client capabilities in the pushed bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21141 diff changeset	874 # create reply capability
23439 743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	875 capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo,
743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	876 allowpushback=pushback))
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	877 bundler.newpart('replycaps', data=capsblob)
21904 5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	878 replyhandlers = []
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	879 for partgenname in b2partsgenorder:
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	880 partgen = b2partsgenmapping[partgenname]
21904 5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	881 ret = partgen(pushop, bundler)
21941 dab31290c7eb bundle2: only use callable return as reply handler Pierre-Yves David <pierre-yves.david@fb.com> parents: 21906 diff changeset	882 if callable(ret):
dab31290c7eb bundle2: only use callable return as reply handler Pierre-Yves David <pierre-yves.david@fb.com> parents: 21906 diff changeset	883 replyhandlers.append(ret)
21904 5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	884 # do not push if nothing to push
21903 48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	885 if bundler.nbparts <= 1:
48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	886 return
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	887 stream = util.chunkbuffer(bundler.getchunks())
21182 08c84fd99aac bundle2: catch UnknownPartError during local push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21181 diff changeset	888 try:
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	889 try:
29659 b8f9cdca8807 exchange: correctly specify url to unbundle (issue5145) Augie Fackler <augie@google.com> parents: 29389 diff changeset	890 reply = pushop.remote.unbundle(
b8f9cdca8807 exchange: correctly specify url to unbundle (issue5145) Augie Fackler <augie@google.com> parents: 29389 diff changeset	891 stream, ['force'], pushop.remote.url())
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	892 except error.BundleValueError as exc:
29389 98e8313dcd9e i18n: translate abort messages liscju <piotr.listkiewicz@gmail.com> parents: 29376 diff changeset	893 raise error.Abort(_('missing support for %s') % exc)
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	894 try:
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	895 trgetter = None
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	896 if pushback:
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	897 trgetter = pushop.trmanager.transaction
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	898 op = bundle2.processbundle(pushop.repo, reply, trgetter)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	899 except error.BundleValueError as exc:
29389 98e8313dcd9e i18n: translate abort messages liscju <piotr.listkiewicz@gmail.com> parents: 29376 diff changeset	900 raise error.Abort(_('missing support for %s') % exc)
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26781 diff changeset	901 except bundle2.AbortFromPart as exc:
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26781 diff changeset	902 pushop.ui.status(_('remote: %s\n') % exc)
30870 4c8dcb491974 bundle2: keep hint close to the primary message when remote abort Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30685 diff changeset	903 if exc.hint is not None:
4c8dcb491974 bundle2: keep hint close to the primary message when remote abort Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30685 diff changeset	904 pushop.ui.status(_('remote: %s\n') % ('(%s)' % exc.hint))
4c8dcb491974 bundle2: keep hint close to the primary message when remote abort Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30685 diff changeset	905 raise error.Abort(_('push failed on remote'))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	906 except error.PushkeyFailed as exc:
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	907 partid = int(exc.partid)
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	908 if partid not in pushop.pkfailcb:
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	909 raise
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	910 pushop.pkfailcb[partid](pushop, exc)
21904 5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	911 for rephand in replyhandlers:
5fbccbcc07ea bundle2-push: introduce a list of part generating functions Pierre-Yves David <pierre-yves.david@fb.com> parents: 21903 diff changeset	912 rephand(op)
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	913
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	914 def _pushchangeset(pushop):
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	915 """Make the actual push of changeset bundle to remote repo"""
21902 7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	916 if 'changesets' in pushop.stepsdone:
7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	917 return
7a7def851ba0 push: use `stepsdone` to control changegroup push through bundle10 or bundle20 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21901 diff changeset	918 pushop.stepsdone.add('changesets')
21903 48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	919 if not _pushcheckoutgoing(pushop):
48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	920 return
28876 79b8f052ee51 localrepo: refactor prepushoutgoinghook to take a pushop Mads Kiilerich <madski@unity3d.com> parents: 28668 diff changeset	921 pushop.repo.prepushoutgoinghooks(pushop)
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	922 outgoing = pushop.outgoing
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	923 unbundle = pushop.remote.capable('unbundle')
32327 df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	924 # TODO: get bundlecaps from remote
df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	925 bundlecaps = None
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	926 # create a changegroup from local
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	927 if pushop.revs is None and not (outgoing.excluded
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	928 or pushop.repo.changelog.filteredrevs):
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	929 # push everything,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	930 # use the fast path, no race possible on push
32327 df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	931 bundler = changegroup.cg1packer(pushop.repo, bundlecaps)
20925 5174c48ed8d8 localrepo: move the _changegroupsubset method in changegroup module Pierre-Yves David <pierre-yves.david@fb.com> parents: 20924 diff changeset	932 cg = changegroup.getsubset(pushop.repo,
5174c48ed8d8 localrepo: move the _changegroupsubset method in changegroup module Pierre-Yves David <pierre-yves.david@fb.com> parents: 20924 diff changeset	933 outgoing,
5174c48ed8d8 localrepo: move the _changegroupsubset method in changegroup module Pierre-Yves David <pierre-yves.david@fb.com> parents: 20924 diff changeset	934 bundler,
5174c48ed8d8 localrepo: move the _changegroupsubset method in changegroup module Pierre-Yves David <pierre-yves.david@fb.com> parents: 20924 diff changeset	935 'push',
5174c48ed8d8 localrepo: move the _changegroupsubset method in changegroup module Pierre-Yves David <pierre-yves.david@fb.com> parents: 20924 diff changeset	936 fastpath=True)
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	937 else:
32327 df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	938 cg = changegroup.getchangegroup(pushop.repo, 'push', outgoing,
df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	939 bundlecaps=bundlecaps)
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	940
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	941 # apply changegroup to remote
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	942 if unbundle:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	943 # local repo finds heads on server, finds out what
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	944 # revs it must push. once revs transferred, if server
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	945 # finds it has different heads (someone else won
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	946 # commit/push race), server aborts.
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	947 if pushop.force:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	948 remoteheads = ['force']
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	949 else:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	950 remoteheads = pushop.remoteheads
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	951 # ssh: return remote's addchangegroup()
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	952 # http: return remote's addchangegroup() or 0 for error
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	953 pushop.cgresult = pushop.remote.unbundle(cg, remoteheads,
21761 b2dc026a9bd2 push: restore contents of HG_URL for hooks (issue4268) Matt Mackall <mpm@selenic.com> parents: 21259 diff changeset	954 pushop.repo.url())
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	955 else:
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	956 # we return an integer indicating remote head count
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	957 # change
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	958 pushop.cgresult = pushop.remote.addchangegroup(cg, 'push',
4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	959 pushop.repo.url())
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	960
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	961 def _pushsyncphase(pushop):
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	962 """synchronise phase information locally and remotely"""
20468 7d0bbb6dd730 push: extract new common set computation from phase synchronisation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20467 diff changeset	963 cheads = pushop.commonheads
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	964 # even when we don't push, exchanging phase data is useful
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	965 remotephases = pushop.remote.listkeys('phases')
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	966 if (pushop.ui.configbool('ui', '_usedassubrepo', False)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	967 and remotephases # server supports phases
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	968 and pushop.cgresult is None # nothing was pushed
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	969 and remotephases.get('publishing', False)):
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	970 # When:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	971 # - this is a subrepo push
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	972 # - and remote support phase
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	973 # - and no changeset was pushed
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	974 # - and remote is publishing
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	975 # We may be in issue 3871 case!
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	976 # We drop the possible phase synchronisation done by
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	977 # courtesy to publish changesets possibly locally draft
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	978 # on the remote.
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	979 remotephases = {'publishing': 'True'}
21012 c827a0028e6f exchange: restore truncated comment Pierre-Yves David <pierre-yves.david@fb.com> parents: 21005 diff changeset	980 if not remotephases: # old server or public only reply from non-publishing
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	981 _localphasemove(pushop, cheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	982 # don't push any phase data as there is nothing to push
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	983 else:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	984 ana = phases.analyzeremotephases(pushop.repo, cheads,
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	985 remotephases)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	986 pheads, droots = ana
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	987 ### Apply remote phase on local
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	988 if remotephases.get('publishing', False):
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	989 _localphasemove(pushop, cheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	990 else: # publish = False
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	991 _localphasemove(pushop, pheads)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	992 _localphasemove(pushop, cheads, phases.draft)
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	993 ### Apply local phase on remote
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	994
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	995 if pushop.cgresult:
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	996 if 'phases' in pushop.stepsdone:
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	997 # phases already pushed though bundle2
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	998 return
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	999 outdated = pushop.outdatedphases
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1000 else:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1001 outdated = pushop.fallbackoutdatedphases
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1002
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	1003 pushop.stepsdone.add('phases')
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	1004
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1005 # filter heads already turned public by the push
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1006 outdated = [c for c in outdated if c.node() not in pheads]
23376 2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1007 # fallback to independent pushkey command
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1008 for newremotehead in outdated:
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1009 r = pushop.remote.pushkey('phases',
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1010 newremotehead.hex(),
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1011 str(phases.draft),
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1012 str(phases.public))
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1013 if not r:
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1014 pushop.ui.warn(_('updating %s to public failed!\n')
2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1015 % newremotehead)
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1016
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1017 def _localphasemove(pushop, nodes, phase=phases.public):
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1018 """move <nodes> to <phase> in the local source repo"""
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	1019 if pushop.trmanager:
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	1020 phases.advanceboundary(pushop.repo,
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	1021 pushop.trmanager.transaction(),
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	1022 phase,
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	1023 nodes)
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1024 else:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1025 # repo is not locked, do not change any phases!
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1026 # Informs the user that phases should have been moved when
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1027 # applicable.
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1028 actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()]
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1029 phasestr = phases.phasenames[phase]
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1030 if actualmoves:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1031 pushop.ui.status(_('cannot lock source repo, skipping '
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1032 'local %s phase update\n') % phasestr)
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1033
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1034 def _pushobsolete(pushop):
20434 e009e59e4566 push: drop now outdated comment Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20433 diff changeset	1035 """utility function to push obsolete markers to a remote"""
22036 f1528ef123f4 push: use stepsdone for obsmarkers push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22035 diff changeset	1036 if 'obsmarkers' in pushop.stepsdone:
f1528ef123f4 push: use stepsdone for obsmarkers push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22035 diff changeset	1037 return
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1038 repo = pushop.repo
6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1039 remote = pushop.remote
22036 f1528ef123f4 push: use stepsdone for obsmarkers push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22035 diff changeset	1040 pushop.stepsdone.add('obsmarkers')
22350 6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	1041 if pushop.outobsmarkers:
25559 521c1a3139c9 push: only say we are trying to push obsmarkers when we actually try Pierre-Yves David <pierre-yves.david@fb.com> parents: 25516 diff changeset	1042 pushop.ui.debug('try to push obsolete markers to remote\n')
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1043 rslts = []
25118 e632a2429982 obsolete: sort obsmarkers during exchange Pierre-Yves David <pierre-yves.david@fb.com> parents: 24878 diff changeset	1044 remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers))
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1045 for key in sorted(remotedata, reverse=True):
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1046 # reverse sort to ensure we end with dump0
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1047 data = remotedata[key]
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1048 rslts.append(remote.pushkey('obsolete', key, '', data))
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1049 if [r for r in rslts if not r]:
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1050 msg = _('failed to push some obsolete markers!\n')
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1051 repo.ui.warn(msg)
1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1052
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1053 def _pushbookmark(pushop):
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	1054 """Update bookmark position on remote"""
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	1055 if pushop.cgresult == 0 or 'bookmarks' in pushop.stepsdone:
22228 a3dc2d385490 pushbookmark: do not attempt to update bookmarks if the push failed (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22227 diff changeset	1056 return
22240 d092f4b68fb6 push: use stepsdone to control bookmark push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22239 diff changeset	1057 pushop.stepsdone.add('bookmarks')
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1058 ui = pushop.ui
bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1059 remote = pushop.remote
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1060
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	1061 for b, old, new in pushop.outbookmarks:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1062 action = 'update'
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1063 if not old:
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1064 action = 'export'
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1065 elif not new:
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1066 action = 'delete'
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	1067 if remote.pushkey('bookmarks', b, old, new):
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1068 ui.status(bookmsgmap[action][0] % b)
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	1069 else:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1070 ui.warn(bookmsgmap[action][1] % b)
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1071 # discovery can have set the value form invalid entry
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1072 if pushop.bkresult is not None:
36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1073 pushop.bkresult = 1
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1074
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1075 class pulloperation(object):
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1076 """A object that represent a single pull operation
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1077
23219 61cd79ac4b99 exchange: swap "push" for "pull" in pulloperation docstring Mike Edgar <adgar@google.com> parents: 23218 diff changeset	1078 It purpose is to carry pull related state and very common operation.
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1079
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1080 A new should be created at the beginning of each pull and discarded
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1081 afterward.
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1082 """
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1083
25446 b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25445 diff changeset	1084 def __init__(self, repo, remote, heads=None, force=False, bookmarks=(),
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1085 remotebookmarks=None, streamclonerequested=None):
20596 004a1744088d exchange: fix docs for pulloperation Siddharth Agarwal <sid0@fb.com> parents: 20489 diff changeset	1086 # repo we pull into
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1087 self.repo = repo
20596 004a1744088d exchange: fix docs for pulloperation Siddharth Agarwal <sid0@fb.com> parents: 20489 diff changeset	1088 # repo we pull from
20473 1516daaca632 pull: move `remote` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20472 diff changeset	1089 self.remote = remote
20474 c9bceafc61be pull: move `heads` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20473 diff changeset	1090 # revision we try to pull (None is "all")
c9bceafc61be pull: move `heads` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20473 diff changeset	1091 self.heads = heads
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1092 # bookmark pulled explicitly
29376 113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258) liscju <piotr.listkiewicz@gmail.com> parents: 29341 diff changeset	1093 self.explicitbookmarks = [repo._bookmarks.expandname(bookmark)
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258) liscju <piotr.listkiewicz@gmail.com> parents: 29341 diff changeset	1094 for bookmark in bookmarks]
20475 b79b405583af pull: move `force` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20474 diff changeset	1095 # do we force pull?
b79b405583af pull: move `force` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20474 diff changeset	1096 self.force = force
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1097 # whether a streaming clone was requested
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1098 self.streamclonerequested = streamclonerequested
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1099 # transaction manager
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1100 self.trmanager = None
20487 f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1101 # set of common changeset between local and remote before pull
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1102 self.common = None
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1103 # set of pulled head
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1104 self.rheads = None
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1105 # list of missing changeset to fetch remotely
20488 76e66654f74e pull: move `fetch` subset into the object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20487 diff changeset	1106 self.fetch = None
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1107 # remote bookmarks data
25446 b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25445 diff changeset	1108 self.remotebookmarks = remotebookmarks
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1109 # result of changegroup pulling (used as return code by pull)
20898 f295b2ac3579 pull: move return code in the pull operation object Pierre-Yves David <pierre-yves.david@fb.com> parents: 20878 diff changeset	1110 self.cgresult = None
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1111 # list of step already done
92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1112 self.stepsdone = set()
26689 2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1113 # Whether we attempted a clone from pre-generated bundles.
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1114 self.clonebundleattempted = False
20487 f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1115
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1116 @util.propertycache
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1117 def pulledsubset(self):
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1118 """heads of the set of changeset target by the pull"""
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1119 # compute target subset
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1120 if self.heads is None:
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1121 # We pulled every thing possible
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1122 # sync on everything common
20878 09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1123 c = set(self.common)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1124 ret = list(self.common)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1125 for n in self.rheads:
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1126 if n not in c:
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1127 ret.append(n)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1128 return ret
20487 f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1129 else:
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1130 # We pulled a specific subset
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1131 # sync on this subset
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1132 return self.heads
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1133
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1134 @util.propertycache
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1135 def canusebundle2(self):
29696 2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	1136 return not _forcebundle1(self)
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1137
eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1138 @util.propertycache
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1139 def remotebundle2caps(self):
9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1140 return bundle2.bundle2caps(self.remote)
9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1141
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1142 def gettransaction(self):
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1143 # deprecated; talk to trmanager directly
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1144 return self.trmanager.transaction()
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1145
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1146 class transactionmanager(object):
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23439 diff changeset	1147 """An object to manage the life cycle of a transaction
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1148
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1149 It creates the transaction on demand and calls the appropriate hooks when
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1150 closing the transaction."""
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1151 def __init__(self, repo, source, url):
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1152 self.repo = repo
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1153 self.source = source
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1154 self.url = url
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1155 self._tr = None
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1156
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1157 def transaction(self):
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1158 """Return an open transaction object, constructing if necessary"""
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1159 if not self._tr:
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1160 trname = '%s\n%s' % (self.source, util.hidepassword(self.url))
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1161 self._tr = self.repo.transaction(trname)
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1162 self._tr.hookargs['source'] = self.source
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1163 self._tr.hookargs['url'] = self.url
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1164 return self._tr
2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1165
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1166 def close(self):
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1167 """close transaction if created"""
2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1168 if self._tr is not None:
23222 6b7e60fb0b38 exchange: use the postclose API on transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23219 diff changeset	1169 self._tr.close()
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1170
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1171 def release(self):
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1172 """release transaction if created"""
2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1173 if self._tr is not None:
2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1174 self._tr.release()
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1175
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1176 def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None,
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1177 streamclonerequested=None):
26440 85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1178 """Fetch repository data from a remote.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1179
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1180 This is the main function used to retrieve data from a remote repository.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1181
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1182 ``repo`` is the local repository to clone into.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1183 ``remote`` is a peer instance.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1184 ``heads`` is an iterable of revisions we want to pull. ``None`` (the
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1185 default) means to pull everything from the remote.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1186 ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1187 default, all remote bookmarks are pulled.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1188 ``opargs`` are additional keyword arguments to pass to ``pulloperation``
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1189 initialization.
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1190 ``streamclonerequested`` is a boolean indicating whether a "streaming
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1191 clone" is requested. A "streaming clone" is essentially a raw file copy
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1192 of revlogs from the server. This only works when the local repository is
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1193 empty. The default value of ``None`` means to respect the server
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1194 configuration for preferring stream clones.
26440 85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1195
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1196 Returns the ``pulloperation`` created for this pull.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1197 """
25445 1457c1f28c92 pull: allow a generic way to pass parameters to the pull operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25444 diff changeset	1198 if opargs is None:
1457c1f28c92 pull: allow a generic way to pass parameters to the pull operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25444 diff changeset	1199 opargs = {}
1457c1f28c92 pull: allow a generic way to pass parameters to the pull operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25444 diff changeset	1200 pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks,
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1201 streamclonerequested=streamclonerequested, **opargs)
20473 1516daaca632 pull: move `remote` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20472 diff changeset	1202 if pullop.remote.local():
1516daaca632 pull: move `remote` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20472 diff changeset	1203 missing = set(pullop.remote.requirements) - pullop.repo.supported
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1204 if missing:
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1205 msg = _("required features are not"
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1206 " supported in the destination:"
6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1207 " %s") % (', '.join(sorted(missing)))
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	1208 raise error.Abort(msg)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1209
30068 a76d5ba7ac43 pull: grab wlock during pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29819 diff changeset	1210 wlock = lock = None
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1211 try:
30068 a76d5ba7ac43 pull: grab wlock during pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29819 diff changeset	1212 wlock = pullop.repo.wlock()
a76d5ba7ac43 pull: grab wlock during pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29819 diff changeset	1213 lock = pullop.repo.lock()
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1214 pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
26462 3b0ec09192ae streamclone: rename and document maybeperformstreamclone() Gregory Szorc <gregory.szorc@gmail.com> parents: 26458 diff changeset	1215 streamclone.maybeperformlegacystreamclone(pullop)
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1216 # This should ideally be in _pullbundle2(). However, it needs to run
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1217 # before discovery to avoid extra work.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1218 _maybeapplyclonebundle(pullop)
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1219 _pulldiscovery(pullop)
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1220 if pullop.canusebundle2:
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1221 _pullbundle2(pullop)
22653 d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1222 _pullchangeset(pullop)
d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1223 _pullphase(pullop)
22655 f48ac29c2a9e pull: retrieve bookmarks before obsmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22654 diff changeset	1224 _pullbookmarks(pullop)
22653 d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1225 _pullobsolete(pullop)
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1226 pullop.trmanager.close()
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1227 finally:
30068 a76d5ba7ac43 pull: grab wlock during pull Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29819 diff changeset	1228 lockmod.release(pullop.trmanager, lock, wlock)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1229
22693 68439b154063 exchange: have `pull` return the pulloperation object Pierre-Yves David <pierre-yves.david@fb.com> parents: 22666 diff changeset	1230 return pullop
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1231
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1232 # list of steps to perform discovery before pull
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1233 pulldiscoveryorder = []
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1234
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1235 # Mapping between step name and function
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1236 #
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1237 # This exists to help extensions wrap steps if necessary
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1238 pulldiscoverymapping = {}
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1239
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1240 def pulldiscovery(stepname):
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1241 """decorator for function performing discovery before pull
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1242
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1243 The function is added to the step -> function mapping and appended to the
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1244 list of steps. Beware that decorated function will be added in order (this
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1245 may matter).
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1246
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1247 You can only use this decorator for a new step, if you want to wrap a step
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1248 from an extension, change the pulldiscovery dictionary directly."""
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1249 def dec(func):
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1250 assert stepname not in pulldiscoverymapping
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1251 pulldiscoverymapping[stepname] = func
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1252 pulldiscoveryorder.append(stepname)
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1253 return func
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1254 return dec
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1255
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1256 def _pulldiscovery(pullop):
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1257 """Run all discovery steps"""
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1258 for stepname in pulldiscoveryorder:
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1259 step = pulldiscoverymapping[stepname]
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1260 step(pullop)
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1261
25369 02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1262 @pulldiscovery('b1:bookmarks')
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1263 def _pullbookmarkbundle1(pullop):
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1264 """fetch bookmark data in bundle1 case
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1265
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1266 If not using bundle2, we have to fetch bookmarks before changeset
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1267 discovery to reduce the chance and impact of race conditions."""
25443 443d3decbdde pull: skip pulling remote bookmarks with bundle1 if a value already exist Pierre-Yves David <pierre-yves.david@fb.com> parents: 25423 diff changeset	1268 if pullop.remotebookmarks is not None:
443d3decbdde pull: skip pulling remote bookmarks with bundle1 if a value already exist Pierre-Yves David <pierre-yves.david@fb.com> parents: 25423 diff changeset	1269 return
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1270 if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps:
25479 f00a63a43c4b bundle2: pull bookmark the old way if no bundle2 listkeys support (issue4701) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25446 diff changeset	1271 # all known bundle2 servers now support listkeys, but lets be nice with
f00a63a43c4b bundle2: pull bookmark the old way if no bundle2 listkeys support (issue4701) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25446 diff changeset	1272 # new implementation.
f00a63a43c4b bundle2: pull bookmark the old way if no bundle2 listkeys support (issue4701) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25446 diff changeset	1273 return
f00a63a43c4b bundle2: pull bookmark the old way if no bundle2 listkeys support (issue4701) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25446 diff changeset	1274 pullop.remotebookmarks = pullop.remote.listkeys('bookmarks')
25369 02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1275
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1276
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1277 @pulldiscovery('changegroup')
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1278 def _pulldiscoverychangegroup(pullop):
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1279 """discovery phase for the pull
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1280
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1281 Current handle changeset discovery only, will change handle all discovery
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1282 at some point."""
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1283 tmp = discovery.findcommonincoming(pullop.repo,
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1284 pullop.remote,
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1285 heads=pullop.heads,
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1286 force=pullop.force)
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1287 common, fetch, rheads = tmp
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1288 nm = pullop.repo.unfiltered().changelog.nodemap
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1289 if fetch and rheads:
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1290 # If a remote heads in filtered locally, lets drop it from the unknown
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1291 # remote heads and put in back in common.
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1292 #
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1293 # This is a hackish solution to catch most of "common but locally
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1294 # hidden situation". We do not performs discovery on unfiltered
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1295 # repository because it end up doing a pathological amount of round
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1296 # trip for w huge amount of changeset we do not care about.
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1297 #
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1298 # If a set of such "common but filtered" changeset exist on the server
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1299 # but are not including a remote heads, we'll not be able to detect it,
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1300 scommon = set(common)
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1301 filteredrheads = []
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1302 for n in rheads:
23975 3b7088a5c64c discovery: properly exclude locally known but filtered heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 23890 diff changeset	1303 if n in nm:
3b7088a5c64c discovery: properly exclude locally known but filtered heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 23890 diff changeset	1304 if n not in scommon:
3b7088a5c64c discovery: properly exclude locally known but filtered heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 23890 diff changeset	1305 common.append(n)
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1306 else:
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1307 filteredrheads.append(n)
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1308 if not filteredrheads:
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1309 fetch = []
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1310 rheads = filteredrheads
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1311 pullop.common = common
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1312 pullop.fetch = fetch
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1313 pullop.rheads = rheads
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1314
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1315 def _pullbundle2(pullop):
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1316 """pull data using bundle2
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1317
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1318 For now, the only supported data are changegroup."""
21645 aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	1319 kwargs = {'bundlecaps': caps20to10(pullop.repo)}
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1320
32297 205bd3936179 bundle2: don't check for whether we can do stream clones Siddharth Agarwal <sid0@fb.com> parents: 32262 diff changeset	1321 # At the moment we don't do stream clones over bundle2. If that is
205bd3936179 bundle2: don't check for whether we can do stream clones Siddharth Agarwal <sid0@fb.com> parents: 32262 diff changeset	1322 # implemented then here's where the check for that will go.
205bd3936179 bundle2: don't check for whether we can do stream clones Siddharth Agarwal <sid0@fb.com> parents: 32262 diff changeset	1323 streaming = False
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1324
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1325 # pulling changegroup
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1326 pullop.stepsdone.add('changegroup')
21259 ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1327
ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1328 kwargs['common'] = pullop.common
ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1329 kwargs['heads'] = pullop.heads or pullop.rheads
22352 dc371d1f0de1 pull: use the "cg" argument when pulling a bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22350 diff changeset	1330 kwargs['cg'] = pullop.fetch
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1331 if 'listkeys' in pullop.remotebundle2caps:
29064 9dc27a334fb1 bundle2: properly request phases during getbundle Mike Hommey <mh@glandium.org> parents: 28883 diff changeset	1332 kwargs['listkeys'] = ['phases']
25444 1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1333 if pullop.remotebookmarks is None:
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1334 # make sure to always includes bookmark data when migrating
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1335 # `hg incoming --bundle` to using this function.
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1336 kwargs['listkeys'].append('bookmarks')
26690 704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1337
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1338 # If this is a full pull / clone and the server supports the clone bundles
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1339 # feature, tell the server whether we attempted a clone bundle. The
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1340 # presence of this flag indicates the client supports clone bundles. This
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1341 # will enable the server to treat clients that support clone bundles
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1342 # differently from those that don't.
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1343 if (pullop.remote.capable('clonebundles')
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1344 and pullop.heads is None and list(pullop.common) == [nullid]):
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1345 kwargs['cbattempted'] = pullop.clonebundleattempted
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1346
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1347 if streaming:
41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1348 pullop.repo.ui.status(_('streaming all changes\n'))
41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1349 elif not pullop.fetch:
21258 71931b789424 exchange: fix bad indentation Pierre-Yves David <pierre-yves.david@fb.com> parents: 21257 diff changeset	1350 pullop.repo.ui.status(_("no changes found\n"))
71931b789424 exchange: fix bad indentation Pierre-Yves David <pierre-yves.david@fb.com> parents: 21257 diff changeset	1351 pullop.cgresult = 0
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1352 else:
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1353 if pullop.heads is None and list(pullop.common) == [nullid]:
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1354 pullop.repo.ui.status(_("requesting all changes\n"))
22953 b1d694d3975e obsolete: add exchange option Durham Goode <durham@fb.com> parents: 22937 diff changeset	1355 if obsolete.isenabled(pullop.repo, obsolete.exchangeopt):
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1356 remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps)
22354 a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22353 diff changeset	1357 if obsolete.commonversion(remoteversions) is not None:
a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22353 diff changeset	1358 kwargs['obsmarkers'] = True
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1359 pullop.stepsdone.add('obsmarkers')
21159 024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1360 _pullbundle2extraprepare(pullop, kwargs)
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1361 bundle = pullop.remote.getbundle('pull', **kwargs)
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1362 try:
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1363 op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction)
30875 d70971a3ae80 getbundle: cleanly handle remote abort during getbundle Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30870 diff changeset	1364 except bundle2.AbortFromPart as exc:
d70971a3ae80 getbundle: cleanly handle remote abort during getbundle Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30870 diff changeset	1365 pullop.repo.ui.status(_('remote: abort: %s\n') % exc)
d70971a3ae80 getbundle: cleanly handle remote abort during getbundle Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30870 diff changeset	1366 raise error.Abort(_('pull failed on remote'), hint=exc.hint)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	1367 except error.BundleValueError as exc:
29389 98e8313dcd9e i18n: translate abort messages liscju <piotr.listkiewicz@gmail.com> parents: 29376 diff changeset	1368 raise error.Abort(_('missing support for %s') % exc)
21259 ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1369
ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1370 if pullop.fetch:
23890 7817059917d0 pullbundle2: extract addchangegroup result combining into its own function Eric Sumner <ericsumner@fb.com> parents: 23848 diff changeset	1371 results = [cg['return'] for cg in op.records['changegroup']]
7817059917d0 pullbundle2: extract addchangegroup result combining into its own function Eric Sumner <ericsumner@fb.com> parents: 23848 diff changeset	1372 pullop.cgresult = changegroup.combineresults(results)
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1373
21658 0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1374 # processing phases change
0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1375 for namespace, value in op.records['listkeys']:
0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1376 if namespace == 'phases':
0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1377 _pullapplyphases(pullop, value)
0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1378
22656 c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1379 # processing bookmark update
c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1380 for namespace, value in op.records['listkeys']:
c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1381 if namespace == 'bookmarks':
c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1382 pullop.remotebookmarks = value
25444 1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1383
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1384 # bookmark data were either already there or pulled in the bundle
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1385 if pullop.remotebookmarks is not None:
1d1fd5d44f57 pull: skip pulling remote bookmarks with bundle2 if a value already exists Pierre-Yves David <pierre-yves.david@fb.com> parents: 25443 diff changeset	1386 _pullbookmarks(pullop)
22656 c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1387
21159 024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1388 def _pullbundle2extraprepare(pullop, kwargs):
024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1389 """hook function so that extensions can extend the getbundle call"""
024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1390 pass
024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1391
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1392 def _pullchangeset(pullop):
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1393 """pull changeset from unbundle into the local repo"""
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1394 # We delay the open of the transaction as late as possible so we
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1395 # don't open transaction for nothing or you break future useful
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1396 # rollback call
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1397 if 'changegroup' in pullop.stepsdone:
22653 d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1398 return
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1399 pullop.stepsdone.add('changegroup')
20899 d62319f91cb7 pull: move the cgresult logic in _pullchangeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 20898 diff changeset	1400 if not pullop.fetch:
23217 2f12ac53b528 exchange: fix indentation in _pullchangeset Mike Edgar <adgar@google.com> parents: 23208 diff changeset	1401 pullop.repo.ui.status(_("no changes found\n"))
2f12ac53b528 exchange: fix indentation in _pullchangeset Mike Edgar <adgar@google.com> parents: 23208 diff changeset	1402 pullop.cgresult = 0
2f12ac53b528 exchange: fix indentation in _pullchangeset Mike Edgar <adgar@google.com> parents: 23208 diff changeset	1403 return
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1404 pullop.gettransaction()
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1405 if pullop.heads is None and list(pullop.common) == [nullid]:
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1406 pullop.repo.ui.status(_("requesting all changes\n"))
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1407 elif pullop.heads is None and pullop.remote.capable('changegroupsubset'):
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1408 # issue1320, avoid a race if remote changed after discovery
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1409 pullop.heads = pullop.rheads
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1410
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1411 if pullop.remote.capable('getbundle'):
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1412 # TODO: get bundlecaps from remote
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1413 cg = pullop.remote.getbundle('pull', common=pullop.common,
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1414 heads=pullop.heads or pullop.rheads)
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1415 elif pullop.heads is None:
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1416 cg = pullop.remote.changegroup(pullop.fetch, 'pull')
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1417 elif not pullop.remote.capable('changegroupsubset'):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	1418 raise error.Abort(_("partial pull cannot be done because "
21554 7bcf4adadd2d exchange: fix indentation level Pierre-Yves David <pierre-yves.david@fb.com> parents: 21259 diff changeset	1419 "other repository doesn't support "
7bcf4adadd2d exchange: fix indentation level Pierre-Yves David <pierre-yves.david@fb.com> parents: 21259 diff changeset	1420 "changegroupsubset."))
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1421 else:
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1422 cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
26700 dbc3d945ba36 exchange: use cg?unpacker.apply() instead of changegroup.addchangegroup() Augie Fackler <augie@google.com> parents: 26690 diff changeset	1423 pullop.cgresult = cg.apply(pullop.repo, 'pull', pullop.remote.url())
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1424
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1425 def _pullphase(pullop):
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1426 # Get remote phases data from remote
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1427 if 'phases' in pullop.stepsdone:
22653 d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1428 return
21654 ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1429 remotephases = pullop.remote.listkeys('phases')
ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1430 _pullapplyphases(pullop, remotephases)
ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1431
ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1432 def _pullapplyphases(pullop, remotephases):
ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1433 """apply phase movement from observed remote state"""
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1434 if 'phases' in pullop.stepsdone:
92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1435 return
92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1436 pullop.stepsdone.add('phases')
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1437 publishing = bool(remotephases.get('publishing', False))
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1438 if remotephases and not publishing:
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30187 diff changeset	1439 # remote is new and non-publishing
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1440 pheads, _dr = phases.analyzeremotephases(pullop.repo,
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1441 pullop.pulledsubset,
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1442 remotephases)
22068 d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1443 dheads = pullop.pulledsubset
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1444 else:
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1445 # Remote is old or publishing all common changesets
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1446 # should be seen as public
22068 d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1447 pheads = pullop.pulledsubset
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1448 dheads = []
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1449 unfi = pullop.repo.unfiltered()
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1450 phase = unfi._phasecache.phase
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1451 rev = unfi.changelog.nodemap.get
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1452 public = phases.public
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1453 draft = phases.draft
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1454
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1455 # exclude changesets already public locally and update the others
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1456 pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public]
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1457 if pheads:
22069 616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	1458 tr = pullop.gettransaction()
616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	1459 phases.advanceboundary(pullop.repo, tr, public, pheads)
22068 d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1460
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1461 # exclude changesets already draft locally and update the others
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1462 dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft]
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	1463 if dheads:
22069 616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	1464 tr = pullop.gettransaction()
616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	1465 phases.advanceboundary(pullop.repo, tr, draft, dheads)
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1466
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1467 def _pullbookmarks(pullop):
02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1468 """process the remote bookmark information to update the local one"""
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1469 if 'bookmarks' in pullop.stepsdone:
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1470 return
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1471 pullop.stepsdone.add('bookmarks')
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1472 repo = pullop.repo
02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1473 remotebookmarks = pullop.remotebookmarks
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	1474 remotebookmarks = bookmod.unhexlifybookmarks(remotebookmarks)
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1475 bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
22658 a8f0d8e4c80a pull: gather explicit bookmark pulls with bookmark updates Pierre-Yves David <pierre-yves.david@fb.com> parents: 22656 diff changeset	1476 pullop.remote.url(),
22666 0f8120c1ecf5 pull: perform bookmark updates in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 22658 diff changeset	1477 pullop.gettransaction,
22658 a8f0d8e4c80a pull: gather explicit bookmark pulls with bookmark updates Pierre-Yves David <pierre-yves.david@fb.com> parents: 22656 diff changeset	1478 explicit=pullop.explicitbookmarks)
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	1479
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	1480 def _pullobsolete(pullop):
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1481 """utility function to pull obsolete markers from a remote
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1482
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1483 The `gettransaction` is function that return the pull transaction, creating
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1484 one if necessary. We return the transaction to inform the calling code that
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1485 a new transaction have been created (when applicable).
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1486
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1487 Exists mostly to allow overriding for experimentation purpose"""
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1488 if 'obsmarkers' in pullop.stepsdone:
22653 d94f5bec9c8e pull: perform the todostep inside functions handling old way of pulling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22651 diff changeset	1489 return
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1490 pullop.stepsdone.add('obsmarkers')
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1491 tr = None
22953 b1d694d3975e obsolete: add exchange option Durham Goode <durham@fb.com> parents: 22937 diff changeset	1492 if obsolete.isenabled(pullop.repo, obsolete.exchangeopt):
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	1493 pullop.repo.ui.debug('fetching remote obsolete markers\n')
80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	1494 remoteobs = pullop.remote.listkeys('obsolete')
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1495 if 'dump0' in remoteobs:
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	1496 tr = pullop.gettransaction()
27558 b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	1497 markers = []
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1498 for key in sorted(remoteobs, reverse=True):
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1499 if key.startswith('dump'):
32245 4462a981e8df base85: proxy through util module Yuya Nishihara <yuya@tcha.org> parents: 32215 diff changeset	1500 data = util.b85decode(remoteobs[key])
27558 b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	1501 version, newmarks = obsolete._readmarkers(data)
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	1502 markers += newmarks
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	1503 if markers:
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	1504 pullop.repo.obsstore.add(tr, markers)
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	1505 pullop.repo.invalidatevolatilesets()
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1506 return tr
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	1507
21645 aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	1508 def caps20to10(repo):
aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	1509 """return a set with appropriate options to use bundle20 during getbundle"""
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32327 diff changeset	1510 caps = {'HG20'}
22342 262c5cc126c1 bundle2: introduce a `getrepocaps` to retrieve the bundle2 caps of a repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 22341 diff changeset	1511 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1512 caps.add('bundle2=' + urlreq.quote(capsblob))
21645 aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	1513 return caps
aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	1514
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1515 # List of names of steps to perform for a bundle2 for getbundle, order matters.
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1516 getbundle2partsorder = []
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1517
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1518 # Mapping between step name and function
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1519 #
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1520 # This exists to help extensions wrap steps if necessary
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1521 getbundle2partsmapping = {}
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1522
24732 8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	1523 def getbundle2partsgenerator(stepname, idx=None):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1524 """decorator for function generating bundle2 part for getbundle
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1525
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1526 The function is added to the step -> function mapping and appended to the
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1527 list of steps. Beware that decorated functions will be added in order
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1528 (this may matter).
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1529
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1530 You can only use this decorator for new steps, if you want to wrap a step
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1531 from an extension, attack the getbundle2partsmapping dictionary directly."""
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1532 def dec(func):
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1533 assert stepname not in getbundle2partsmapping
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1534 getbundle2partsmapping[stepname] = func
24732 8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	1535 if idx is None:
8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	1536 getbundle2partsorder.append(stepname)
8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	1537 else:
8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	1538 getbundle2partsorder.insert(idx, stepname)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1539 return func
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1540 return dec
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1541
27244 709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1542 def bundle2requested(bundlecaps):
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1543 if bundlecaps is not None:
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1544 return any(cap.startswith('HG2') for cap in bundlecaps)
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1545 return False
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1546
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1547 def getbundlechunks(repo, source, heads=None, common=None, bundlecaps=None,
3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1548 **kwargs):
3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1549 """Return chunks constituting a bundle's raw data.
20954 dba91f8060eb bundle2: add an exchange.getbundle function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20933 diff changeset	1550
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	1551 Could be a bundle HG10 or a bundle HG20 depending on bundlecaps
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1552 passed.
20954 dba91f8060eb bundle2: add an exchange.getbundle function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20933 diff changeset	1553
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1554 Returns an iterator over raw chunks (of varying sizes).
20954 dba91f8060eb bundle2: add an exchange.getbundle function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20933 diff changeset	1555 """
27244 709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	1556 usebundle2 = bundle2requested(bundlecaps)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1557 # bundle10 case
24649 2d15c59a001b bundle2: detect bundle2 stream/request on /HG2./ instead of /HG2Y/ Pierre-Yves David <pierre-yves.david@fb.com> parents: 24641 diff changeset	1558 if not usebundle2:
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1559 if bundlecaps and not kwargs.get('cg', True):
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1560 raise ValueError(_('request for bundle10 must include changegroup'))
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1561
21656 36200dc6b3bd getbundle: raise error if extra arguments are provided for bundle10 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21654 diff changeset	1562 if kwargs:
36200dc6b3bd getbundle: raise error if extra arguments are provided for bundle10 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21654 diff changeset	1563 raise ValueError(_('unsupported getbundle arguments: %s')
36200dc6b3bd getbundle: raise error if extra arguments are provided for bundle10 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21654 diff changeset	1564 % ', '.join(sorted(kwargs.keys())))
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	1565 outgoing = _computeoutgoing(repo, heads, common)
32327 df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	1566 bundler = changegroup.getbundler('01', repo, bundlecaps)
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1567 return changegroup.getsubsetraw(repo, outgoing, bundler, source)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1568
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1569 # bundle20 case
21143 5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	1570 b2caps = {}
5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	1571 for bcaps in bundlecaps:
5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	1572 if bcaps.startswith('bundle2='):
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1573 blob = urlreq.unquote(bcaps[len('bundle2='):])
21143 5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	1574 b2caps.update(bundle2.decodecaps(blob))
5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	1575 bundler = bundle2.bundle20(repo.ui, b2caps)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1576
23218 0e78ea8e592a exchange: prepare kwargs for bundle2 part generation exactly once Mike Edgar <adgar@google.com> parents: 23217 diff changeset	1577 kwargs['heads'] = heads
0e78ea8e592a exchange: prepare kwargs for bundle2 part generation exactly once Mike Edgar <adgar@google.com> parents: 23217 diff changeset	1578 kwargs['common'] = common
0e78ea8e592a exchange: prepare kwargs for bundle2 part generation exactly once Mike Edgar <adgar@google.com> parents: 23217 diff changeset	1579
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1580 for name in getbundle2partsorder:
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1581 func = getbundle2partsmapping[name]
22543 6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1582 func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps,
6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1583 **kwargs)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1584
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	1585 return bundler.getchunks()
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1586
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1587 @getbundle2partsgenerator('changegroup')
22543 6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1588 def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1589 b2caps=None, heads=None, common=None, **kwargs):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1590 """add a changegroup part to the requested bundle"""
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1591 cg = None
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1592 if kwargs.get('cg', True):
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1593 # build changegroup bundle here.
28667 e7bf227e33a5 exchange: get rid of "getcgkwargs" variable Martin von Zweigbergk <martinvonz@google.com> parents: 28456 diff changeset	1594 version = '01'
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	1595 cgversions = b2caps.get('changegroup')
25503 1b7853a1f04e getbundle: have a single getchangegroupraw call site Pierre-Yves David <pierre-yves.david@fb.com> parents: 25502 diff changeset	1596 if cgversions: # 3.1 and 3.2 ship with an empty value
27751 a40e2f7fe49d changegroup: hide packermap behind methods Martin von Zweigbergk <martinvonz@google.com> parents: 27738 diff changeset	1597 cgversions = [v for v in cgversions
27953 88609cfa3745 changegroup: fix pulling to treemanifest repo from flat repo (issue5066) Martin von Zweigbergk <martinvonz@google.com> parents: 27938 diff changeset	1598 if v in changegroup.supportedoutgoingversions(repo)]
23179 6bb9533fa8fa getbundle: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23177 diff changeset	1599 if not cgversions:
6bb9533fa8fa getbundle: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23177 diff changeset	1600 raise ValueError(_('no common changegroup version'))
28667 e7bf227e33a5 exchange: get rid of "getcgkwargs" variable Martin von Zweigbergk <martinvonz@google.com> parents: 28456 diff changeset	1601 version = max(cgversions)
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	1602 outgoing = _computeoutgoing(repo, heads, common)
25504 60f4e7022ffe exchange: expand usage of getchangegroupraw Pierre-Yves David <pierre-yves.david@fb.com> parents: 25503 diff changeset	1603 cg = changegroup.getlocalchangegroupraw(repo, source, outgoing,
32327 df3cf9422e1b changegroup: add bundlecaps back Durham Goode <durham@fb.com> parents: 32297 diff changeset	1604 bundlecaps=bundlecaps,
28667 e7bf227e33a5 exchange: get rid of "getcgkwargs" variable Martin von Zweigbergk <martinvonz@google.com> parents: 28456 diff changeset	1605 version=version)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1606
21259 ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1607 if cg:
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	1608 part = bundler.newpart('changegroup', data=cg)
28667 e7bf227e33a5 exchange: get rid of "getcgkwargs" variable Martin von Zweigbergk <martinvonz@google.com> parents: 28456 diff changeset	1609 if cgversions:
23179 6bb9533fa8fa getbundle: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23177 diff changeset	1610 part.addparam('version', version)
25516 1e37bd83dc66 getbundle: add data about the number of changesets bundled Pierre-Yves David <pierre-yves.david@fb.com> parents: 25504 diff changeset	1611 part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False)
27734 5c0fd878779c treemanifests: set bundle2 part parameter indicating treemanifest Martin von Zweigbergk <martinvonz@google.com> parents: 27558 diff changeset	1612 if 'treemanifest' in repo.requirements:
5c0fd878779c treemanifests: set bundle2 part parameter indicating treemanifest Martin von Zweigbergk <martinvonz@google.com> parents: 27558 diff changeset	1613 part.addparam('treemanifest', '1')
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1614
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1615 @getbundle2partsgenerator('listkeys')
22543 6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1616 def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None,
6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1617 b2caps=None, **kwargs):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1618 """add parts containing listkeys namespaces to the requested bundle"""
21657 0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	1619 listkeys = kwargs.get('listkeys', ())
0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	1620 for namespace in listkeys:
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	1621 part = bundler.newpart('listkeys')
21657 0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	1622 part.addparam('namespace', namespace)
0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	1623 keys = repo.listkeys(namespace).items()
0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	1624 part.data = pushkey.encodekeys(keys)
20967 984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1625
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	1626 @getbundle2partsgenerator('obsmarkers')
22543 6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1627 def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None,
6a669d5a62b8 bundle2: remove heads and common arguments to getbundle parts generators Mike Hommey <mh@glandium.org> parents: 22542 diff changeset	1628 b2caps=None, heads=None, **kwargs):
22541 4e1a80c022a4 bundle2: pass b2caps down to functions adding bundle2 parts for getbundle Mike Hommey <mh@glandium.org> parents: 22390 diff changeset	1629 """add an obsolescence markers part to the requested bundle"""
22353 47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1630 if kwargs.get('obsmarkers', False):
47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1631 if heads is None:
47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1632 heads = repo.heads()
47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1633 subset = [c.node() for c in repo.set('::%ln', heads)]
47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1634 markers = repo.obsstore.relevantmarkers(subset)
25118 e632a2429982 obsolete: sort obsmarkers during exchange Pierre-Yves David <pierre-yves.david@fb.com> parents: 24878 diff changeset	1635 markers = sorted(markers)
32548 e70d6dbde713 bundle2: move function building obsmarker-part in the bundle2 module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32331 diff changeset	1636 bundle2.buildobsmarkerspart(bundler, markers)
22353 47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	1637
25402 0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1638 @getbundle2partsgenerator('hgtagsfnodes')
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1639 def _getbundletagsfnodes(bundler, repo, source, bundlecaps=None,
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1640 b2caps=None, heads=None, common=None,
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1641 **kwargs):
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1642 """Transfer the .hgtags filenodes mapping.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1643
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1644 Only values for heads in this bundle will be transferred.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1645
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1646 The part data consists of pairs of 20 byte changeset node and .hgtags
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1647 filenodes raw values.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1648 """
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1649 # Don't send unless:
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1650 # - changeset are being exchanged,
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1651 # - the client supports it.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1652 if not (kwargs.get('cg', True) and 'hgtagsfnodes' in b2caps):
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1653 return
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1654
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	1655 outgoing = _computeoutgoing(repo, heads, common)
32262 6068712cbf03 bundle2: move tagsfnodecache generation in a generic function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32245 diff changeset	1656 bundle2.addparttagsfnodescache(repo, bundler, outgoing)
25402 0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	1657
30492 8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1658 def _getbookmarks(repo, **kwargs):
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1659 """Returns bookmark to node mapping.
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1660
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1661 This function is primarily used to generate `bookmarks` bundle2 part.
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1662 It is a separate function in order to make it easy to wrap it
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1663 in extensions. Passing `kwargs` to the function makes it easy to
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1664 add new parameters in extensions.
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1665 """
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1666
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1667 return dict(bookmod.listbinbookmarks(repo))
8491845a75b2 exchange: add `_getbookmarks()` function Stanislau Hlebik <stash@fb.com> parents: 30449 diff changeset	1668
20967 984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1669 def check_heads(repo, their_heads, context):
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1670 """check if the heads of a repo have been modified
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1671
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1672 Used by peer for unbundling.
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1673 """
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1674 heads = repo.heads()
29341 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29064 diff changeset	1675 heads_hash = hashlib.sha1(''.join(sorted(heads))).digest()
20967 984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1676 if not (their_heads == ['force'] or their_heads == heads or
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1677 their_heads == ['hashed', heads_hash]):
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1678 # someone else committed/pushed/unbundled while we
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	1679 # were transferring data
21184 28d76afa1568 bundle2: fix raising errors during heads checking Pierre-Yves David <pierre-yves.david@fb.com> parents: 21182 diff changeset	1680 raise error.PushRaced('repository changed while %s - '
28d76afa1568 bundle2: fix raising errors during heads checking Pierre-Yves David <pierre-yves.david@fb.com> parents: 21182 diff changeset	1681 'please try again' % context)
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1682
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1683 def unbundle(repo, cg, heads, source, url):
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1684 """Apply a bundle to a repo.
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1685
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1686 this function makes sure the repo is locked during the application and have
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1687 mechanism to check that no push race occurred between the creation of the
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1688 bundle and its application.
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1689
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1690 If the push was raced as PushRaced exception is raised."""
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1691 r = 0
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1692 # need a transaction when processing a bundle2 stream
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1693 # [wlock, lock, tr] - needs to be an array so nested functions can modify it
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1694 lockandtr = [None, None, None]
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1695 recordout = None
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1696 # quick fix for output mismatch with bundle2 in 3.4
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1697 captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture',
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1698 False)
25423 525fbf24b51b bundle2: stop capturing output for ssh again Pierre-Yves David <pierre-yves.david@fb.com> parents: 25404 diff changeset	1699 if url.startswith('remote:http:') or url.startswith('remote:https:'):
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1700 captureoutput = True
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1701 try:
30902 847f06179f60 unbundle: add a small comment to clarify the 'check_heads' call Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30685 diff changeset	1702 # note: outside bundle1, 'heads' is expected to be empty and this
847f06179f60 unbundle: add a small comment to clarify the 'check_heads' call Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30685 diff changeset	1703 # 'check_heads' call wil be a no-op
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1704 check_heads(repo, heads, 'uploading changes')
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1705 # push can proceed
30904 c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	1706 if not util.safehasattr(cg, 'params'):
c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	1707 # legacy case: bundle1 (changegroup 01)
c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	1708 lockandtr[1] = repo.lock()
c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	1709 r = cg.apply(repo, source, url)
c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	1710 else:
24795 f9aa4cb8f2dd bundle2: store the salvaged output on the exception object Pierre-Yves David <pierre-yves.david@fb.com> parents: 24754 diff changeset	1711 r = None
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	1712 try:
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1713 def gettransaction():
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1714 if not lockandtr[2]:
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1715 lockandtr[0] = repo.wlock()
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1716 lockandtr[1] = repo.lock()
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1717 lockandtr[2] = repo.transaction(source)
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1718 lockandtr[2].hookargs['source'] = source
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1719 lockandtr[2].hookargs['url'] = url
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1720 lockandtr[2].hookargs['bundle2'] = '1'
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1721 return lockandtr[2]
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1722
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1723 # Do greedy locking by default until we're satisfied with lazy
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1724 # locking.
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1725 if not repo.ui.configbool('experimental', 'bundle2lazylocking'):
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1726 gettransaction()
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1727
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1728 op = bundle2.bundleoperation(repo, gettransaction,
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1729 captureoutput=captureoutput)
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1730 try:
25896 6805a4f76cda exchange: fix dead assignment Martin von Zweigbergk <martinvonz@google.com> parents: 25895 diff changeset	1731 op = bundle2.processbundle(repo, cg, op=op)
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1732 finally:
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1733 r = op.reply
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1734 if captureoutput and r is not None:
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1735 repo.ui.pushbuffer(error=True, subproc=True)
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1736 def recordout(output):
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	1737 r.newpart('output', data=output, mandatory=False)
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1738 if lockandtr[2] is not None:
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1739 lockandtr[2].close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	1740 except BaseException as exc:
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	1741 exc.duringunbundle2 = True
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24851 diff changeset	1742 if captureoutput and r is not None:
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1743 parts = exc._bundle2salvagedoutput = r.salvageoutput()
b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1744 def recordout(output):
b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1745 part = bundle2.bundlepart('output', data=output,
b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1746 mandatory=False)
b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1747 parts.append(part)
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	1748 raise
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1749 finally:
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	1750 lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0])
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1751 if recordout is not None:
b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	1752 recordout(repo.ui.popbuffer())
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	1753 return r
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1754
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1755 def _maybeapplyclonebundle(pullop):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1756 """Apply a clone bundle from a remote, if possible."""
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1757
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1758 repo = pullop.repo
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1759 remote = pullop.remote
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1760
27738 a0e783d26e81 exchange: make clone bundles non-experimental and enabled by default Gregory Szorc <gregory.szorc@gmail.com> parents: 27737 diff changeset	1761 if not repo.ui.configbool('ui', 'clonebundles', True):
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1762 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1763
26855 9350f00a7b23 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1764 # Only run if local repo is empty.
9350f00a7b23 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1765 if len(repo):
9350f00a7b23 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1766 return
9350f00a7b23 exchange: do not attempt clone bundle if local repo is non-empty (issue4932) Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1767
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1768 if pullop.heads:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1769 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1770
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1771 if not remote.capable('clonebundles'):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1772 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1773
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1774 res = remote._call('clonebundles')
26689 2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1775
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1776 # If we call the wire protocol command, that's good enough to record the
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1777 # attempt.
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1778 pullop.clonebundleattempted = True
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	1779
26647 62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1780 entries = parseclonebundlesmanifest(repo, res)
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1781 if not entries:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1782 repo.ui.note(_('no clone bundles available on remote; '
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1783 'falling back to regular clone\n'))
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1784 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1785
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1786 entries = filterclonebundleentries(repo, entries)
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1787 if not entries:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1788 # There is a thundering herd concern here. However, if a server
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1789 # operator doesn't advertise bundles appropriate for its clients,
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1790 # they deserve what's coming. Furthermore, from a client's
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1791 # perspective, no automatic fallback would mean not being able to
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1792 # clone!
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1793 repo.ui.warn(_('no compatible clone bundles available on server; '
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1794 'falling back to regular clone\n'))
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1795 repo.ui.warn(_('(you may want to report this to the server '
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1796 'operator)\n'))
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1797 return
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1798
26648 c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1799 entries = sortclonebundleentries(repo.ui, entries)
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1800
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1801 url = entries[0]['URL']
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1802 repo.ui.status(_('applying clone bundle from %s\n') % url)
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1803 if trypullbundlefromurl(repo.ui, repo, url):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1804 repo.ui.status(_('finished applying clone bundle\n'))
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1805 # Bundle failed.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1806 #
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1807 # We abort by default to avoid the thundering herd of
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1808 # clients flooding a server that was expecting expensive
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1809 # clone load to be offloaded.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1810 elif repo.ui.configbool('ui', 'clonebundlefallback', False):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1811 repo.ui.warn(_('falling back to normal clone\n'))
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1812 else:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1813 raise error.Abort(_('error applying bundle'),
26688 7394536338bb exchange: provide hint on how to disable clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26687 diff changeset	1814 hint=_('if this error persists, consider contacting '
7394536338bb exchange: provide hint on how to disable clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26687 diff changeset	1815 'the server operator or disable clone '
7394536338bb exchange: provide hint on how to disable clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26687 diff changeset	1816 'bundles via '
27738 a0e783d26e81 exchange: make clone bundles non-experimental and enabled by default Gregory Szorc <gregory.szorc@gmail.com> parents: 27737 diff changeset	1817 '"--config ui.clonebundles=false"'))
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1818
26647 62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1819 def parseclonebundlesmanifest(repo, s):
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1820 """Parses the raw text of a clone bundles manifest.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1821
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1822 Returns a list of dicts. The dicts have a ``URL`` key corresponding
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1823 to the URL and other keys are the attributes for the entry.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1824 """
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1825 m = []
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1826 for line in s.splitlines():
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1827 fields = line.split()
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1828 if not fields:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1829 continue
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1830 attrs = {'URL': fields[0]}
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1831 for rawattr in fields[1:]:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1832 key, value = rawattr.split('=', 1)
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1833 key = urlreq.unquote(key)
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1834 value = urlreq.unquote(value)
26647 62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1835 attrs[key] = value
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1836
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1837 # Parse BUNDLESPEC into components. This makes client-side
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1838 # preferences easier to specify since you can prefer a single
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1839 # component of the BUNDLESPEC.
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1840 if key == 'BUNDLESPEC':
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1841 try:
26759 c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	1842 comp, version, params = parsebundlespec(repo, value,
c0f475ac997e exchange: support parameters in bundle specification strings Gregory Szorc <gregory.szorc@gmail.com> parents: 26756 diff changeset	1843 externalnames=True)
26647 62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1844 attrs['COMPRESSION'] = comp
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1845 attrs['VERSION'] = version
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1846 except error.InvalidBundleSpecification:
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1847 pass
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1848 except error.UnsupportedBundleSpecification:
62b0fa0d8787 exchange: extract bundle specification components into own attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 26646 diff changeset	1849 pass
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1850
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1851 m.append(attrs)
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1852
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1853 return m
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1854
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1855 def filterclonebundleentries(repo, entries):
26687 6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1856 """Remove incompatible clone bundle manifest entries.
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1857
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1858 Accepts a list of entries parsed with ``parseclonebundlesmanifest``
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1859 and returns a new list consisting of only the entries that this client
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1860 should be able to apply.
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1861
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1862 There is no guarantee we'll be able to apply all returned entries because
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1863 the metadata we use to filter on may be missing or wrong.
6a854f558926 exchange: document filterclonebundleentries Gregory Szorc <gregory.szorc@gmail.com> parents: 26672 diff changeset	1864 """
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1865 newentries = []
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1866 for entry in entries:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1867 spec = entry.get('BUNDLESPEC')
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1868 if spec:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1869 try:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1870 parsebundlespec(repo, spec, strict=True)
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1871 except error.InvalidBundleSpecification as e:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1872 repo.ui.debug(str(e) + '\n')
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1873 continue
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1874 except error.UnsupportedBundleSpecification as e:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1875 repo.ui.debug('filtering %s because unsupported bundle '
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1876 'spec: %s\n' % (entry['URL'], str(e)))
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1877 continue
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1878
26645 2faa7671a4b3 clonebundles: filter on SNI requirement Gregory Szorc <gregory.szorc@gmail.com> parents: 26644 diff changeset	1879 if 'REQUIRESNI' in entry and not sslutil.hassni:
2faa7671a4b3 clonebundles: filter on SNI requirement Gregory Szorc <gregory.szorc@gmail.com> parents: 26644 diff changeset	1880 repo.ui.debug('filtering %s because SNI not supported\n' %
2faa7671a4b3 clonebundles: filter on SNI requirement Gregory Szorc <gregory.szorc@gmail.com> parents: 26644 diff changeset	1881 entry['URL'])
2faa7671a4b3 clonebundles: filter on SNI requirement Gregory Szorc <gregory.szorc@gmail.com> parents: 26644 diff changeset	1882 continue
2faa7671a4b3 clonebundles: filter on SNI requirement Gregory Szorc <gregory.szorc@gmail.com> parents: 26644 diff changeset	1883
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1884 newentries.append(entry)
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1885
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1886 return newentries
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	1887
30685 95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1888 class clonebundleentry(object):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1889 """Represents an item in a clone bundles manifest.
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1890
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1891 This rich class is needed to support sorting since sorted() in Python 3
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1892 doesn't support ``cmp`` and our comparison is complex enough that ``key=``
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1893 won't work.
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1894 """
26648 c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1895
30685 95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1896 def __init__(self, value, prefers):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1897 self.value = value
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1898 self.prefers = prefers
26648 c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1899
30685 95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1900 def _cmp(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1901 for prefkey, prefvalue in self.prefers:
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1902 avalue = self.value.get(prefkey)
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1903 bvalue = other.value.get(prefkey)
26648 c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1904
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1905 # Special case for b missing attribute and a matches exactly.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1906 if avalue is not None and bvalue is None and avalue == prefvalue:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1907 return -1
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1908
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1909 # Special case for a missing attribute and b matches exactly.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1910 if bvalue is not None and avalue is None and bvalue == prefvalue:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1911 return 1
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1912
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1913 # We can't compare unless attribute present on both.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1914 if avalue is None or bvalue is None:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1915 continue
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1916
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1917 # Same values should fall back to next attribute.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1918 if avalue == bvalue:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1919 continue
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1920
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1921 # Exact matches come first.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1922 if avalue == prefvalue:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1923 return -1
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1924 if bvalue == prefvalue:
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1925 return 1
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1926
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1927 # Fall back to next attribute.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1928 continue
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1929
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1930 # If we got here we couldn't sort by attributes and prefers. Fall
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1931 # back to index order.
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1932 return 0
c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1933
30685 95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1934 def __lt__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1935 return self._cmp(other) < 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1936
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1937 def __gt__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1938 return self._cmp(other) > 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1939
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1940 def __eq__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1941 return self._cmp(other) == 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1942
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1943 def __le__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1944 return self._cmp(other) <= 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1945
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1946 def __ge__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1947 return self._cmp(other) >= 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1948
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1949 def __ne__(self, other):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1950 return self._cmp(other) != 0
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1951
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1952 def sortclonebundleentries(ui, entries):
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1953 prefers = ui.configlist('ui', 'clonebundleprefers', default=[])
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1954 if not prefers:
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1955 return list(entries)
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1956
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1957 prefers = [p.split('=', 1) for p in prefers]
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1958
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1959 items = sorted(clonebundleentry(v, prefers) for v in entries)
95325386cd1a exchange: use rich class for sorting clone bundle entries Gregory Szorc <gregory.szorc@gmail.com> parents: 30588 diff changeset	1960 return [i.value for i in items]
26648 c347d532bb56 exchange: support sorting URLs by client-side preferences Gregory Szorc <gregory.szorc@gmail.com> parents: 26647 diff changeset	1961
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1962 def trypullbundlefromurl(ui, repo, url):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1963 """Attempt to apply a bundle from a URL."""
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1964 lock = repo.lock()
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1965 try:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1966 tr = repo.transaction('bundleurl')
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1967 try:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1968 try:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1969 fh = urlmod.open(ui, url)
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1970 cg = readbundle(ui, fh, 'stream')
26643 d2e16419d3f4 clonebundle: support bundle2 Gregory Szorc <gregory.szorc@gmail.com> parents: 26640 diff changeset	1971
d2e16419d3f4 clonebundle: support bundle2 Gregory Szorc <gregory.szorc@gmail.com> parents: 26640 diff changeset	1972 if isinstance(cg, bundle2.unbundle20):
d2e16419d3f4 clonebundle: support bundle2 Gregory Szorc <gregory.szorc@gmail.com> parents: 26640 diff changeset	1973 bundle2.processbundle(repo, cg, lambda: tr)
26761 8270ee357dd9 exchange: support streaming clone bundles in clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26760 diff changeset	1974 elif isinstance(cg, streamclone.streamcloneapplier):
8270ee357dd9 exchange: support streaming clone bundles in clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26760 diff changeset	1975 cg.apply(repo)
26643 d2e16419d3f4 clonebundle: support bundle2 Gregory Szorc <gregory.szorc@gmail.com> parents: 26640 diff changeset	1976 else:
26700 dbc3d945ba36 exchange: use cg?unpacker.apply() instead of changegroup.addchangegroup() Augie Fackler <augie@google.com> parents: 26690 diff changeset	1977 cg.apply(repo, 'clonebundles', url)
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1978 tr.close()
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1979 return True
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1980 except urlerr.httperror as e:
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1981 ui.warn(_('HTTP error fetching bundle: %s\n') % str(e))
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	1982 except urlerr.urlerror as e:
26732 69ac9aebbc55 exchange: don't print error codes after clone bundle failure Gregory Szorc <gregory.szorc@gmail.com> parents: 26729 diff changeset	1983 ui.warn(_('error fetching bundle: %s\n') % e.reason[1])
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1984
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1985 return False
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1986 finally:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1987 tr.release()
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1988 finally:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	1989 lock.release()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/exchange.py @ 32548:e70d6dbde713