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

annotate mercurial/exchange.py @ 48591:ad0c6bf6f02e

simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980

author	Martin von Zweigbergk <martinvonz@google.com>
date	Tue, 11 Jan 2022 22:03:55 -0800
parents	28f0092ec89f
children	6000f5b25c9b

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 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46793 diff changeset	3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
20345 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
34329 10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	10 import collections
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	11 import weakref
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,
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	16 nullrev,
27523 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,
45807 74271829ddc0 clonebundles: move a bundle of clone bundle related code to a new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45681 diff changeset	21 bundlecaches,
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	22 changegroup,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	23 discovery,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	24 error,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	25 lock as lockmod,
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35314 diff changeset	26 logexchange,
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	27 narrowspec,
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	28 obsolete,
43426 e513e87b0476 py3: fix sorting of obsolete markers in obsutil (issue6217) Denis Laxalde <denis@laxalde.org> parents: 43278 diff changeset	29 obsutil,
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	30 phases,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	31 pushkey,
32914 e14484e7f562 py3: use pycompat.strkwargs() to convert kwargs keys to str before passing Pulkit Goyal <7895pulkit@gmail.com> parents: 32909 diff changeset	32 pycompat,
45392 77b8588dd84e requirements: introduce new requirements related module Pulkit Goyal <7895pulkit@gmail.com> parents: 45391 diff changeset	33 requirements,
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	34 scmutil,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	35 streamclone,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	36 url as urlmod,
68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	37 util,
40542 440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	38 wireprototypes,
27523 68b9abf1cb82 exchange: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27244 diff changeset	39 )
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43919 diff changeset	40 from .utils import (
a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43919 diff changeset	41 hashutil,
a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43919 diff changeset	42 stringutil,
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	43 urlutil,
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43919 diff changeset	44 )
47237 19d4802cb304 sidedata: add a 'side-data' repository feature and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	45 from .interfaces import repository
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	46
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	47 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	48 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28876 diff changeset	49
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	50 _NARROWACL_SECTION = b'narrowacl'
38829 9b64b73d702b exchange: move disabling of rev-branch-cache bundle part out of narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38615 diff changeset	51
26639 92d67e5729b9 exchange: move bundle specification parsing from cmdutil Gregory Szorc <gregory.szorc@gmail.com> parents: 26623 diff changeset	52
21064 4d9d490d7bbe bundle2: add a ui argument to readbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21063 diff changeset	53 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	54 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	55
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	56 alg = None
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	57 if not fname:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	58 fname = b"stream"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	59 if not header.startswith(b'HG') and header.startswith(b'\0'):
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	60 fh = changegroup.headerlessfixup(fh, header)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	61 header = b"HG10"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	62 alg = b'UN'
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	63 elif vfs:
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	64 fname = vfs.join(fname)
7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	65
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	66 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	67
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	68 if magic != b'HG':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	69 raise error.Abort(_(b'%s: not a Mercurial bundle') % fname)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	70 if version == b'10':
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	71 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	72 alg = changegroup.readexactly(fh, 2)
22390 e2806b8613ca changegroup: rename bundle-related functions and classes Sune Foldager <cryo@cyanite.org> parents: 22354 diff changeset	73 return changegroup.cg1unpacker(fh, alg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	74 elif version.startswith(b'2'):
25640 39f0064a3079 bundle2.getunbundler: rename "header" to "magicstring" Pierre-Yves David <pierre-yves.david@fb.com> parents: 25559 diff changeset	75 return bundle2.getunbundler(ui, fh, magicstring=magic + version)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 elif version == b'S1':
26756 9e272a96f764 exchange: support for streaming clone bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26732 diff changeset	77 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	78 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	79 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	80 _(b'%s: unknown bundle version %s') % (fname, version)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	81 )
21063 7ca4f2049d3b bundle2: move `readbundle` into the `exchange` module Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	82
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	83
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	84 def getbundlespec(ui, fh):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	85 """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	86
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	87 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	88 restored.
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	89 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	90
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	91 def speccompression(alg):
30449 c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	92 try:
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	93 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	94 except KeyError:
c3944ab1443a exchange: obtain compression engines from the registrar Gregory Szorc <gregory.szorc@gmail.com> parents: 30342 diff changeset	95 return None
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	96
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	97 b = readbundle(ui, fh, None)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	98 if isinstance(b, changegroup.cg1unpacker):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	99 alg = b._type
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	100 if alg == b'_truncatedBZ':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	101 alg = b'BZ'
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	102 comp = speccompression(alg)
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	103 if not comp:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	104 raise error.Abort(_(b'unknown compression algorithm: %s') % alg)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	105 return b'%s-v1' % comp
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	106 elif isinstance(b, bundle2.unbundle20):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	107 if b'Compression' in b.params:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	108 comp = speccompression(b.params[b'Compression'])
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	109 if not comp:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	110 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	111 _(b'unknown compression algorithm: %s') % comp
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	112 )
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	113 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 comp = b'none'
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	115
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	116 version = None
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	117 for part in b.iterparts():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	118 if part.type == b'changegroup':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	119 version = part.params[b'version']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	120 if version in (b'01', b'02'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	121 version = b'v2'
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	122 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	123 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	124 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	125 b'changegroup version %s does not have '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	126 b'a known bundlespec'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	127 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	128 % version,
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	129 hint=_(b'try upgrading your Mercurial client'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	130 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	131 elif part.type == b'stream2' and version is None:
37170 a2b350d9f6ae bundlespec: add support for some variants Boris Feld <boris.feld@octobus.net> parents: 37169 diff changeset	132 # A stream2 part requires to be part of a v2 bundle
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	133 requirements = urlreq.unquote(part.params[b'requirements'])
37170 a2b350d9f6ae bundlespec: add support for some variants Boris Feld <boris.feld@octobus.net> parents: 37169 diff changeset	134 splitted = requirements.split()
a2b350d9f6ae bundlespec: add support for some variants Boris Feld <boris.feld@octobus.net> parents: 37169 diff changeset	135 params = bundle2._formatrequirementsparams(splitted)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	136 return b'none-v2;stream=v2;%s' % params
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	137
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	138 if not version:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	139 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	140 _(b'could not identify changegroup version in bundle')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	141 )
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	142
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	143 return b'%s-%s' % (comp, version)
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	144 elif isinstance(b, streamclone.streamcloneapplier):
4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	145 requirements = streamclone.readbundle1header(fh)[2]
37169 6f467adf9f05 bundle: add the possibility to bundle a stream v2 part Boris Feld <boris.feld@octobus.net> parents: 37167 diff changeset	146 formatted = bundle2._formatrequirementsparams(requirements)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	147 return b'none-packed1;%s' % formatted
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	148 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	149 raise error.Abort(_(b'unknown bundle type: %s') % b)
27883 4f4b80b3f2bf exchange: implement function for inferring bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 27751 diff changeset	150
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	151
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	152 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	153 """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	154 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	155
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	156 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	157 the logic.
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	158
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	159 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	160 """
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	161 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	162 if common:
8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	163 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	164 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	165 else:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46977 diff changeset	166 common = [repo.nullid]
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	167 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	168 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	169 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	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	171
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	172 def _checkpublish(pushop):
33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	173 repo = pushop.repo
33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	174 ui = repo.ui
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 behavior = ui.config(b'experimental', b'auto-publish')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	176 if pushop.publish or behavior not in (b'warn', b'confirm', b'abort'):
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	177 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	178 remotephases = listkeys(pushop.remote, b'phases')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	179 if not remotephases.get(b'publishing', False):
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	180 return
33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	181
33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	182 if pushop.revs is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	183 published = repo.filtered(b'served').revs(b'not public()')
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	184 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	185 published = repo.revs(b'::%ln - public()', pushop.revs)
47497 f03e9d30258e exchange: use "served" repo filter to guess what the server will publish Anton Shestakov <av6@dwimlabs.net> parents: 47237 diff changeset	186 # we want to use pushop.revs in the revset even if they themselves are
f03e9d30258e exchange: use "served" repo filter to guess what the server will publish Anton Shestakov <av6@dwimlabs.net> parents: 47237 diff changeset	187 # secret, but we don't want to have anything that the server won't see
f03e9d30258e exchange: use "served" repo filter to guess what the server will publish Anton Shestakov <av6@dwimlabs.net> parents: 47237 diff changeset	188 # in the result of this expression
f03e9d30258e exchange: use "served" repo filter to guess what the server will publish Anton Shestakov <av6@dwimlabs.net> parents: 47237 diff changeset	189 published &= repo.filtered(b'served')
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	190 if published:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	191 if behavior == b'warn':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	192 ui.warn(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	193 _(b'%i changesets about to be published\n') % len(published)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 elif behavior == b'confirm':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	196 if ui.promptchoice(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	197 _(b'push and publish %i changesets (yn)?$$ &Yes $$ &No')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	198 % len(published)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	199 ):
45892 ac362d5a7893 errors: introduce CanceledError and use it in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 45807 diff changeset	200 raise error.CanceledError(_(b'user quit'))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	201 elif behavior == b'abort':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	202 msg = _(b'push would publish %i changesets') % len(published)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	203 hint = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	204 b"use --publish or adjust 'experimental.auto-publish'"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	205 b" config"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	206 )
40801 33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	207 raise error.Abort(msg, hint=hint)
33d30fb1e4ae push: config option to control behavior when pushing to a publishing server Anton Shestakov <av6@dwimlabs.net> parents: 40725 diff changeset	208
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	209
29696 2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	210 def _forcebundle1(op):
2db085d5f5a2 bundle2: rename the _canusebundle2 method to _forcebundle1 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29389 diff changeset	211 """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	212
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	213 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	214 ui = op.repo.ui
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30187 diff changeset	215 # 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	216 # 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	217 # 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	218 # 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	219 #
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	220 # developer config: devel.legacy.exchange
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	221 exchange = ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 forcebundle1 = b'bundle2' not in exchange and b'bundle1' in exchange
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	223 return forcebundle1 or not op.remote.capable(b'bundle2')
24650 b83a8f512a80 exchange: introduce a '_canusebundle2' function Pierre-Yves David <pierre-yves.david@fb.com> parents: 24649 diff changeset	224
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	225
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	226 class pushoperation(object):
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	227 """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	228
28456 d9d51da7a850 pushoperation: fix language issues in docstring Nathan Goldbaum <ngoldbau@illinois.edu> parents: 28182 diff changeset	229 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	230
28456 d9d51da7a850 pushoperation: fix language issues in docstring Nathan Goldbaum <ngoldbau@illinois.edu> parents: 28182 diff changeset	231 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	232 discarded afterward.
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	233 """
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	234
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	235 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	236 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	237 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	238 remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	239 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	240 revs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	241 newbranch=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	242 bookmarks=(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	243 publish=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	244 pushvars=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	245 ):
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	246 # repo we push from
42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	247 self.repo = repo
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	248 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	249 # 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	250 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	251 # force option provided
89f90457979e push: move `force` argument into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20348 diff changeset	252 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	253 # 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	254 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	255 # bookmark explicitly pushed
cd7e17aa6040 push: pass list of bookmark to `exchange.push` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22622 diff changeset	256 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	257 # 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	258 self.newbranch = newbranch
21901 8612c4ab7f54 push: add a ``pushop.stepsdone`` attribute Pierre-Yves David <pierre-yves.david@fb.com> parents: 21899 diff changeset	259 # step already performed
8612c4ab7f54 push: add a ``pushop.stepsdone`` attribute Pierre-Yves David <pierre-yves.david@fb.com> parents: 21899 diff changeset	260 # (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	261 self.stepsdone = set()
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	262 # 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	263 # - 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	264 # - 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	265 # - 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	266 # 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	267 # - 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	268 self.cgresult = None
22624 eef31f9a4c0f push: add `pushoperation.bkresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22623 diff changeset	269 # Boolean value for the bookmark push
eef31f9a4c0f push: add `pushoperation.bkresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22623 diff changeset	270 self.bkresult = None
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	271 # 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	272 self.outgoing = None
32729 16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	273 # all remote topological heads before the push
20462 0031ef5df586 push: move `remoteheads` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20441 diff changeset	274 self.remoteheads = None
32729 16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	275 # Details of the remote branch pre and post push
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	276 #
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	277 # mapping: {'branch': ([remoteheads],
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	278 # [newheads],
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	279 # [unsyncedheads],
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	280 # [discardedheads])}
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	281 # - branch: the branch name
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	282 # - remoteheads: the list of remote heads known locally
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	283 # None if the branch is new
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	284 # - newheads: the new remote heads (known locally) with outgoing pushed
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	285 # - unsyncedheads: the list of remote heads unknown locally.
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	286 # - discardedheads: the list of remote heads made obsolete by the push
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	287 self.pushbranchmap = None
20464 d032417db243 push: move `incoming` into the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20463 diff changeset	288 # 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	289 self.incoming = None
34819 eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	290 # summary of the remote phase situation
eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	291 self.remotephases = None
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	292 # 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	293 self.outdatedphases = None
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	294 # 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	295 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	296 # outgoing obsmarkers
22035 24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	297 self.outobsmarkers = set()
42928 e0bf41b83cef exchange: avoid unnecessary conversion of bookmark nodes to hex (API) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42920 diff changeset	298 # outgoing bookmarks, list of (bm, oldnode \| '', newnode \| '')
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	299 self.outbookmarks = []
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	300 # transaction manager
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23436 diff changeset	301 self.trmanager = None
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	302 # 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	303 # 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	304 self.pkfailcb = {}
33903 800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	305 # an iterable of pushvars or None
800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	306 self.pushvars = pushvars
40725 9b8d1ad851f8 push: add --publish flag to change phase of pushed changesets Anton Shestakov <av6@dwimlabs.net> parents: 40542 diff changeset	307 # publish pushed changesets
9b8d1ad851f8 push: add --publish flag to change phase of pushed changesets Anton Shestakov <av6@dwimlabs.net> parents: 40542 diff changeset	308 self.publish = publish
20346 42df1fe32552 push: introduce a pushoperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20345 diff changeset	309
22014 71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	310 @util.propertycache
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	311 def futureheads(self):
71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	312 """future remote heads if the changeset push succeeds"""
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	313 return self.outgoing.ancestorsof
22014 71083b020b4a push: extract future heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 21989 diff changeset	314
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	315 @util.propertycache
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	316 def fallbackheads(self):
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	317 """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	318 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	319 # 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	320 return self.outgoing.commonheads
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	321 unfi = self.repo.unfiltered()
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	322 # I want cheads = heads(::ancestorsof and ::commonheads)
c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	323 # (ancestorsof is revs with secret changeset filtered out)
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	324 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	325 # This can be expressed as:
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	326 # cheads = ( (ancestorsof and ::commonheads)
c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	327 # + (commonheads and ::ancestorsof))"
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	328 # )
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	329 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	330 # 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	331 # common = (::commonheads)
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	332 # missing = ((commonheads::ancestorsof) - commonheads)
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	333 #
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	334 # We can pick:
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	335 # * ancestorsof part of common (::commonheads)
26184 327d09f0b5d4 exchange: allow fallbackheads to use lazy set behavior Durham Goode <durham@fb.com> parents: 25896 diff changeset	336 common = self.outgoing.common
43610 a49b2e253035 index: use `index.rev` in `exchange.fallbackheads` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43593 diff changeset	337 rev = self.repo.changelog.index.rev
a49b2e253035 index: use `index.rev` in `exchange.fallbackheads` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43593 diff changeset	338 cheads = [node for node in self.revs if rev(node) in common]
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	339 # and
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	340 # * commonheads parents on missing
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	341 revset = unfi.set(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	342 b'%ln and parents(roots(%ln))',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	343 self.outgoing.commonheads,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	344 self.outgoing.missing,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	345 )
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	346 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	347 return cheads
c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	348
22016 7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	349 @property
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	350 def commonheads(self):
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	351 """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	352 if self.cgresult:
22016 7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	353 return self.futureheads
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	354 else:
7d976d71684c push: move common heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22015 diff changeset	355 return self.fallbackheads
22015 c478031deba2 push: extract fallback heads computation into pushop Pierre-Yves David <pierre-yves.david@fb.com> parents: 22014 diff changeset	356
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	357
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	358 # mapping of message used when pushing bookmark
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	359 bookmsgmap = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	360 b'update': (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	361 _(b"updating bookmark %s\n"),
45925 f0626acf007d errors: drop trailing "!" for some errors about bookmarks Martin von Zweigbergk <martinvonz@google.com> parents: 45892 diff changeset	362 _(b'updating bookmark %s failed\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	363 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 b'export': (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	365 _(b"exporting bookmark %s\n"),
45925 f0626acf007d errors: drop trailing "!" for some errors about bookmarks Martin von Zweigbergk <martinvonz@google.com> parents: 45892 diff changeset	366 _(b'exporting bookmark %s failed\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	367 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	368 b'delete': (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	369 _(b"deleting remote bookmark %s\n"),
45925 f0626acf007d errors: drop trailing "!" for some errors about bookmarks Martin von Zweigbergk <martinvonz@google.com> parents: 45892 diff changeset	370 _(b'deleting remote bookmark %s failed\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	371 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	372 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	373
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	374
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	375 def push(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	376 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	377 remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	378 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	379 revs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	380 newbranch=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	381 bookmarks=(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	382 publish=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	383 opargs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	384 ):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	385 """Push outgoing changesets (limited by revs) from a local
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	386 repository to remote. Return an integer:
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	387 - None means nothing to push
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	388 - 0 means HTTP error
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	389 - 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	390 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	391 - other values as described by addchangegroup()
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	392 """
26729 16e69e6b357b exchange: add oparg to push so that extensions can wrap pushop Sean Farley <sean@farley.io> parents: 26700 diff changeset	393 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	394 opargs = {}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	395 pushop = pushoperation(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	396 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	397 remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	398 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	399 revs,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	400 newbranch,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	401 bookmarks,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	402 publish,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	403 **pycompat.strkwargs(opargs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	404 )
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	405 if pushop.remote.local():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	406 missing = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	407 set(pushop.repo.requirements) - pushop.remote.local().supported
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	408 )
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	409 if missing:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	410 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	411 b"required features are not"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	412 b" supported in the destination:"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	413 b" %s"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	414 ) % (b', '.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	415 raise error.Abort(msg)
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	416
20348 d64c904db55a push: move `remote` argument in the push object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20347 diff changeset	417 if not pushop.remote.canpush():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	418 raise error.Abort(_(b"destination does not support push"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	419
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	420 if not pushop.remote.capable(b'unbundle'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	421 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	422 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	423 b'cannot push: destination does not support the '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	424 b'unbundle wire protocol command'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	425 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	426 )
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	427 for category in sorted(bundle2.read_remote_wanted_sidedata(pushop.remote)):
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	428 # Check that a computer is registered for that category for at least
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	429 # one revlog kind.
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	430 for kind, computers in repo._sidedata_computers.items():
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	431 if computers.get(category):
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	432 break
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	433 else:
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	434 raise error.Abort(
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	435 _(
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	436 b'cannot push: required sidedata category not supported'
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	437 b" by this client: '%s'"
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	438 )
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	439 % pycompat.bytestr(category)
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	440 )
33812 20d663a104fb exchange: drop now-unnecessary "local" from lock name variables Martin von Zweigbergk <martinvonz@google.com> parents: 33811 diff changeset	441 # get lock as we might write phase data
20d663a104fb exchange: drop now-unnecessary "local" from lock name variables Martin von Zweigbergk <martinvonz@google.com> parents: 33811 diff changeset	442 wlock = lock = None
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	443 try:
42348 5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	444 # bundle2 push may receive a reply bundle touching bookmarks
5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	445 # requiring the wlock. Take it now to ensure proper ordering.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	446 maypushback = pushop.ui.configbool(b'experimental', b'bundle2.pushback')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	447 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	448 (not _forcebundle1(pushop))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	449 and maypushback
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	450 and not bookmod.bookmarksinstore(repo)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	451 ):
33812 20d663a104fb exchange: drop now-unnecessary "local" from lock name variables Martin von Zweigbergk <martinvonz@google.com> parents: 33811 diff changeset	452 wlock = pushop.repo.wlock()
20d663a104fb exchange: drop now-unnecessary "local" from lock name variables Martin von Zweigbergk <martinvonz@google.com> parents: 33811 diff changeset	453 lock = pushop.repo.lock()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	454 pushop.trmanager = transactionmanager(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	455 pushop.repo, b'push-response', pushop.remote.url()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	456 )
37841 7c05198cd1ca push: continue without locking on lock failure other than EEXIST (issue5882) Yuya Nishihara <yuya@tcha.org> parents: 37768 diff changeset	457 except error.LockUnavailable as err:
20345 8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	458 # source repo cannot be locked.
8567b4ea76ac exchange: extract push function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	459 # 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	460 # synchronisation.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 msg = b'cannot lock source repository: %s\n' % stringutil.forcebytestr(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	462 err
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	463 )
20347 3ec5f833348e push: ease access to current ui object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20346 diff changeset	464 pushop.ui.debug(msg)
33813 5904511fc9f8 exchange: remove need for "locked" variable Martin von Zweigbergk <martinvonz@google.com> parents: 33812 diff changeset	465
41769 1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	466 with wlock or util.nullcontextmanager():
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	467 with lock or util.nullcontextmanager():
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	468 with pushop.trmanager or util.nullcontextmanager():
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	469 pushop.repo.checkpush(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	470 _checkpublish(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	471 _pushdiscovery(pushop)
43919 4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	472 if not pushop.force:
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	473 _checksubrepostate(pushop)
41769 1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	474 if not _forcebundle1(pushop):
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	475 _pushbundle2(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	476 _pushchangeset(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	477 _pushsyncphase(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	478 _pushobsolete(pushop)
1eb2fc21da12 cleanup: prefer nested context managers to \-continuations Augie Fackler <augie@google.com> parents: 41768 diff changeset	479 _pushbookmark(pushop)
33727 fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	480
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	481 if repo.ui.configbool(b'experimental', b'remotenames'):
38615 4d5fb4062f0b remotenames: synchronise remotenames after push also Pulkit Goyal <7895pulkit@gmail.com> parents: 38605 diff changeset	482 logexchange.pullremotenames(repo, remote)
4d5fb4062f0b remotenames: synchronise remotenames after push also Pulkit Goyal <7895pulkit@gmail.com> parents: 38605 diff changeset	483
22616 cda85cfc8252 push: `exchange.push` now returns the `pushoperation` object Pierre-Yves David <pierre-yves.david@fb.com> parents: 22615 diff changeset	484 return pushop
20352 58300f61b139 push: move bookmarks exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20351 diff changeset	485
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	486
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	487 # 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	488 pushdiscoveryorder = []
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	489
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	490 # Mapping between step name and function
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 # 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	493 pushdiscoverymapping = {}
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	494
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	495
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	496 def pushdiscovery(stepname):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	497 """decorator for function performing discovery before push
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 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	500 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	501 may matter).
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	502
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	503 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	504 from an extension, change the pushdiscovery dictionary directly."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	505
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	506 def dec(func):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	507 assert stepname not in pushdiscoverymapping
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	508 pushdiscoverymapping[stepname] = func
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	509 pushdiscoveryorder.append(stepname)
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	510 return func
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	511
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	512 return dec
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	513
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	514
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	515 def _pushdiscovery(pushop):
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	516 """Run all discovery steps"""
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	517 for stepname in pushdiscoveryorder:
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	518 step = pushdiscoverymapping[stepname]
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	519 step(pushop)
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	520
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	521
43919 4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	522 def _checksubrepostate(pushop):
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	523 """Ensure all outgoing referenced subrepo revisions are present locally"""
48578 28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	524
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	525 repo = pushop.repo
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	526
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	527 # If the repository does not use subrepos, skip the expensive
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	528 # manifest checks.
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	529 if not len(repo.file(b'.hgsub')) or not len(repo.file(b'.hgsubstate')):
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	530 return
28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	531
43919 4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	532 for n in pushop.outgoing.missing:
48578 28f0092ec89f exchange: add fast path for subrepo check on push Joerg Sonnenberger <joerg@bec.de> parents: 48561 diff changeset	533 ctx = repo[n]
43919 4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	534
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	535 if b'.hgsub' in ctx.manifest() and b'.hgsubstate' in ctx.files():
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	536 for subpath in sorted(ctx.substate):
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	537 sub = ctx.sub(subpath)
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	538 sub.verify(onpush=True)
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	539
4b7d5d10c45d exchange: ensure all outgoing subrepo references are present before pushing Matt Harbison <matt_harbison@yahoo.com> parents: 43839 diff changeset	540
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	541 @pushdiscovery(b'changeset')
22018 ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	542 def _pushdiscoverychangeset(pushop):
ddb56e7e1b92 push: make discovery extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22017 diff changeset	543 """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	544 fci = discovery.findcommonincoming
35314 483b5dd0f1aa push: restrict common discovery to the pushed set Boris Feld <boris.feld@octobus.net> parents: 35277 diff changeset	545 if pushop.revs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	546 commoninc = fci(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	547 pushop.repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	548 pushop.remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	549 force=pushop.force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	550 ancestorsof=pushop.revs,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	551 )
35314 483b5dd0f1aa push: restrict common discovery to the pushed set Boris Feld <boris.feld@octobus.net> parents: 35277 diff changeset	552 else:
483b5dd0f1aa push: restrict common discovery to the pushed set Boris Feld <boris.feld@octobus.net> parents: 35277 diff changeset	553 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	554 common, inc, remoteheads = commoninc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	555 fco = discovery.findcommonoutgoing
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	556 outgoing = fco(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	557 pushop.repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	558 pushop.remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	559 onlyheads=pushop.revs,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	560 commoninc=commoninc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	561 force=pushop.force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	562 )
20466 233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	563 pushop.outgoing = outgoing
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	564 pushop.remoteheads = remoteheads
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	565 pushop.incoming = inc
233623d58c9a push: move discovery in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20465 diff changeset	566
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	567
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	568 @pushdiscovery(b'phase')
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	569 def _pushdiscoveryphase(pushop):
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	570 """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	571
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	572 (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	573 outgoing = pushop.outgoing
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	574 unfi = pushop.repo.unfiltered()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	575 remotephases = listkeys(pushop.remote, b'phases')
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	576
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	577 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	578 pushop.ui.configbool(b'ui', b'_usedassubrepo')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	579 and remotephases # server supports phases
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	580 and not pushop.outgoing.missing # no changesets to be pushed
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	581 and remotephases.get(b'publishing', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	582 ):
25337 636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	583 # When:
636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	584 # - 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	585 # - 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	586 # - 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	587 # - and remote is publishing
34817 a80142b03552 exchange: fix issue3781 reference in the comment Boris Feld <boris.feld@octobus.net> parents: 34375 diff changeset	588 # We may be in issue 3781 case!
25337 636b1f1b9f8d subrepo: detect issue3781 case earlier so it apply to bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25236 diff changeset	589 # 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	590 # 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	591 # on the remote.
34818 6709b5661d1b phase: simplify the check for issue3781 shortcut in discovery Boris Feld <boris.feld@octobus.net> parents: 34817 diff changeset	592 pushop.outdatedphases = []
6709b5661d1b phase: simplify the check for issue3781 shortcut in discovery Boris Feld <boris.feld@octobus.net> parents: 34817 diff changeset	593 pushop.fallbackoutdatedphases = []
6709b5661d1b phase: simplify the check for issue3781 shortcut in discovery Boris Feld <boris.feld@octobus.net> parents: 34817 diff changeset	594 return
34819 eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	595
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	596 pushop.remotephases = phases.remotephasessummary(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	597 pushop.repo, pushop.fallbackheads, remotephases
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	598 )
34819 eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	599 droots = pushop.remotephases.draftroots
eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	600
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	601 extracond = b''
34819 eb6375651974 phase: gather remote phase information in a summary object Boris Feld <boris.feld@octobus.net> parents: 34818 diff changeset	602 if not pushop.remotephases.publishing:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	603 extracond = b' and public()'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	604 revset = b'heads((%%ln::%%ln) %s)' % extracond
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	605 # 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	606 # 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	607 # 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	608 fallback = list(unfi.set(revset, droots, pushop.fallbackheads))
40725 9b8d1ad851f8 push: add --publish flag to change phase of pushed changesets Anton Shestakov <av6@dwimlabs.net> parents: 40542 diff changeset	609 if not pushop.remotephases.publishing and pushop.publish:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	610 future = list(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	611 unfi.set(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	612 b'%ln and (not public() or %ln::)', pushop.futureheads, droots
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	613 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	614 )
40725 9b8d1ad851f8 push: add --publish flag to change phase of pushed changesets Anton Shestakov <av6@dwimlabs.net> parents: 40542 diff changeset	615 elif not outgoing.missing:
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	616 future = fallback
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	617 else:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	618 # 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	619 #
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23082 diff changeset	620 # 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	621 # issue fixed in xxxxx we have to do it anyway.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	622 fdroots = list(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 unfi.set(b'roots(%ln + %ln::)', outgoing.missing, droots)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	624 )
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	625 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	626 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	627 pushop.outdatedphases = future
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	628 pushop.fallbackoutdatedphases = fallback
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	629
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	630
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	631 @pushdiscovery(b'obsmarker')
22035 24bb01f42e82 push: introduce a discovery step for obsmarker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22034 diff changeset	632 def _pushdiscoveryobsmarkers(pushop):
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	633 if not obsolete.isenabled(pushop.repo, obsolete.exchangeopt):
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	634 return
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	635
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	636 if not pushop.repo.obsstore:
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	637 return
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	638
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	639 if b'obsolete' not in listkeys(pushop.remote, b'namespaces'):
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	640 return
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	641
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	642 repo = pushop.repo
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	643 # very naive computation, that can be quite expensive on big repo.
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	644 # However: evolution is currently slow on them anyway.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	645 nodes = (c.node() for c in repo.set(b'::%ln', pushop.futureheads))
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	646 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	647
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	648
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	649 @pushdiscovery(b'bookmarks')
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	650 def _pushdiscoverybookmarks(pushop):
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	651 ui = pushop.ui
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	652 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	653 remote = pushop.remote
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	654 ui.debug(b"checking for updated bookmarks\n")
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	655 ancestors = ()
0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	656 if pushop.revs:
38605 2834ac06d5a9 py3: fix revnums in bookmark discovery to be consumable more than once Yuya Nishihara <yuya@tcha.org> parents: 37841 diff changeset	657 revnums = pycompat.maplist(repo.changelog.rev, pushop.revs)
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	658 ancestors = repo.changelog.ancestors(revnums, inclusive=True)
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	659
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	660 remotebookmark = bookmod.unhexlifybookmarks(listkeys(remote, b'bookmarks'))
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	661
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	662 explicit = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	663 repo._bookmarks.expandname(bookmark) for bookmark in pushop.bookmarks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	664 }
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	665
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	666 comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark)
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	667 return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)
8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	668
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	669
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	670 def _processcompared(pushop, pushed, explicit, remotebms, comp):
42920 08fce968d00b doc: fix up confusing doc comment Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42830 diff changeset	671 """take decision on bookmarks to push to the remote repo
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	672
42920 08fce968d00b doc: fix up confusing doc comment Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42830 diff changeset	673 Exists to help extensions alter this behavior.
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	674 """
23081 e62c330a044f bookmarks: explicitly track identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23047 diff changeset	675 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	676
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	677 repo = pushop.repo
8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	678
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	679 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	680 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	681 explicit.remove(b)
36944 8fd9b56e8d7c push-discovery: extract the bookmark comparison logic in its own function Boris Feld <boris.feld@octobus.net> parents: 36943 diff changeset	682 if not pushed or repo[scid].rev() in pushed:
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	683 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	684 # search added bookmark
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	685 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	686 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	687 explicit.remove(b)
44406 8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44328 diff changeset	688 if bookmod.isdivergent(b):
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44328 diff changeset	689 pushop.ui.warn(_(b'cannot push divergent bookmark %s!\n') % b)
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44328 diff changeset	690 pushop.bkresult = 2
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44328 diff changeset	691 else:
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44328 diff changeset	692 pushop.outbookmarks.append((b, b'', scid))
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	693 # search for overwritten bookmark
30588 8f8211903b83 bookmarks: make bookmarks.comparebookmarks accept binary nodes (API) Stanislau Hlebik <stash@fb.com> parents: 30587 diff changeset	694 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	695 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	696 explicit.remove(b)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	697 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	698 # search for bookmark to delete
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	699 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	700 if b in explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	701 explicit.remove(b)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	702 # treat as "deleted locally"
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	703 pushop.outbookmarks.append((b, dcid, b''))
23082 0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	704 # 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	705 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	706 if b in explicit:
0fc4686de1d7 exchange: don't report failure from identical bookmarks Gregory Szorc <gregory.szorc@gmail.com> parents: 23081 diff changeset	707 explicit.remove(b)
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	708
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	709 if explicit:
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	710 explicit = sorted(explicit)
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	711 # we should probably list all of them
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	712 pushop.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	713 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	714 b'bookmark %s does not exist on the local '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 b'or remote repository!\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	716 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	717 % explicit[0]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	718 )
22651 b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	719 pushop.bkresult = 2
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	720
b901645a8784 push: gather all bookmark decisions together Pierre-Yves David <pierre-yves.david@fb.com> parents: 22650 diff changeset	721 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	722
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	723
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	724 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	725 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	726 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	727 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	728 # 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	729 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	730 return False
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	731 # 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	732 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	733 # 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	734 # 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	735 if unfi.obsstore:
45194 6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	736 # this message are here for 80 char limit reason
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	737 mso = _(b"push includes obsolete changeset: %s!")
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	738 mspd = _(b"push includes phase-divergent changeset: %s!")
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	739 mscd = _(b"push includes content-divergent changeset: %s!")
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	740 mst = {
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	741 b"orphan": _(b"push includes orphan changeset: %s!"),
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	742 b"phase-divergent": mspd,
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	743 b"content-divergent": mscd,
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	744 }
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	745 # If we are to push if there is at least one
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	746 # obsolete or unstable changeset in missing, at
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	747 # least one of the missinghead will be obsolete or
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	748 # unstable. So checking heads only is ok
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	749 for node in outgoing.ancestorsof:
20465 170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	750 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	751 if ctx.obsolete():
45194 6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	752 raise error.Abort(mso % ctx)
33756 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33752 diff changeset	753 elif ctx.isunstable():
45194 6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	754 # TODO print more than one instability in the abort
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	755 # message
6063c1857d0a exchange: backout changeset c26335fa4225 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45156 diff changeset	756 raise error.Abort(mst[ctx.instabilities()[0]] % ctx)
25836 dede675dc0c1 bookmarks: mark internal-only config option Matt Mackall <mpm@selenic.com> parents: 25668 diff changeset	757
26935 c4a7bbc78c74 exchange: pass pushop to discovery.checkheads Ryan McElroy <rmcelroy@fb.com> parents: 26855 diff changeset	758 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	759 return True
170f71061069 push: move outgoing check logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20464 diff changeset	760
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	761
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	762 # 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	763 b2partsgenorder = []
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	764
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	765 # Mapping between step name and function
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	766 #
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	767 # 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	768 b2partsgenmapping = {}
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	769
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	770
24731 88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	771 def b2partsgenerator(stepname, idx=None):
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	772 """decorator for function generating bundle2 part
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	773
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	774 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	775 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	776 (this may matter).
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	777
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	778 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	779 from an extension, attack the b2partsgenmapping dictionary directly."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	780
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	781 def dec(func):
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	782 assert stepname not in b2partsgenmapping
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	783 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	784 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	785 b2partsgenorder.append(stepname)
88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	786 else:
88a36edefea5 bundle2: add an 'idx' argument to the 'b2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24697 diff changeset	787 b2partsgenorder.insert(idx, stepname)
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	788 return func
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	789
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	790 return dec
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	791
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	792
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	793 def _pushb2ctxcheckheads(pushop, bundler):
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	794 """Generate race condition checking parts
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	795
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26779 diff changeset	796 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	797 """
32729 16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	798 # * 'force' do not check for push race,
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	799 # * if we don't push anything, there are nothing to check.
45144 c93dd9d9f1e6 discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof` Manuel Jacob <me@manueljacob.de> parents: 45117 diff changeset	800 if not pushop.force and pushop.outgoing.ancestorsof:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	801 allowunrelated = b'related' in bundler.capabilities.get(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	802 b'checkheads', ()
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	803 )
33145 78fc540c53e1 pushrace: avoid crash on bare push when using concurrent push mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33055 diff changeset	804 emptyremote = pushop.pushbranchmap is None
78fc540c53e1 pushrace: avoid crash on bare push when using concurrent push mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33055 diff changeset	805 if not allowunrelated or emptyremote:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	806 bundler.newpart(b'check:heads', data=iter(pushop.remoteheads))
32729 16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	807 else:
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	808 affected = set()
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	809 for branch, heads in pycompat.iteritems(pushop.pushbranchmap):
32729 16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	810 remoteheads, newheads, unsyncedheads, discardedheads = heads
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	811 if remoteheads is not None:
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	812 remote = set(remoteheads)
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	813 affected \|= set(discardedheads) & remote
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	814 affected \|= remote - set(newheads)
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	815 if affected:
16ada4cbb1a9 push: add a way to allow concurrent pushes on unrelated heads Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32674 diff changeset	816 data = iter(sorted(affected))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	817 bundler.newpart(b'check:updated-heads', data=data)
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	818
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	819
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	820 def _pushing(pushop):
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	821 """return True if we are pushing anything"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	822 return bool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	823 pushop.outgoing.missing
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	824 or pushop.outdatedphases
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	825 or pushop.outobsmarkers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	826 or pushop.outbookmarks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	827 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	828
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	829
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	830 @b2partsgenerator(b'check-bookmarks')
35268 ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	831 def _pushb2checkbookmarks(pushop, bundler):
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	832 """insert bookmark move checking"""
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	833 if not _pushing(pushop) or pushop.force:
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	834 return
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	835 b2caps = bundle2.bundle2caps(pushop.remote)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	836 hasbookmarkcheck = b'bookmarks' in b2caps
35268 ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	837 if not (pushop.outbookmarks and hasbookmarkcheck):
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	838 return
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	839 data = []
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	840 for book, old, new in pushop.outbookmarks:
ad5f2b923b0d push: include a 'check:bookmarks' part when possible Boris Feld <boris.feld@octobus.net> parents: 35245 diff changeset	841 data.append((book, old))
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46726 diff changeset	842 checkdata = bookmod.binaryencode(pushop.repo, data)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	843 bundler.newpart(b'check:bookmarks', data=checkdata)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	844
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	845
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	846 @b2partsgenerator(b'check-phases')
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	847 def _pushb2checkphases(pushop, bundler):
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	848 """insert phase move checking"""
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	849 if not _pushing(pushop) or pushop.force:
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	850 return
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	851 b2caps = bundle2.bundle2caps(pushop.remote)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	852 hasphaseheads = b'heads' in b2caps.get(b'phases', ())
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	853 if pushop.remotephases is not None and hasphaseheads:
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	854 # check that the remote phase has not changed
45117 b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	855 checks = {p: [] for p in phases.allphases}
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	856 checks[phases.public].extend(pushop.remotephases.publicheads)
aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	857 checks[phases.draft].extend(pushop.remotephases.draftroots)
45117 b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	858 if any(pycompat.itervalues(checks)):
b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	859 for phase in checks:
b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	860 checks[phase].sort()
34821 aa5e7b4a3a01 phase: generate a push-race detection part on push Boris Feld <boris.feld@octobus.net> parents: 34819 diff changeset	861 checkdata = phases.binaryencode(checks)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	862 bundler.newpart(b'check:phases', data=checkdata)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	863
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	864
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	865 @b2partsgenerator(b'changeset')
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	866 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	867 """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	868
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	869 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	870 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	871 if b'changesets' in pushop.stepsdone:
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	872 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	873 pushop.stepsdone.add(b'changesets')
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	874 # 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	875 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	876 return
28876 79b8f052ee51 localrepo: refactor prepushoutgoinghook to take a pushop Mads Kiilerich <madski@unity3d.com> parents: 28668 diff changeset	877 pushop.repo.prepushoutgoinghooks(pushop)
26428 b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	878
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	879 _pushb2ctxcheckheads(pushop, bundler)
b75c4651b186 bundle2: generate check:heads in a independent function Ryan McElroy <rmcelroy@fb.com> parents: 26184 diff changeset	880
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	881 b2caps = bundle2.bundle2caps(pushop.remote)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	882 version = b'01'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	883 cgversions = b2caps.get(b'changegroup')
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	884 if cgversions: # 3.1 and 3.2 ship with an empty value
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	885 cgversions = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	886 v
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	887 for v in cgversions
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	888 if v in changegroup.supportedoutgoingversions(pushop.repo)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	889 ]
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	890 if not cgversions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	891 raise error.Abort(_(b'no common changegroup version'))
23180 116b80d63815 push: send highest changegroup format supported by both side Pierre-Yves David <pierre-yves.david@fb.com> parents: 23179 diff changeset	892 version = max(cgversions)
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	893
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	894 remote_sidedata = bundle2.read_remote_wanted_sidedata(pushop.remote)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	895 cgstream = changegroup.makestream(
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	896 pushop.repo,
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	897 pushop.outgoing,
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	898 version,
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	899 b'push',
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	900 bundlecaps=b2caps,
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	901 remote_sidedata=remote_sidedata,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	902 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	903 cgpart = bundler.newpart(b'changegroup', data=cgstream)
28668 07f1fbf1f758 exchange: make _pushb2ctx() look more like _getbundlechangegrouppart() Martin von Zweigbergk <martinvonz@google.com> parents: 28667 diff changeset	904 if cgversions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	905 cgpart.addparam(b'version', version)
45558 10284ce3d5ed scmutil: introduce function to check whether repo uses treemanifest or not Pulkit Goyal <7895pulkit@gmail.com> parents: 45392 diff changeset	906 if scmutil.istreemanifest(pushop.repo):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	907 cgpart.addparam(b'treemanifest', b'1')
47237 19d4802cb304 sidedata: add a 'side-data' repository feature and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	908 if repository.REPO_FEATURE_SIDE_DATA in pushop.repo.features:
43131 c17a63eb5d4c sidedata: apply basic but tight security around exchange Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	909 cgpart.addparam(b'exp-sidedata', b'1')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	910
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	911 def handlereply(op):
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23082 diff changeset	912 """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	913 cgreplies = op.records.getreplies(cgpart.id)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	914 assert len(cgreplies[b'changegroup']) == 1
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	915 pushop.cgresult = cgreplies[b'changegroup'][0][b'return']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	916
21899 52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	917 return handlereply
52ab44b979f4 bundle2-push: extract changegroup logic in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21898 diff changeset	918
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	919
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	920 @b2partsgenerator(b'phase')
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	921 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	922 """handle phase push through bundle2"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	923 if b'phases' in pushop.stepsdone:
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	924 return
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	925 b2caps = bundle2.bundle2caps(pushop.remote)
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	926 ui = pushop.repo.ui
537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	927
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	928 legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	929 haspushkey = b'pushkey' in b2caps
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	930 hasphaseheads = b'heads' in b2caps.get(b'phases', ())
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	931
537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	932 if hasphaseheads and not legacyphase:
34910 498697fe41f2 exchange: propagate the subfunctions return Boris Feld <boris.feld@octobus.net> parents: 34836 diff changeset	933 return _pushb2phaseheads(pushop, bundler)
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	934 elif haspushkey:
34910 498697fe41f2 exchange: propagate the subfunctions return Boris Feld <boris.feld@octobus.net> parents: 34836 diff changeset	935 return _pushb2phasespushkey(pushop, bundler)
34822 c1e7ce11db9b phase: isolate logic to update remote phrase through bundle2 pushkey Boris Feld <boris.feld@octobus.net> parents: 34821 diff changeset	936
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	937
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	938 def _pushb2phaseheads(pushop, bundler):
537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	939 """push phase information through a bundle2 - binary part"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	940 pushop.stepsdone.add(b'phases')
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	941 if pushop.outdatedphases:
45117 b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	942 updates = {p: [] for p in phases.allphases}
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	943 updates[0].extend(h.node() for h in pushop.outdatedphases)
537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	944 phasedata = phases.binaryencode(updates)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	945 bundler.newpart(b'phase-heads', data=phasedata)
34836 537de0b14030 phase: use a binary phase part to push through bundle2 (BC) Boris Feld <boris.feld@octobus.net> parents: 34822 diff changeset	946
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	947
34822 c1e7ce11db9b phase: isolate logic to update remote phrase through bundle2 pushkey Boris Feld <boris.feld@octobus.net> parents: 34821 diff changeset	948 def _pushb2phasespushkey(pushop, bundler):
c1e7ce11db9b phase: isolate logic to update remote phrase through bundle2 pushkey Boris Feld <boris.feld@octobus.net> parents: 34821 diff changeset	949 """push phase information through a bundle2 - pushkey part"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	950 pushop.stepsdone.add(b'phases')
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	951 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	952
bd41c19383db phases: abort the whole push if phases fail to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25501 diff changeset	953 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	954 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	955 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	956 if partid == targetid:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	957 raise error.Abort(_(b'updating %s to public failed') % node)
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	958
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	959 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	960 for newremotehead in pushop.outdatedphases:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	961 part = bundler.newpart(b'pushkey')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	962 part.addparam(b'namespace', enc(b'phases'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	963 part.addparam(b'key', enc(newremotehead.hex()))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	964 part.addparam(b'old', enc(b'%d' % phases.draft))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	965 part.addparam(b'new', enc(b'%d' % phases.public))
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	966 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	967 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	968
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	969 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	970 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	971 partrep = op.records.getreplies(partid)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	972 results = partrep[b'pushkey']
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	973 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	974 msg = None
311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	975 if not results:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	976 msg = _(b'server ignored update of %s to public!\n') % node
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	977 elif not int(results[0][b'return']):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	978 msg = _(b'updating %s to public failed!\n') % node
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	979 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	980 pushop.ui.warn(msg)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	981
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	982 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	983
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	984
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	985 @b2partsgenerator(b'obsmarkers')
22347 7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	986 def _pushb2obsmarkers(pushop, bundler):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	987 if b'obsmarkers' in pushop.stepsdone:
22347 7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	988 return
7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	989 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	990 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	991 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	992 pushop.stepsdone.add(b'obsmarkers')
22347 7198cb9b56b9 push: use bundle2 to push obsmarkers when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22346 diff changeset	993 if pushop.outobsmarkers:
43426 e513e87b0476 py3: fix sorting of obsolete markers in obsutil (issue6217) Denis Laxalde <denis@laxalde.org> parents: 43278 diff changeset	994 markers = obsutil.sortedmarkers(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	995 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	996
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	997
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	998 @b2partsgenerator(b'bookmarks')
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	999 def _pushb2bookmarks(pushop, bundler):
25895 c30b739c322f exchange: s/phase/bookmark/ in _pushb2bookmarks() Martin von Zweigbergk <martinvonz@google.com> parents: 25836 diff changeset	1000 """handle bookmark push through bundle2"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1001 if b'bookmarks' in pushop.stepsdone:
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1002 return
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1003 b2caps = bundle2.bundle2caps(pushop.remote)
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1004
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1005 legacy = pushop.repo.ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1006 legacybooks = b'bookmarks' in legacy
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1007
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1008 if not legacybooks and b'bookmarks' in b2caps:
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1009 return _pushb2bookmarkspart(pushop, bundler)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1010 elif b'pushkey' in b2caps:
35271 3fd5f05a5b87 push: move bundle2-pushkey based bookmarks exchange in its own function Boris Feld <boris.feld@octobus.net> parents: 35268 diff changeset	1011 return _pushb2bookmarkspushkey(pushop, bundler)
3fd5f05a5b87 push: move bundle2-pushkey based bookmarks exchange in its own function Boris Feld <boris.feld@octobus.net> parents: 35268 diff changeset	1012
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1013
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1014 def _bmaction(old, new):
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1015 """small utility for bookmark pushing"""
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1016 if not old:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1017 return b'export'
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1018 elif not new:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1019 return b'delete'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1020 return b'update'
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1021
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1022
42670 3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1023 def _abortonsecretctx(pushop, node, b):
3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1024 """abort if a given bookmark points to a secret changeset"""
3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1025 if node and pushop.repo[node].phase() == phases.secret:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1026 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1027 _(b'cannot push bookmark %s as it points to a secret changeset') % b
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1028 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1029
42670 3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1030
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1031 def _pushb2bookmarkspart(pushop, bundler):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1032 pushop.stepsdone.add(b'bookmarks')
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1033 if not pushop.outbookmarks:
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1034 return
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1035
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1036 allactions = []
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1037 data = []
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1038 for book, old, new in pushop.outbookmarks:
42670 3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1039 _abortonsecretctx(pushop, new, book)
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1040 data.append((book, new))
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1041 allactions.append((book, _bmaction(old, new)))
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46726 diff changeset	1042 checkdata = bookmod.binaryencode(pushop.repo, data)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1043 bundler.newpart(b'bookmarks', data=checkdata)
35273 a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1044
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1045 def handlereply(op):
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1046 ui = pushop.ui
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1047 # if success
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1048 for book, action in allactions:
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1049 ui.status(bookmsgmap[action][0] % book)
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1050
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1051 return handlereply
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) Boris Feld <boris.feld@octobus.net> parents: 35271 diff changeset	1052
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1053
35271 3fd5f05a5b87 push: move bundle2-pushkey based bookmarks exchange in its own function Boris Feld <boris.feld@octobus.net> parents: 35268 diff changeset	1054 def _pushb2bookmarkspushkey(pushop, bundler):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1055 pushop.stepsdone.add(b'bookmarks')
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1056 part2book = []
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1057 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	1058
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	1059 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	1060 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	1061 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	1062 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	1063 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	1064 # 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	1065 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	1066
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1067 for book, old, new in pushop.outbookmarks:
42670 3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42348 diff changeset	1068 _abortonsecretctx(pushop, new, book)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1069 part = bundler.newpart(b'pushkey')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1070 part.addparam(b'namespace', enc(b'bookmarks'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1071 part.addparam(b'key', enc(book))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1072 part.addparam(b'old', enc(hex(old)))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1073 part.addparam(b'new', enc(hex(new)))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1074 action = b'update'
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1075 if not old:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1076 action = b'export'
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1077 elif not new:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1078 action = b'delete'
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1079 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	1080 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	1081
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1082 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	1083 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	1084 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	1085 partrep = op.records.getreplies(partid)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1086 results = partrep[b'pushkey']
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1087 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	1088 if not results:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1089 pushop.ui.warn(_(b'server ignored bookmark %s update\n') % book)
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1090 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1091 ret = int(results[0][b'return'])
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1092 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	1093 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	1094 else:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1095 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	1096 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	1097 pushop.bkresult = 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1098
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1099 return handlereply
ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1100
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1101
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1102 @b2partsgenerator(b'pushvars', idx=0)
33719 db3dc11356ed pushvars: move fb extension pushvars to core Pulkit Goyal <7895pulkit@gmail.com> parents: 33715 diff changeset	1103 def _getbundlesendvars(pushop, bundler):
db3dc11356ed pushvars: move fb extension pushvars to core Pulkit Goyal <7895pulkit@gmail.com> parents: 33715 diff changeset	1104 '''send shellvars via bundle2'''
33903 800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1105 pushvars = pushop.pushvars
800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1106 if pushvars:
800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1107 shellvars = {}
800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1108 for raw in pushvars:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1109 if b'=' not in raw:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1110 msg = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1111 b"unable to parse variable '%s', should follow "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1112 b"'KEY=VALUE' or 'KEY=' format"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1113 )
33903 800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1114 raise error.Abort(msg % raw)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1115 k, v = raw.split(b'=', 1)
33903 800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1116 shellvars[k] = v
800bb35d891e pushvars: do not mangle repo state Jun Wu <quark@fb.com> parents: 33815 diff changeset	1117
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1118 part = bundler.newpart(b'pushvars')
33719 db3dc11356ed pushvars: move fb extension pushvars to core Pulkit Goyal <7895pulkit@gmail.com> parents: 33715 diff changeset	1119
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	1120 for key, value in pycompat.iteritems(shellvars):
33719 db3dc11356ed pushvars: move fb extension pushvars to core Pulkit Goyal <7895pulkit@gmail.com> parents: 33715 diff changeset	1121 part.addparam(key, value, mandatory=False)
22242 ed222ebd61be push: add bookmarks to the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22240 diff changeset	1122
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1123
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1124 def _pushbundle2(pushop):
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1125 """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	1126
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1127 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	1128 evolve in the future."""
21644 17755dd8c509 bundle2: introduce a bundle2caps function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21643 diff changeset	1129 bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1130 pushback = pushop.trmanager and pushop.ui.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1131 b'experimental', b'bundle2.pushback'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1132 )
23439 743736fc7c41 bundle2-push: provide transaction to reply unbundler Eric Sumner <ericsumner@fb.com> parents: 23437 diff changeset	1133
21142 15039ce3e4a3 bundle2: include client capabilities in the pushed bundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21141 diff changeset	1134 # create reply capability
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1135 capsblob = bundle2.encodecaps(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1136 bundle2.getrepocaps(pushop.repo, allowpushback=pushback, role=b'client')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1137 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1138 bundler.newpart(b'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	1139 replyhandlers = []
22017 7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	1140 for partgenname in b2partsgenorder:
7986e99bb69a push: rework the bundle2partsgenerators logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 22016 diff changeset	1141 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	1142 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	1143 if callable(ret):
dab31290c7eb bundle2: only use callable return as reply handler Pierre-Yves David <pierre-yves.david@fb.com> parents: 21906 diff changeset	1144 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	1145 # 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	1146 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	1147 return
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1148 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	1149 try:
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1150 try:
37646 72e26319f3b8 wireproto: use command executor for unbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37635 diff changeset	1151 with pushop.remote.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1152 reply = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1153 b'unbundle',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1154 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1155 b'bundle': stream,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1156 b'heads': [b'force'],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1157 b'url': pushop.remote.url(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1158 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1159 ).result()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	1160 except error.BundleValueError as exc:
46977 3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py Martin von Zweigbergk <martinvonz@google.com> parents: 46907 diff changeset	1161 raise error.RemoteError(_(b'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	1162 try:
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1163 trgetter = None
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1164 if pushback:
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1165 trgetter = pushop.trmanager.transaction
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1166 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	1167 except error.BundleValueError as exc:
46977 3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py Martin von Zweigbergk <martinvonz@google.com> parents: 46907 diff changeset	1168 raise error.RemoteError(_(b'missing support for %s') % exc)
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26781 diff changeset	1169 except bundle2.AbortFromPart as exc:
46537 db9e33beb0fb bundle2: print "error:abort" message to stderr instead of stdout Martin von Zweigbergk <martinvonz@google.com> parents: 45957 diff changeset	1170 pushop.ui.error(_(b'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	1171 if exc.hint is not None:
46537 db9e33beb0fb bundle2: print "error:abort" message to stderr instead of stdout Martin von Zweigbergk <martinvonz@google.com> parents: 45957 diff changeset	1172 pushop.ui.error(_(b'remote: %s\n') % (b'(%s)' % exc.hint))
46977 3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py Martin von Zweigbergk <martinvonz@google.com> parents: 46907 diff changeset	1173 raise error.RemoteError(_(b'push failed on remote'))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	1174 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	1175 partid = int(exc.partid)
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1176 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	1177 raise
8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25480 diff changeset	1178 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	1179 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	1180 rephand(op)
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	1181
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1182
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1183 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	1184 """Make the actual push of changeset bundle to remote repo"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1185 if b'changesets' in pushop.stepsdone:
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	1186 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1187 pushop.stepsdone.add(b'changesets')
21903 48f61cfb7576 bundle2-push: move changegroup push validation inside _pushb2ctx Pierre-Yves David <pierre-yves.david@fb.com> parents: 21902 diff changeset	1188 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	1189 return
33727 fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1190
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1191 # Should have verified this in push().
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1192 assert pushop.remote.capable(b'unbundle')
33727 fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1193
28876 79b8f052ee51 localrepo: refactor prepushoutgoinghook to take a pushop Mads Kiilerich <madski@unity3d.com> parents: 28668 diff changeset	1194 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	1195 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	1196 # TODO: get bundlecaps from remote
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1197 bundlecaps = None
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1198 # create a changegroup from local
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1199 if pushop.revs is None and not (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1200 outgoing.excluded or pushop.repo.changelog.filteredrevs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1201 ):
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1202 # push everything,
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1203 # use the fast path, no race possible on push
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1204 cg = changegroup.makechangegroup(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1205 pushop.repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1206 outgoing,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1207 b'01',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1208 b'push',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1209 fastpath=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1210 bundlecaps=bundlecaps,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1211 )
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1212 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1213 cg = changegroup.makechangegroup(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1214 pushop.repo, outgoing, b'01', b'push', bundlecaps=bundlecaps
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1215 )
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1216
f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1217 # apply changegroup to remote
33727 fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1218 # local repo finds heads on server, finds out what
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1219 # revs it must push. once revs transferred, if server
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1220 # finds it has different heads (someone else won
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1221 # commit/push race), server aborts.
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1222 if pushop.force:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1223 remoteheads = [b'force']
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1224 else:
33727 fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1225 remoteheads = pushop.remoteheads
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1226 # ssh: return remote's addchangegroup()
fda0867cfe03 exchange: drop support for lock-based unbundling (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33719 diff changeset	1227 # http: return remote's addchangegroup() or 0 for error
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1228 pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, pushop.repo.url())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1229
20463 f1b532a310e4 push: move changeset push logic in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20462 diff changeset	1230
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1231 def _pushsyncphase(pushop):
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1232 """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	1233 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	1234 # even when we don't push, exchanging phase data is useful
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1235 remotephases = listkeys(pushop.remote, b'phases')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1236 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1237 pushop.ui.configbool(b'ui', b'_usedassubrepo')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1238 and remotephases # server supports phases
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1239 and pushop.cgresult is None # nothing was pushed
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1240 and remotephases.get(b'publishing', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1241 ):
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1242 # When:
eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1243 # - 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	1244 # - 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	1245 # - 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	1246 # - 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	1247 # 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	1248 # 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	1249 # 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	1250 # on the remote.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1251 remotephases = {b'publishing': b'True'}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1252 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	1253 _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	1254 # 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	1255 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1256 ana = phases.analyzeremotephases(pushop.repo, cheads, remotephases)
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1257 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	1258 ### Apply remote phase on local
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1259 if remotephases.get(b'publishing', False):
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1260 _localphasemove(pushop, cheads)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1261 else: # publish = False
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1262 _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	1263 _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	1264 ### 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	1265
22615 4f14303e8954 push: rename `pushop.ret` to `pushop.cgresult` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22543 diff changeset	1266 if pushop.cgresult:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1267 if b'phases' in pushop.stepsdone:
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	1268 # 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	1269 return
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1270 outdated = pushop.outdatedphases
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1271 else:
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1272 outdated = pushop.fallbackoutdatedphases
9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1273
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1274 pushop.stepsdone.add(b'phases')
22020 311979b773fb push: include phase push in the unified bundle2 push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22019 diff changeset	1275
22019 9fcf772f15ff push: perform phases discovery before the push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22018 diff changeset	1276 # 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	1277 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	1278 # 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	1279 for newremotehead in outdated:
37647 516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1280 with pushop.remote.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1281 r = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1282 b'pushkey',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1283 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1284 b'namespace': b'phases',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1285 b'key': newremotehead.hex(),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1286 b'old': b'%d' % phases.draft,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1287 b'new': b'%d' % phases.public,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1288 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1289 ).result()
37647 516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1290
23376 2e65da5f80df push: stop independent usage of bundle2 in syncphase (issue4454) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23082 diff changeset	1291 if not r:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1292 pushop.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1293 _(b'updating %s to public failed!\n') % newremotehead
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1294 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1295
20441 eca9d5375606 push: move phases synchronisation function in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20440 diff changeset	1296
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1297 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	1298 """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	1299 if pushop.trmanager:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1300 phases.advanceboundary(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1301 pushop.repo, pushop.trmanager.transaction(), phase, nodes
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1302 )
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1303 else:
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1304 # 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	1305 # 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	1306 # applicable.
2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1307 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	1308 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	1309 if actualmoves:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1310 pushop.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1311 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1312 b'cannot lock source repo, skipping '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1313 b'local %s phase update\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1314 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1315 % phasestr
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1316 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1317
20438 2b5ab0d11327 push: move local phase move in a normal function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20437 diff changeset	1318
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1319 def _pushobsolete(pushop):
20434 e009e59e4566 push: drop now outdated comment Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20433 diff changeset	1320 """utility function to push obsolete markers to a remote"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1321 if b'obsmarkers' in pushop.stepsdone:
22036 f1528ef123f4 push: use stepsdone for obsmarkers push Pierre-Yves David <pierre-yves.david@fb.com> parents: 22035 diff changeset	1322 return
20433 6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1323 repo = pushop.repo
6af248474224 push: feed pushoperation object to _pushobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20432 diff changeset	1324 remote = pushop.remote
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1325 pushop.stepsdone.add(b'obsmarkers')
22350 6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	1326 if pushop.outobsmarkers:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1327 pushop.ui.debug(b'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	1328 rslts = []
43426 e513e87b0476 py3: fix sorting of obsolete markers in obsutil (issue6217) Denis Laxalde <denis@laxalde.org> parents: 43278 diff changeset	1329 markers = obsutil.sortedmarkers(pushop.outobsmarkers)
43278 2c70dd03b743 py3: fix sorting of obsolete markers during push Denis Laxalde <denis.laxalde@logilab.fr> parents: 43277 diff changeset	1330 remotedata = obsolete._pushkeyescape(markers)
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1331 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	1332 # 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	1333 data = remotedata[key]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1334 rslts.append(remote.pushkey(b'obsolete', key, b'', data))
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1335 if [r for r in rslts if not r]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1336 msg = _(b'failed to push some obsolete markers!\n')
20432 1b926f0bbf8a push: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20431 diff changeset	1337 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	1338
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1339
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1340 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	1341 """Update bookmark position on remote"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1342 if pushop.cgresult == 0 or b'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	1343 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1344 pushop.stepsdone.add(b'bookmarks')
20431 bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1345 ui = pushop.ui
bebf8b8479f3 push: feed pushoperation object to _pushbookmark function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20352 diff changeset	1346 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	1347
22239 0688010ee38f push: move bookmark discovery with other discovery steps Pierre-Yves David <pierre-yves.david@fb.com> parents: 22238 diff changeset	1348 for b, old, new in pushop.outbookmarks:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1349 action = b'update'
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1350 if not old:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1351 action = b'export'
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1352 elif not new:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1353 action = b'delete'
37647 516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1354
516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1355 with remote.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1356 r = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1357 b'pushkey',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1358 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1359 b'namespace': b'bookmarks',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1360 b'key': b,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1361 b'old': hex(old),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1362 b'new': hex(new),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1363 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1364 ).result()
37647 516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1365
516b5a5edae3 exchange: use command executor for pushkey Gregory Szorc <gregory.szorc@gmail.com> parents: 37646 diff changeset	1366 if r:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1367 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	1368 else:
22650 36952c91e6c3 push: prepare the issue of multiple kinds of messages Pierre-Yves David <pierre-yves.david@fb.com> parents: 22649 diff changeset	1369 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	1370 # 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	1371 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	1372 pushop.bkresult = 1
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1373
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1374
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1375 class pulloperation(object):
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1376 """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	1377
23219 61cd79ac4b99 exchange: swap "push" for "pull" in pulloperation docstring Mike Edgar <adgar@google.com> parents: 23218 diff changeset	1378 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	1379
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1380 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	1381 afterward.
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1382 """
b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1383
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1384 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1385 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1386 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1387 remote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1388 heads=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1389 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1390 bookmarks=(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1391 remotebookmarks=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1392 streamclonerequested=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1393 includepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1394 excludepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1395 depth=None,
48292 aad84024660f pull: make the new argument a keyword argument Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48254 diff changeset	1396 path=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1397 ):
20596 004a1744088d exchange: fix docs for pulloperation Siddharth Agarwal <sid0@fb.com> parents: 20489 diff changeset	1398 # repo we pull into
20472 b97a453b8c27 pull: introduce a pulloperation object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20469 diff changeset	1399 self.repo = repo
20596 004a1744088d exchange: fix docs for pulloperation Siddharth Agarwal <sid0@fb.com> parents: 20489 diff changeset	1400 # 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	1401 self.remote = remote
48253 7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1402 # path object used to build this remote
7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1403 #
7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1404 # Ideally, the remote peer would carry that directly.
7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1405 self.remote_path = path
20474 c9bceafc61be pull: move `heads` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20473 diff changeset	1406 # 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	1407 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	1408 # bookmark pulled explicitly
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1409 self.explicitbookmarks = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1410 repo._bookmarks.expandname(bookmark) for bookmark in bookmarks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1411 ]
20475 b79b405583af pull: move `force` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20474 diff changeset	1412 # do we force pull?
b79b405583af pull: move `force` argument into pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20474 diff changeset	1413 self.force = force
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1414 # whether a streaming clone was requested
e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1415 self.streamclonerequested = streamclonerequested
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1416 # transaction manager
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1417 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	1418 # 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	1419 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	1420 # 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	1421 self.rheads = None
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1422 # 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	1423 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	1424 # 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	1425 self.remotebookmarks = remotebookmarks
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 21012 diff changeset	1426 # 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	1427 self.cgresult = None
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1428 # list of step already done
92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1429 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	1430 # 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	1431 self.clonebundleattempted = False
39569 130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1432 # Set of file patterns to include.
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1433 self.includepats = includepats
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1434 # Set of file patterns to exclude.
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1435 self.excludepats = excludepats
40331 ac59de55c8b4 exchange: support declaring pull depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39916 diff changeset	1436 # Number of ancestor changesets to pull from each pulled head.
ac59de55c8b4 exchange: support declaring pull depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39916 diff changeset	1437 self.depth = depth
20487 f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1438
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1439 @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	1440 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	1441 """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	1442 # 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	1443 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	1444 # 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	1445 # 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	1446 c = set(self.common)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1447 ret = list(self.common)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1448 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	1449 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	1450 ret.append(n)
09e7118715eb pull: prevent duplicated entry in `op.pulledsubset` Pierre-Yves David <pierre-yves.david@fb.com> parents: 20596 diff changeset	1451 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	1452 else:
f715cc0b5107 pull: make pulled subset a propertycache of the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20486 diff changeset	1453 # 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	1454 # 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	1455 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	1456
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1457 @util.propertycache
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1458 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	1459 return not _forcebundle1(self)
26465 eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1460
eda32ee9962f exchange: expose bundle2 availability on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26464 diff changeset	1461 @util.propertycache
26464 9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1462 def remotebundle2caps(self):
9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1463 return bundle2.bundle2caps(self.remote)
9a7fc6d48898 exchange: expose bundle2 capabilities on pulloperation Gregory Szorc <gregory.szorc@gmail.com> parents: 26462 diff changeset	1464
20477 2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1465 def gettransaction(self):
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1466 # deprecated; talk to trmanager directly
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1467 return self.trmanager.transaction()
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1468
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1469
33814 bbbbd3c30bfc util: add base class for transactional context managers Martin von Zweigbergk <martinvonz@google.com> parents: 33813 diff changeset	1470 class transactionmanager(util.transactional):
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23439 diff changeset	1471 """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	1472
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1473 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	1474 closing the transaction."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1475
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1476 def __init__(self, repo, source, url):
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1477 self.repo = repo
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1478 self.source = source
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1479 self.url = url
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1480 self._tr = None
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1481
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1482 def transaction(self):
52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1483 """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	1484 if not self._tr:
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	1485 trname = b'%s\n%s' % (self.source, urlutil.hidepassword(self.url))
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1486 self._tr = self.repo.transaction(trname)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1487 self._tr.hookargs[b'source'] = self.source
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1488 self._tr.hookargs[b'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	1489 return self._tr
2607a21bb40b pull: move transaction logic into the pull object Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	1490
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1491 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	1492 """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	1493 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	1494 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	1495
23436 52db731b964d pull: extract transaction logic into separate object Eric Sumner <ericsumner@fb.com> parents: 23382 diff changeset	1496 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	1497 """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	1498 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	1499 self._tr.release()
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1500
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1501
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	1502 def listkeys(remote, namespace):
2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	1503 with remote.commandexecutor() as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1504 return e.callcommand(b'listkeys', {b'namespace': namespace}).result()
37757 2a8ad00b8aed exchange: use command executor interface for calling listkeys Gregory Szorc <gregory.szorc@gmail.com> parents: 37663 diff changeset	1505
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1506
37498 aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1507 def _fullpullbundle2(repo, pullop):
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1508 # The server may send a partial reply, i.e. when inlining
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1509 # pre-computed bundles. In that case, update the common
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1510 # set based on the results and pull another bundle.
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1511 #
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1512 # There are two indicators that the process is finished:
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1513 # - no changeset has been added, or
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1514 # - all remote heads are known locally.
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1515 # The head check must use the unfiltered view as obsoletion
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1516 # markers can hide heads.
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1517 unfi = repo.unfiltered()
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1518 unficl = unfi.changelog
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1519
37498 aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1520 def headsofdiff(h1, h2):
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1521 """Returns heads(h1 % h2)"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1522 res = unfi.set(b'heads(%ln %% %ln)', h1, h2)
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44406 diff changeset	1523 return {ctx.node() for ctx in res}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1524
37498 aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1525 def headsofunion(h1, h2):
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1526 """Returns heads((h1 + h2) - null)"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1527 res = unfi.set(b'heads((%ln + %ln - null))', h1, h2)
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44406 diff changeset	1528 return {ctx.node() for ctx in res}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1529
37498 aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1530 while True:
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1531 old_heads = unficl.heads()
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1532 clstart = len(unficl)
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1533 _pullbundle2(pullop)
45392 77b8588dd84e requirements: introduce new requirements related module Pulkit Goyal <7895pulkit@gmail.com> parents: 45391 diff changeset	1534 if requirements.NARROW_REQUIREMENT in repo.requirements:
37498 aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1535 # XXX narrow clones filter the heads on the server side during
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1536 # XXX getbundle and result in partial replies as well.
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1537 # XXX Disable pull bundles in this case as band aid to avoid
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1538 # XXX extra round trips.
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1539 break
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1540 if clstart == len(unficl):
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1541 break
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1542 if all(unficl.hasnode(n) for n in pullop.rheads):
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1543 break
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1544 new_heads = headsofdiff(unficl.heads(), old_heads)
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1545 pullop.common = headsofunion(new_heads, pullop.common)
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1546 pullop.rheads = set(pullop.rheads) - pullop.common
aacfca6f9767 wireproto: support for pullbundles Joerg Sonnenberger <joerg@bec.de> parents: 37239 diff changeset	1547
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1548
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1549 def add_confirm_callback(repo, pullop):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1550 """adds a finalize callback to transaction which can be used to show stats
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1551 to user and confirm the pull before committing transaction"""
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1552
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1553 tr = pullop.trmanager.transaction()
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1554 scmutil.registersummarycallback(
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1555 repo, tr, txnname=b'pull', as_validator=True
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1556 )
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1557 reporef = weakref.ref(repo.unfiltered())
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1558
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1559 def prompt(tr):
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1560 repo = reporef()
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1561 cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No')
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1562 if repo.ui.promptchoice(cm):
45681 a736ab681b78 errors: stop passing non-strings to Abort's constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45558 diff changeset	1563 raise error.Abort(b"user aborted")
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1564
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1565 tr.addvalidator(b'900-pull-prompt', prompt)
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1566
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1567
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1568 def pull(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1569 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1570 remote,
48253 7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1571 path=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1572 heads=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1573 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1574 bookmarks=(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1575 opargs=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1576 streamclonerequested=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1577 includepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1578 excludepats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1579 depth=None,
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1580 confirm=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1581 ):
26440 85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1582 """Fetch repository data from a remote.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1583
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1584 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	1585
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1586 ``repo`` is the local repository to clone into.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1587 ``remote`` is a peer instance.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1588 ``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	1589 default) means to pull everything from the remote.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1590 ``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	1591 default, all remote bookmarks are pulled.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1592 ``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	1593 initialization.
26448 e05fd574c922 exchange: teach pull about requested stream clones Gregory Szorc <gregory.szorc@gmail.com> parents: 26443 diff changeset	1594 ``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	1595 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	1596 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	1597 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	1598 configuration for preferring stream clones.
39569 130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1599 ``includepats`` and ``excludepats`` define explicit file patterns to
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1600 include and exclude in storage, respectively. If not defined, narrow
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1601 patterns from the repo instance are used, if available.
40331 ac59de55c8b4 exchange: support declaring pull depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39916 diff changeset	1602 ``depth`` is an integer indicating the DAG depth of history we're
ac59de55c8b4 exchange: support declaring pull depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39916 diff changeset	1603 interested in. If defined, for each revision specified in ``heads``, we
ac59de55c8b4 exchange: support declaring pull depth Gregory Szorc <gregory.szorc@gmail.com> parents: 39916 diff changeset	1604 will fetch up to this many of its ancestors and data associated with them.
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1605 ``confirm`` is a boolean indicating whether the pull should be confirmed
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1606 before committing the transaction. This overrides HGPLAIN.
26440 85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1607
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1608 Returns the ``pulloperation`` created for this pull.
85b992177d2a exchange: add docstring to pull() Gregory Szorc <gregory.szorc@gmail.com> parents: 26428 diff changeset	1609 """
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	1610 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	1611 opargs = {}
39569 130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1612
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1613 # We allow the narrow patterns to be passed in explicitly to provide more
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1614 # flexibility for API consumers.
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1615 if includepats or excludepats:
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1616 includepats = includepats or set()
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1617 excludepats = excludepats or set()
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1618 else:
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1619 includepats, excludepats = repo.narrowpats
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1620
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1621 narrowspec.validatepatterns(includepats)
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1622 narrowspec.validatepatterns(excludepats)
130e5df346d5 exchange: support defining narrow file patterns for pull Gregory Szorc <gregory.szorc@gmail.com> parents: 39191 diff changeset	1623
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1624 pullop = pulloperation(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1625 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1626 remote,
48253 7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1627 path=path,
7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1628 heads=heads,
7d1e60244561 path: keep the path instance in the `pulloperation` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47497 diff changeset	1629 force=force,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1630 bookmarks=bookmarks,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1631 streamclonerequested=streamclonerequested,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1632 includepats=includepats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1633 excludepats=excludepats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1634 depth=depth,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1635 **pycompat.strkwargs(opargs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1636 )
33728 033484935391 exchange: access requirements on repo instead of peer Gregory Szorc <gregory.szorc@gmail.com> parents: 33727 diff changeset	1637
033484935391 exchange: access requirements on repo instead of peer Gregory Szorc <gregory.szorc@gmail.com> parents: 33727 diff changeset	1638 peerlocal = pullop.remote.local()
033484935391 exchange: access requirements on repo instead of peer Gregory Szorc <gregory.szorc@gmail.com> parents: 33727 diff changeset	1639 if peerlocal:
033484935391 exchange: access requirements on repo instead of peer Gregory Szorc <gregory.szorc@gmail.com> parents: 33727 diff changeset	1640 missing = set(peerlocal.requirements) - pullop.repo.supported
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1641 if missing:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1642 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1643 b"required features are not"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1644 b" supported in the destination:"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1645 b" %s"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1646 ) % (b', '.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	1647 raise error.Abort(msg)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1648
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1649 for category in repo._wanted_sidedata:
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1650 # Check that a computer is registered for that category for at least
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1651 # one revlog kind.
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1652 for kind, computers in repo._sidedata_computers.items():
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1653 if computers.get(category):
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1654 break
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1655 else:
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1656 # This should never happen since repos are supposed to be able to
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1657 # generate the sidedata they require.
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1658 raise error.ProgrammingError(
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1659 _(
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1660 b'sidedata category requested by local side without local'
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1661 b"support: '%s'"
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1662 )
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1663 % pycompat.bytestr(category)
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1664 )
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1665
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1666 pullop.trmanager = transactionmanager(repo, b'pull', remote.url())
42348 5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	1667 wlock = util.nullcontextmanager()
5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	1668 if not bookmod.bookmarksinstore(repo):
5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	1669 wlock = repo.wlock()
5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	1670 with wlock, repo.lock(), pullop.trmanager:
44555 bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1671 if confirm or (
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1672 repo.ui.configbool(b"pull", b"confirm") and not repo.ui.plain()
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1673 ):
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1674 add_confirm_callback(repo, pullop)
bd7b2c8d06cc pull: add `--confirm` flag to confirm before writing changes Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1675
48561 04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1676 # This should ideally be in _pullbundle2(). However, it needs to run
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1677 # before discovery to avoid extra work.
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1678 _maybeapplyclonebundle(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1679 streamclone.maybeperformlegacystreamclone(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1680 _pulldiscovery(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1681 if pullop.canusebundle2:
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1682 _fullpullbundle2(repo, pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1683 _pullchangeset(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1684 _pullphase(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1685 _pullbookmarks(pullop)
04688c51f81f exchangev2: remove it Rapha?l Gom?s <rgomes@octobus.net> parents: 48292 diff changeset	1686 _pullobsolete(pullop)
20469 6b4c789d618d exchange: extract pull function from localrepo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20468 diff changeset	1687
35245 5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: 35064 diff changeset	1688 # storing remotenames
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1689 if repo.ui.configbool(b'experimental', b'remotenames'):
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35314 diff changeset	1690 logexchange.pullremotenames(repo, remote)
35245 5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: 35064 diff changeset	1691
22693 68439b154063 exchange: have `pull` return the pulloperation object Pierre-Yves David <pierre-yves.david@fb.com> parents: 22666 diff changeset	1692 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	1693
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1694
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1695 # 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	1696 pulldiscoveryorder = []
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1697
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1698 # Mapping between step name and function
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1699 #
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1700 # 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	1701 pulldiscoverymapping = {}
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1702
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1703
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1704 def pulldiscovery(stepname):
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1705 """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	1706
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1707 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	1708 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	1709 may matter).
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1710
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1711 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	1712 from an extension, change the pulldiscovery dictionary directly."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1713
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1714 def dec(func):
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1715 assert stepname not in pulldiscoverymapping
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1716 pulldiscoverymapping[stepname] = func
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1717 pulldiscoveryorder.append(stepname)
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1718 return func
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1719
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1720 return dec
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1721
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1722
20900 cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1723 def _pulldiscovery(pullop):
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1724 """Run all discovery steps"""
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1725 for stepname in pulldiscoveryorder:
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1726 step = pulldiscoverymapping[stepname]
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1727 step(pullop)
dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1728
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1729
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1730 @pulldiscovery(b'b1:bookmarks')
25369 02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1731 def _pullbookmarkbundle1(pullop):
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1732 """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	1733
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1734 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	1735 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	1736 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	1737 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1738 if pullop.canusebundle2 and b'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	1739 # 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	1740 # 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	1741 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1742 books = listkeys(pullop.remote, b'bookmarks')
35062 d7a4384d2d87 pull: store binary node in pullop.remotebookmarks Boris Feld <boris.feld@octobus.net> parents: 34910 diff changeset	1743 pullop.remotebookmarks = bookmod.unhexlifybookmarks(books)
25369 02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1744
02defdb1b628 pull: only prefetch bookmarks when using bundle1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 25337 diff changeset	1745
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1746 @pulldiscovery(b'changegroup')
22936 dae236906fb2 pull: make discovery phase extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22693 diff changeset	1747 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	1748 """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	1749
cb37fb91bc5a pull: put discovery step in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20899 diff changeset	1750 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	1751 at some point."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1752 tmp = discovery.findcommonincoming(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1753 pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1754 )
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1755 common, fetch, rheads = tmp
43593 9c1f4e2f1fc4 index: use `index.has_node` in `exchange._pulldiscoverychangegroup` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43554 diff changeset	1756 has_node = pullop.repo.unfiltered().changelog.index.has_node
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1757 if fetch and rheads:
34324 e45ec589f962 discovery: avoid dropping remote heads hidden locally Boris Feld <boris.feld@octobus.net> parents: 34228 diff changeset	1758 # If a remote heads is filtered locally, put in back in common.
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1759 #
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1760 # 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	1761 # 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	1762 # 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	1763 # 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	1764 #
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1765 # 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	1766 # 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	1767 scommon = set(common)
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1768 for n in rheads:
43593 9c1f4e2f1fc4 index: use `index.has_node` in `exchange._pulldiscoverychangegroup` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43554 diff changeset	1769 if has_node(n):
23975 3b7088a5c64c discovery: properly exclude locally known but filtered heads Pierre-Yves David <pierre-yves.david@fb.com> parents: 23890 diff changeset	1770 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	1771 common.append(n)
34324 e45ec589f962 discovery: avoid dropping remote heads hidden locally Boris Feld <boris.feld@octobus.net> parents: 34228 diff changeset	1772 if set(rheads).issubset(set(common)):
23848 c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1773 fetch = []
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1774 pullop.common = common
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1775 pullop.fetch = fetch
c5456b64eb07 discovery: run discovery on filtered repository Pierre-Yves David <pierre-yves.david@fb.com> parents: 23591 diff changeset	1776 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	1777
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1778
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1779 def _pullbundle2(pullop):
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1780 """pull data using bundle2
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1781
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1782 For now, the only supported data are changegroup."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1783 kwargs = {b'bundlecaps': caps20to10(pullop.repo, role=b'client')}
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1784
35761 1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1785 # make ui easier to access
1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1786 ui = pullop.repo.ui
1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1787
32297 205bd3936179 bundle2: don't check for whether we can do stream clones Siddharth Agarwal <sid0@fb.com> parents: 32262 diff changeset	1788 # 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	1789 # implemented then here's where the check for that will go.
35763 7eedbd5d4880 streamclone: add support for bundle2 based stream clone Boris Feld <boris.feld@octobus.net> parents: 35762 diff changeset	1790 streaming = streamclone.canperformstreamclone(pullop, bundle2=True)[0]
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1791
35761 1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1792 # declare pull perimeters
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1793 kwargs[b'common'] = pullop.common
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1794 kwargs[b'heads'] = pullop.heads or pullop.rheads
35761 1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1795
40542 440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	1796 # check server supports narrow and then adding includepats and excludepats
440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	1797 servernarrow = pullop.remote.capable(wireprototypes.NARROWCAP)
440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	1798 if servernarrow and pullop.includepats:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1799 kwargs[b'includepats'] = pullop.includepats
40542 440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	1800 if servernarrow and pullop.excludepats:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1801 kwargs[b'excludepats'] = pullop.excludepats
40542 440f5b65be57 exchange: pass includepats and excludepats as arguments to getbundle() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40352 diff changeset	1802
35763 7eedbd5d4880 streamclone: add support for bundle2 based stream clone Boris Feld <boris.feld@octobus.net> parents: 35762 diff changeset	1803 if streaming:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1804 kwargs[b'cg'] = False
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1805 kwargs[b'stream'] = True
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1806 pullop.stepsdone.add(b'changegroup')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1807 pullop.stepsdone.add(b'phases')
35763 7eedbd5d4880 streamclone: add support for bundle2 based stream clone Boris Feld <boris.feld@octobus.net> parents: 35762 diff changeset	1808
7eedbd5d4880 streamclone: add support for bundle2 based stream clone Boris Feld <boris.feld@octobus.net> parents: 35762 diff changeset	1809 else:
35762 40df727b6f4f pull: preindent some code Boris Feld <boris.feld@octobus.net> parents: 35761 diff changeset	1810 # pulling changegroup
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1811 pullop.stepsdone.add(b'changegroup')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1812
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1813 kwargs[b'cg'] = pullop.fetch
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1814
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1815 legacyphase = b'phases' in ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1816 hasbinaryphase = b'heads' in pullop.remotebundle2caps.get(b'phases', ())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1817 if not legacyphase and hasbinaryphase:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1818 kwargs[b'phases'] = True
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1819 pullop.stepsdone.add(b'phases')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1820
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1821 if b'listkeys' in pullop.remotebundle2caps:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1822 if b'phases' not in pullop.stepsdone:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1823 kwargs[b'listkeys'] = [b'phases']
35761 1908d360f977 pull: reorganize bundle2 argument bundling Boris Feld <boris.feld@octobus.net> parents: 35759 diff changeset	1824
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1825 bookmarksrequested = False
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1826 legacybookmark = b'bookmarks' in ui.configlist(b'devel', b'legacy.exchange')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1827 hasbinarybook = b'bookmarks' in pullop.remotebundle2caps
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1828
44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1829 if pullop.remotebookmarks is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1830 pullop.stepsdone.add(b'request-bookmarks')
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1831
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1832 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1833 b'request-bookmarks' not in pullop.stepsdone
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1834 and pullop.remotebookmarks is None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1835 and not legacybookmark
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1836 and hasbinarybook
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1837 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1838 kwargs[b'bookmarks'] = True
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1839 bookmarksrequested = True
44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1840
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1841 if b'listkeys' in pullop.remotebundle2caps:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1842 if b'request-bookmarks' not in pullop.stepsdone:
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	1843 # 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	1844 # `hg incoming --bundle` to using this function.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1845 pullop.stepsdone.add(b'request-bookmarks')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1846 kwargs.setdefault(b'listkeys', []).append(b'bookmarks')
26690 704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1847
704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1848 # 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	1849 # 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	1850 # 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	1851 # 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	1852 # differently from those that don't.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1853 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1854 pullop.remote.capable(b'clonebundles')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1855 and pullop.heads is None
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46977 diff changeset	1856 and list(pullop.common) == [pullop.repo.nullid]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1857 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1858 kwargs[b'cbattempted'] = pullop.clonebundleattempted
26690 704818fb170d exchange: advertise if a clone bundle was attempted Gregory Szorc <gregory.szorc@gmail.com> parents: 26689 diff changeset	1859
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1860 if streaming:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1861 pullop.repo.ui.status(_(b'streaming all changes\n'))
26471 41dd7b2c7e15 exchange: add "streaming all changes" to bundle2 pulling Gregory Szorc <gregory.szorc@gmail.com> parents: 26465 diff changeset	1862 elif not pullop.fetch:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1863 pullop.repo.ui.status(_(b"no changes found\n"))
21258 71931b789424 exchange: fix bad indentation Pierre-Yves David <pierre-yves.david@fb.com> parents: 21257 diff changeset	1864 pullop.cgresult = 0
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1865 else:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46977 diff changeset	1866 if pullop.heads is None and list(pullop.common) == [pullop.repo.nullid]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1867 pullop.repo.ui.status(_(b"requesting all changes\n"))
22953 b1d694d3975e obsolete: add exchange option Durham Goode <durham@fb.com> parents: 22937 diff changeset	1868 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	1869 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	1870 if obsolete.commonversion(remoteversions) is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1871 kwargs[b'obsmarkers'] = True
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1872 pullop.stepsdone.add(b'obsmarkers')
21159 024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1873 _pullbundle2extraprepare(pullop, kwargs)
37648 8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1874
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1875 remote_sidedata = bundle2.read_remote_wanted_sidedata(pullop.remote)
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1876 if remote_sidedata:
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1877 kwargs[b'remote_sidedata'] = remote_sidedata
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	1878
37648 8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1879 with pullop.remote.commandexecutor() as e:
8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1880 args = dict(kwargs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1881 args[b'source'] = b'pull'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1882 bundle = e.callcommand(b'getbundle', args).result()
37648 8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1883
8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1884 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1885 op = bundle2.bundleoperation(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1886 pullop.repo, pullop.gettransaction, source=b'pull'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1887 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1888 op.modes[b'bookmarks'] = b'records'
37648 8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1889 bundle2.processbundle(pullop.repo, bundle, op=op)
8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1890 except bundle2.AbortFromPart as exc:
46537 db9e33beb0fb bundle2: print "error:abort" message to stderr instead of stdout Martin von Zweigbergk <martinvonz@google.com> parents: 45957 diff changeset	1891 pullop.repo.ui.error(_(b'remote: abort: %s\n') % exc)
46977 3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py Martin von Zweigbergk <martinvonz@google.com> parents: 46907 diff changeset	1892 raise error.RemoteError(_(b'pull failed on remote'), hint=exc.hint)
37648 8f3c6fb55369 exchange: use command executor for getbundle Gregory Szorc <gregory.szorc@gmail.com> parents: 37647 diff changeset	1893 except error.BundleValueError as exc:
46977 3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py Martin von Zweigbergk <martinvonz@google.com> parents: 46907 diff changeset	1894 raise error.RemoteError(_(b'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	1895
ab5040cd5749 bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21258 diff changeset	1896 if pullop.fetch:
33049 d765ad56081f bundle: make combinechangegroupresults() take a bundleoperation Martin von Zweigbergk <martinvonz@google.com> parents: 33048 diff changeset	1897 pullop.cgresult = bundle2.combinechangegroupresults(op)
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20954 diff changeset	1898
21658 0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1899 # processing phases change
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1900 for namespace, value in op.records[b'listkeys']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1901 if namespace == b'phases':
21658 0696ca0a685b pull: when remote supports it, pull phase data alongside changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 21657 diff changeset	1902 _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	1903
22656 c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1904 # processing bookmark update
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1905 if bookmarksrequested:
44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1906 books = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1907 for record in op.records[b'bookmarks']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1908 books[record[b'bookmark']] = record[b"node"]
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1909 pullop.remotebookmarks = books
44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1910 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1911 for namespace, value in op.records[b'listkeys']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1912 if namespace == b'bookmarks':
35277 44b8b5ad30eb pull: retrieve bookmarks through the binary part when possible Boris Feld <boris.feld@octobus.net> parents: 35276 diff changeset	1913 pullop.remotebookmarks = bookmod.unhexlifybookmarks(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	1914
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	1915 # 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	1916 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	1917 _pullbookmarks(pullop)
22656 c9276945eba3 pull: retrieve bookmarks through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22655 diff changeset	1918
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1919
21159 024f38f6d5f6 bundle2: allow extensions to extend the getbundle request Pierre-Yves David <pierre-yves.david@fb.com> parents: 21158 diff changeset	1920 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	1921 """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	1922
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1923
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1924 def _pullchangeset(pullop):
7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1925 """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	1926 # 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	1927 # 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	1928 # rollback call
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1929 if b'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	1930 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1931 pullop.stepsdone.add(b'changegroup')
20899 d62319f91cb7 pull: move the cgresult logic in _pullchangeset Pierre-Yves David <pierre-yves.david@fb.com> parents: 20898 diff changeset	1932 if not pullop.fetch:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1933 pullop.repo.ui.status(_(b"no changes found\n"))
23217 2f12ac53b528 exchange: fix indentation in _pullchangeset Mike Edgar <adgar@google.com> parents: 23208 diff changeset	1934 pullop.cgresult = 0
2f12ac53b528 exchange: fix indentation in _pullchangeset Mike Edgar <adgar@google.com> parents: 23208 diff changeset	1935 return
32948 af31d531dda0 changegroup: let callers pass in transaction to apply() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32945 diff changeset	1936 tr = pullop.gettransaction()
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46977 diff changeset	1937 if pullop.heads is None and list(pullop.common) == [pullop.repo.nullid]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1938 pullop.repo.ui.status(_(b"requesting all changes\n"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1939 elif pullop.heads is None and pullop.remote.capable(b'changegroupsubset'):
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1940 # 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	1941 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	1942
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1943 if pullop.remote.capable(b'getbundle'):
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1944 # TODO: get bundlecaps from remote
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1945 cg = pullop.remote.getbundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1946 b'pull', common=pullop.common, heads=pullop.heads or pullop.rheads
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1947 )
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1948 elif pullop.heads is None:
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	1949 with pullop.remote.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1950 cg = e.callcommand(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1951 b'changegroup',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1952 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1953 b'nodes': pullop.fetch,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1954 b'source': b'pull',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45925 diff changeset	1955 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1956 ).result()
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	1957
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1958 elif not pullop.remote.capable(b'changegroupsubset'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1959 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1960 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1961 b"partial pull cannot be done because "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1962 b"other repository doesn't support "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1963 b"changegroupsubset."
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1964 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1965 )
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1966 else:
37635 cc8c06835097 wireproto: convert legacy commands to command executor Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	1967 with pullop.remote.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1968 cg = e.callcommand(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1969 b'changegroupsubset',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1970 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1971 b'bases': pullop.fetch,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1972 b'heads': pullop.heads,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1973 b'source': b'pull',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1974 },
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1975 ).result()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1976
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1977 bundleop = bundle2.applybundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1978 pullop.repo, cg, tr, b'pull', pullop.remote.url()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1979 )
33052 2baef42a2881 bundle: make applybundle1() return a bundleoperation Martin von Zweigbergk <martinvonz@google.com> parents: 33051 diff changeset	1980 pullop.cgresult = bundle2.combinechangegroupresults(bundleop)
20489 7b5ec1c7e8e2 pull: move changeset pulling in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20488 diff changeset	1981
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1982
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1983 def _pullphase(pullop):
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1984 # Get remote phases data from remote
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1985 if b'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	1986 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1987 remotephases = listkeys(pullop.remote, b'phases')
21654 ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1988 _pullapplyphases(pullop, remotephases)
ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1989
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1990
21654 ddf9a00c1239 pull: split remote phases retrieval from actual application Pierre-Yves David <pierre-yves.david@fb.com> parents: 21645 diff changeset	1991 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	1992 """apply phase movement from observed remote state"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1993 if b'phases' in pullop.stepsdone:
22937 92bf9abc4deb pull: use `stepsdone` instead of `todosteps` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22936 diff changeset	1994 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1995 pullop.stepsdone.add(b'phases')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1996 publishing = bool(remotephases.get(b'publishing', False))
20486 0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	1997 if remotephases and not publishing:
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30187 diff changeset	1998 # remote is new and non-publishing
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	1999 pheads, _dr = phases.analyzeremotephases(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2000 pullop.repo, pullop.pulledsubset, remotephases
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2001 )
22068 d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	2002 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	2003 else:
0c469df6e914 pull: move phases synchronisation in its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20485 diff changeset	2004 # 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	2005 # 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	2006 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	2007 dheads = []
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	2008 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	2009 phase = unfi._phasecache.phase
43611 4d8a4ecbb8b9 index: use `index.get_rev` in `exchange._pullapplyphases` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43610 diff changeset	2010 rev = unfi.changelog.index.get_rev
22068 d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	2011 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	2012 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	2013
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	2014 # 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	2015 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	2016 if pheads:
22069 616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	2017 tr = pullop.gettransaction()
616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	2018 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	2019
d34058dd3246 pull: pre-filter remote phases before moving local ones Pierre-Yves David <pierre-yves.david@fb.com> parents: 22059 diff changeset	2020 # 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	2021 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	2022 if dheads:
22069 616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	2023 tr = pullop.gettransaction()
616a455b02ca phase: add a transaction argument to advanceboundary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22068 diff changeset	2024 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	2025
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2026
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	2027 def _pullbookmarks(pullop):
02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	2028 """process the remote bookmark information to update the local one"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2029 if b'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	2030 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2031 pullop.stepsdone.add(b'bookmarks')
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	2032 repo = pullop.repo
02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	2033 remotebookmarks = pullop.remotebookmarks
48254 4d2ab365699e bookmarks: move the `mirror` option to the `paths` section Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	2034 bookmarks_mode = None
4d2ab365699e bookmarks: move the `mirror` option to the `paths` section Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	2035 if pullop.remote_path is not None:
4d2ab365699e bookmarks: move the `mirror` option to the `paths` section Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	2036 bookmarks_mode = pullop.remote_path.bookmarks_mode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2037 bookmod.updatefromremote(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2038 repo.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2039 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2040 remotebookmarks,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2041 pullop.remote.url(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2042 pullop.gettransaction,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2043 explicit=pullop.explicitbookmarks,
48254 4d2ab365699e bookmarks: move the `mirror` option to the `paths` section Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	2044 mode=bookmarks_mode,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2045 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2046
22654 02e0a574bcd3 pull: move bookmark pulling into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22653 diff changeset	2047
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	2048 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	2049 """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	2050
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	2051 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	2052 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	2053 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	2054
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	2055 Exists mostly to allow overriding for experimentation purpose"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2056 if b'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	2057 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2058 pullop.stepsdone.add(b'obsmarkers')
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	2059 tr = None
22953 b1d694d3975e obsolete: add exchange option Durham Goode <durham@fb.com> parents: 22937 diff changeset	2060 if obsolete.isenabled(pullop.repo, obsolete.exchangeopt):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2061 pullop.repo.ui.debug(b'fetching remote obsolete markers\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2062 remoteobs = listkeys(pullop.remote, b'obsolete')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2063 if b'dump0' in remoteobs:
20478 80628d4069be push: feed pulloperation object to _pullobsolete function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20477 diff changeset	2064 tr = pullop.gettransaction()
27558 b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	2065 markers = []
20476 1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	2066 for key in sorted(remoteobs, reverse=True):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2067 if key.startswith(b'dump'):
32245 4462a981e8df base85: proxy through util module Yuya Nishihara <yuya@tcha.org> parents: 32215 diff changeset	2068 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	2069 version, newmarks = obsolete._readmarkers(data)
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	2070 markers += newmarks
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	2071 if markers:
b5b54825de6b pull: make a single call to obsstore.add (issue5006) Matt Mackall <mpm@selenic.com> parents: 27523 diff changeset	2072 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	2073 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	2074 return tr
1180c6ec5695 pull: move obsolescence marker exchange in the exchange module Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20475 diff changeset	2075
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2076
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2077 def applynarrowacl(repo, kwargs):
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2078 """Apply narrow fetch access control.
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2079
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2080 This massages the named arguments for getbundle wire protocol commands
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2081 so requested data is filtered through access control rules.
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2082 """
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2083 ui = repo.ui
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2084 # TODO this assumes existence of HTTP and is a layering violation.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2085 username = ui.shortuser(ui.environ.get(b'REMOTE_USER') or ui.username())
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2086 user_includes = ui.configlist(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2087 _NARROWACL_SECTION,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2088 username + b'.includes',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2089 ui.configlist(_NARROWACL_SECTION, b'default.includes'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2090 )
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2091 user_excludes = ui.configlist(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2092 _NARROWACL_SECTION,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2093 username + b'.excludes',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2094 ui.configlist(_NARROWACL_SECTION, b'default.excludes'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2095 )
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2096 if not user_includes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2097 raise error.Abort(
43789 27c6d6f53d46 exchange: eliminate some bytes.format() calls Matt Harbison <matt_harbison@yahoo.com> parents: 43705 diff changeset	2098 _(b"%s configuration for user %s is empty")
27c6d6f53d46 exchange: eliminate some bytes.format() calls Matt Harbison <matt_harbison@yahoo.com> parents: 43705 diff changeset	2099 % (_NARROWACL_SECTION, username)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2100 )
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2101
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2102 user_includes = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2103 b'path:.' if p == b'*' else b'path:' + p for p in user_includes
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2104 ]
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2105 user_excludes = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2106 b'path:.' if p == b'*' else b'path:' + p for p in user_excludes
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2107 ]
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2108
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2109 req_includes = set(kwargs.get('includepats', []))
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2110 req_excludes = set(kwargs.get('excludepats', []))
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2111
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2112 req_includes, req_excludes, invalid_includes = narrowspec.restrictpatterns(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2113 req_includes, req_excludes, user_includes, user_excludes
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2114 )
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2115
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2116 if invalid_includes:
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2117 raise error.Abort(
43789 27c6d6f53d46 exchange: eliminate some bytes.format() calls Matt Harbison <matt_harbison@yahoo.com> parents: 43705 diff changeset	2118 _(b"The following includes are not accessible for %s: %s")
43839 ea97cd64c500 exchange: fix an attempt to format a list into bytes Matt Harbison <matt_harbison@yahoo.com> parents: 43813 diff changeset	2119 % (username, stringutil.pprint(invalid_includes))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2120 )
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2121
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2122 new_args = {}
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2123 new_args.update(kwargs)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2124 new_args['narrow'] = True
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2125 new_args['narrow_acl'] = True
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2126 new_args['includepats'] = req_includes
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2127 if req_excludes:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2128 new_args['excludepats'] = req_excludes
38847 98df52d5042c exchange: make narrow ACL presence imply narrow=True Gregory Szorc <gregory.szorc@gmail.com> parents: 38832 diff changeset	2129
38830 3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2130 return new_args
3e7387337a3c exchange: move narrow acl functionality into core Gregory Szorc <gregory.szorc@gmail.com> parents: 38829 diff changeset	2131
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2132
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2133 def _computeellipsis(repo, common, heads, known, match, depth=None):
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2134 """Compute the shape of a narrowed DAG.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2135
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2136 Args:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2137 repo: The repository we're transferring.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2138 common: The roots of the DAG range we're transferring.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2139 May be just [nullid], which means all ancestors of heads.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2140 heads: The heads of the DAG range we're transferring.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2141 match: The narrowmatcher that allows us to identify relevant changes.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2142 depth: If not None, only consider nodes to be full nodes if they are at
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2143 most depth changesets away from one of heads.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2144
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2145 Returns:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2146 A tuple of (visitnodes, relevant_nodes, ellipsisroots) where:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2147
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2148 visitnodes: The list of nodes (either full or ellipsis) which
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2149 need to be sent to the client.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2150 relevant_nodes: The set of changelog nodes which change a file inside
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2151 the narrowspec. The client needs these as non-ellipsis nodes.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2152 ellipsisroots: A dict of {rev: parents} that is used in
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2153 narrowchangegroup to produce ellipsis nodes with the
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2154 correct parents.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2155 """
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2156 cl = repo.changelog
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2157 mfl = repo.manifestlog
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2158
39191 b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2159 clrev = cl.rev
b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2160
b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2161 commonrevs = {clrev(n) for n in common} \| {nullrev}
b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2162 headsrevs = {clrev(n) for n in heads}
b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2163
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2164 if depth:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2165 revdepth = {h: 0 for h in headsrevs}
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2166
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2167 ellipsisheads = collections.defaultdict(set)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2168 ellipsisroots = collections.defaultdict(set)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2169
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2170 def addroot(head, curchange):
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2171 """Add a root to an ellipsis head, splitting heads with 3 roots."""
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2172 ellipsisroots[head].add(curchange)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2173 # Recursively split ellipsis heads with 3 roots by finding the
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2174 # roots' youngest common descendant which is an elided merge commit.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2175 # That descendant takes 2 of the 3 roots as its own, and becomes a
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2176 # root of the head.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2177 while len(ellipsisroots[head]) > 2:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2178 child, roots = splithead(head)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2179 splitroots(head, child, roots)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2180 head = child # Recurse in case we just added a 3rd root
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2181
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2182 def splitroots(head, child, roots):
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2183 ellipsisroots[head].difference_update(roots)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2184 ellipsisroots[head].add(child)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2185 ellipsisroots[child].update(roots)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2186 ellipsisroots[child].discard(child)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2187
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2188 def splithead(head):
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2189 r1, r2, r3 = sorted(ellipsisroots[head])
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2190 for nr1, nr2 in ((r2, r3), (r1, r3), (r1, r2)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2191 mid = repo.revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2192 b'sort(merge() & %d::%d & %d::%d, -rev)', nr1, head, nr2, head
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2193 )
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2194 for j in mid:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2195 if j == nr2:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2196 return nr2, (nr1, nr2)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2197 if j not in ellipsisroots or len(ellipsisroots[j]) < 2:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2198 return j, (nr1, nr2)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2199 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2200 _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2201 b'Failed to split up ellipsis node! head: %d, '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2202 b'roots: %d %d %d'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2203 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2204 % (head, r1, r2, r3)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2205 )
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2206
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2207 missing = list(cl.findmissingrevs(common=commonrevs, heads=headsrevs))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2208 visit = reversed(missing)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2209 relevant_nodes = set()
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2210 visitnodes = [cl.node(m) for m in missing]
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2211 required = set(headsrevs) \| known
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2212 for rev in visit:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2213 clrev = cl.changelogrevision(rev)
39191 b0c73866c9fb exchange: don't use dagutil Gregory Szorc <gregory.szorc@gmail.com> parents: 38874 diff changeset	2214 ps = [prev for prev in cl.parentrevs(rev) if prev != nullrev]
38831 7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2215 if depth is not None:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2216 curdepth = revdepth[rev]
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2217 for p in ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2218 revdepth[p] = min(curdepth + 1, revdepth.get(p, depth + 1))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2219 needed = False
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2220 shallow_enough = depth is None or revdepth[rev] <= depth
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2221 if shallow_enough:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2222 curmf = mfl[clrev.manifest].read()
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2223 if ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2224 # We choose to not trust the changed files list in
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2225 # changesets because it's not always correct. TODO: could
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2226 # we trust it for the non-merge case?
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2227 p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read()
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2228 needed = bool(curmf.diff(p1mf, match))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2229 if not needed and len(ps) > 1:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2230 # For merge changes, the list of changed files is not
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2231 # helpful, since we need to emit the merge if a file
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2232 # in the narrow spec has changed on either side of the
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2233 # merge. As a result, we do a manifest diff to check.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2234 p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read()
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2235 needed = bool(curmf.diff(p2mf, match))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2236 else:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2237 # For a root node, we need to include the node if any
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2238 # files in the node match the narrowspec.
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2239 needed = any(curmf.walk(match))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2240
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2241 if needed:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2242 for head in ellipsisheads[rev]:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2243 addroot(head, rev)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2244 for p in ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2245 required.add(p)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2246 relevant_nodes.add(cl.node(rev))
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2247 else:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2248 if not ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2249 ps = [nullrev]
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2250 if rev in required:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2251 for head in ellipsisheads[rev]:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2252 addroot(head, rev)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2253 for p in ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2254 ellipsisheads[p].add(rev)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2255 else:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2256 for p in ps:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2257 ellipsisheads[p] \|= ellipsisheads[rev]
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2258
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2259 # add common changesets as roots of their reachable ellipsis heads
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2260 for c in commonrevs:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2261 for head in ellipsisheads[c]:
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2262 addroot(head, c)
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2263 return visitnodes, relevant_nodes, ellipsisroots
7e66e7999bdd exchange: move _computeellipsis() from narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38830 diff changeset	2264
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2265
35783 c97639ad6874 bundle2: specify what capabilities will be used for Gregory Szorc <gregory.szorc@gmail.com> parents: 35765 diff changeset	2266 def caps20to10(repo, role):
21645 aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	2267 """return a set with appropriate options to use bundle20 during getbundle"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2268 caps = {b'HG20'}
35783 c97639ad6874 bundle2: specify what capabilities will be used for Gregory Szorc <gregory.szorc@gmail.com> parents: 35765 diff changeset	2269 capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=role))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2270 caps.add(b'bundle2=' + urlreq.quote(capsblob))
21645 aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	2271 return caps
aed14bb165f3 bundle2: introduce a ``caps20to10`` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 21644 diff changeset	2272
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2273
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2274 # 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	2275 getbundle2partsorder = []
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2276
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2277 # Mapping between step name and function
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2278 #
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2279 # 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	2280 getbundle2partsmapping = {}
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2281
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2282
24732 8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	2283 def getbundle2partsgenerator(stepname, idx=None):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2284 """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	2285
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2286 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	2287 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	2288 (this may matter).
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2289
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2290 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	2291 from an extension, attack the getbundle2partsmapping dictionary directly."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2292
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2293 def dec(func):
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2294 assert stepname not in getbundle2partsmapping
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2295 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	2296 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	2297 getbundle2partsorder.append(stepname)
8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	2298 else:
8f70b529cb0c bundle2: add an 'idx' argument to the 'getbundle2partsgenerator' Pierre-Yves David <pierre-yves.david@fb.com> parents: 24731 diff changeset	2299 getbundle2partsorder.insert(idx, stepname)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2300 return func
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2301
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2302 return dec
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2303
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2304
27244 709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	2305 def bundle2requested(bundlecaps):
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	2306 if bundlecaps is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2307 return any(cap.startswith(b'HG2') for cap in bundlecaps)
27244 709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	2308 return False
709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	2309
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2310
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2311 def getbundlechunks(
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2312 repo,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2313 source,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2314 heads=None,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2315 common=None,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2316 bundlecaps=None,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2317 remote_sidedata=None,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2318 **kwargs
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2319 ):
30187 3e86261bf110 exchange: refactor APIs to obtain bundle data (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 30068 diff changeset	2320 """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	2321
24686 e0e28e910fa3 bundle2: rename format, parts and config to final names Pierre-Yves David <pierre-yves.david@fb.com> parents: 24650 diff changeset	2322 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	2323 passed.
20954 dba91f8060eb bundle2: add an exchange.getbundle function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20933 diff changeset	2324
35785 ba15580e53d5 exchange: return bundle info from getbundlechunks() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35784 diff changeset	2325 Returns a 2-tuple of a dict with metadata about the generated bundle
ba15580e53d5 exchange: return bundle info from getbundlechunks() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35784 diff changeset	2326 and 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	2327 """
33032 4e6dc34b5d7a py3: convert kwargs keys' back to bytes using pycompat.byteskwargs() Pulkit Goyal <7895pulkit@gmail.com> parents: 33007 diff changeset	2328 kwargs = pycompat.byteskwargs(kwargs)
35785 ba15580e53d5 exchange: return bundle info from getbundlechunks() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35784 diff changeset	2329 info = {}
27244 709977a4fc9d exchange: standalone function to determine if bundle2 is requested Gregory Szorc <gregory.szorc@gmail.com> parents: 26935 diff changeset	2330 usebundle2 = bundle2requested(bundlecaps)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2331 # 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	2332 if not usebundle2:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2333 if bundlecaps and not kwargs.get(b'cg', True):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2334 raise ValueError(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2335 _(b'request for bundle10 must include changegroup')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2336 )
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2337
21656 36200dc6b3bd getbundle: raise error if extra arguments are provided for bundle10 Pierre-Yves David <pierre-yves.david@fb.com> parents: 21654 diff changeset	2338 if kwargs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2339 raise ValueError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2340 _(b'unsupported getbundle arguments: %s')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2341 % b', '.join(sorted(kwargs.keys()))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2342 )
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	2343 outgoing = _computeoutgoing(repo, heads, common)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2344 info[b'bundleversion'] = 1
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2345 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2346 info,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2347 changegroup.makestream(
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2348 repo,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2349 outgoing,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2350 b'01',
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2351 source,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2352 bundlecaps=bundlecaps,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2353 remote_sidedata=remote_sidedata,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2354 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2355 )
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2356
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2357 # bundle20 case
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2358 info[b'bundleversion'] = 2
21143 5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	2359 b2caps = {}
5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	2360 for bcaps in bundlecaps:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2361 if bcaps.startswith(b'bundle2='):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2362 blob = urlreq.unquote(bcaps[len(b'bundle2=') :])
21143 5bb5d4ba14e5 bundle2: transmit capabilities to getbundle during pull Pierre-Yves David <pierre-yves.david@fb.com> parents: 21142 diff changeset	2363 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	2364 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	2365
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2366 kwargs[b'heads'] = heads
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2367 kwargs[b'common'] = common
23218 0e78ea8e592a exchange: prepare kwargs for bundle2 part generation exactly once Mike Edgar <adgar@google.com> parents: 23217 diff changeset	2368
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2369 for name in getbundle2partsorder:
6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2370 func = getbundle2partsmapping[name]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2371 func(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2372 bundler,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2373 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2374 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2375 bundlecaps=bundlecaps,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2376 b2caps=b2caps,
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2377 remote_sidedata=remote_sidedata,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2378 **pycompat.strkwargs(kwargs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2379 )
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2380
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2381 info[b'prefercompressed'] = bundler.prefercompressed
35787 a84dbc87dae9 exchange: send bundle2 stream clones uncompressed Gregory Szorc <gregory.szorc@gmail.com> parents: 35785 diff changeset	2382
35785 ba15580e53d5 exchange: return bundle info from getbundlechunks() (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35784 diff changeset	2383 return info, bundler.getchunks()
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2384
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2385
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2386 @getbundle2partsgenerator(b'stream2')
37169 6f467adf9f05 bundle: add the possibility to bundle a stream v2 part Boris Feld <boris.feld@octobus.net> parents: 37167 diff changeset	2387 def _getbundlestream2(bundler, repo, args, *kwargs):
6f467adf9f05 bundle: add the possibility to bundle a stream v2 part Boris Feld <boris.feld@octobus.net> parents: 37167 diff changeset	2388 return bundle2.addpartbundlestream2(bundler, repo, **kwargs)
35759 c24dad55ac19 bundle2: add support for a 'stream' parameter to 'getbundle' Boris Feld <boris.feld@octobus.net> parents: 35578 diff changeset	2389
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2390
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2391 @getbundle2partsgenerator(b'changegroup')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2392 def _getbundlechangegrouppart(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2393 bundler,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2394 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2395 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2396 bundlecaps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2397 b2caps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2398 heads=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2399 common=None,
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2400 remote_sidedata=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2401 **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2402 ):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2403 """add a changegroup part to the requested bundle"""
43790 44b605638918 exchange: guard against method invocation on `b2caps=None` args Matt Harbison <matt_harbison@yahoo.com> parents: 43789 diff changeset	2404 if not kwargs.get('cg', True) or not b2caps:
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2405 return
afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2406
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2407 version = b'01'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2408 cgversions = b2caps.get(b'changegroup')
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2409 if cgversions: # 3.1 and 3.2 ship with an empty value
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2410 cgversions = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2411 v
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2412 for v in cgversions
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2413 if v in changegroup.supportedoutgoingversions(repo)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2414 ]
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2415 if not cgversions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2416 raise error.Abort(_(b'no common changegroup version'))
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2417 version = max(cgversions)
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2418
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2419 outgoing = _computeoutgoing(repo, heads, common)
afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2420 if not outgoing.missing:
afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2421 return
afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2422
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2423 if kwargs.get('narrow', False):
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2424 include = sorted(filter(bool, kwargs.get('includepats', [])))
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2425 exclude = sorted(filter(bool, kwargs.get('excludepats', [])))
40344 2c5835b4246b narrow: when widening, don't include manifests the client already has Martin von Zweigbergk <martinvonz@google.com> parents: 40337 diff changeset	2426 matcher = narrowspec.match(repo.root, include=include, exclude=exclude)
38848 d99083996398 exchange: move simple narrow changegroup generation from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38847 diff changeset	2427 else:
40344 2c5835b4246b narrow: when widening, don't include manifests the client already has Martin von Zweigbergk <martinvonz@google.com> parents: 40337 diff changeset	2428 matcher = None
38848 d99083996398 exchange: move simple narrow changegroup generation from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38847 diff changeset	2429
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2430 cgstream = changegroup.makestream(
46724 a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2431 repo,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2432 outgoing,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2433 version,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2434 source,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2435 bundlecaps=bundlecaps,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2436 matcher=matcher,
a41565bef69f changegroup: add v4 changegroup for revlog v2 exchange Rapha?l Gom?s <rgomes@octobus.net> parents: 46537 diff changeset	2437 remote_sidedata=remote_sidedata,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2438 )
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2439
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2440 part = bundler.newpart(b'changegroup', data=cgstream)
38832 afb442f58cbf exchange: refactor control flow of _getbundlechangegrouppart() Gregory Szorc <gregory.szorc@gmail.com> parents: 38831 diff changeset	2441 if cgversions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2442 part.addparam(b'version', version)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2443
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2444 part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2445
45558 10284ce3d5ed scmutil: introduce function to check whether repo uses treemanifest or not Pulkit Goyal <7895pulkit@gmail.com> parents: 45392 diff changeset	2446 if scmutil.istreemanifest(repo):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2447 part.addparam(b'treemanifest', b'1')
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2448
47237 19d4802cb304 sidedata: add a 'side-data' repository feature and use it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	2449 if repository.REPO_FEATURE_SIDE_DATA in repo.features:
43131 c17a63eb5d4c sidedata: apply basic but tight security around exchange Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	2450 part.addparam(b'exp-sidedata', b'1')
46726 bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	2451 sidedata = bundle2.format_remote_wanted_sidedata(repo)
bc2519513ae0 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos Rapha?l Gom?s <rgomes@octobus.net> parents: 46724 diff changeset	2452 part.addparam(b'exp-wanted-sidedata', sidedata)
43131 c17a63eb5d4c sidedata: apply basic but tight security around exchange Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	2453
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2454 if (
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2455 kwargs.get('narrow', False)
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2456 and kwargs.get('narrow_acl', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2457 and (include or exclude)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2458 ):
42158 280f7a095df8 narrow: send specs as bundle2 data instead of param (issue5952) (issue6019) Pulkit Goyal <pulkit@yandex-team.ru> parents: 42057 diff changeset	2459 # this is mandatory because otherwise ACL clients won't work
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2460 narrowspecpart = bundler.newpart(b'Narrow:responsespec')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2461 narrowspecpart.data = b'%s\0%s' % (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2462 b'\n'.join(include),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2463 b'\n'.join(exclude),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2464 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2465
38848 d99083996398 exchange: move simple narrow changegroup generation from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38847 diff changeset	2466
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2467 @getbundle2partsgenerator(b'bookmarks')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2468 def _getbundlebookmarkpart(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2469 bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2470 ):
35276 cb4dcd7fabe7 getbundle: add support for 'bookmarks' boolean argument Boris Feld <boris.feld@octobus.net> parents: 35273 diff changeset	2471 """add a bookmark part to the requested bundle"""
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2472 if not kwargs.get('bookmarks', False):
35276 cb4dcd7fabe7 getbundle: add support for 'bookmarks' boolean argument Boris Feld <boris.feld@octobus.net> parents: 35273 diff changeset	2473 return
43790 44b605638918 exchange: guard against method invocation on `b2caps=None` args Matt Harbison <matt_harbison@yahoo.com> parents: 43789 diff changeset	2474 if not b2caps or b'bookmarks' not in b2caps:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2475 raise error.Abort(_(b'no common bookmarks exchange method'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2476 books = bookmod.listbinbookmarks(repo)
46793 6266d19556ad node: introduce nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46726 diff changeset	2477 data = bookmod.binaryencode(repo, books)
35276 cb4dcd7fabe7 getbundle: add support for 'bookmarks' boolean argument Boris Feld <boris.feld@octobus.net> parents: 35273 diff changeset	2478 if data:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2479 bundler.newpart(b'bookmarks', data=data)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2480
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2481
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2482 @getbundle2partsgenerator(b'listkeys')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2483 def _getbundlelistkeysparts(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2484 bundler, repo, source, bundlecaps=None, b2caps=None, **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2485 ):
22542 6b180a0c703e bundle2: separate bundle10 and bundle2 cases in getbundle() Mike Hommey <mh@glandium.org> parents: 22541 diff changeset	2486 """add parts containing listkeys namespaces to the requested bundle"""
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2487 listkeys = kwargs.get('listkeys', ())
21657 0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	2488 for namespace in listkeys:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2489 part = bundler.newpart(b'listkeys')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2490 part.addparam(b'namespace', namespace)
21657 0ff44e06275d getbundle: support of listkeys argument when bundle2 is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 21656 diff changeset	2491 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	2492 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	2493
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2494
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2495 @getbundle2partsgenerator(b'obsmarkers')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2496 def _getbundleobsmarkerpart(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2497 bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2498 ):
22541 4e1a80c022a4 bundle2: pass b2caps down to functions adding bundle2 parts for getbundle Mike Hommey <mh@glandium.org> parents: 22390 diff changeset	2499 """add an obsolescence markers part to the requested bundle"""
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2500 if kwargs.get('obsmarkers', False):
22353 47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	2501 if heads is None:
47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	2502 heads = repo.heads()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2503 subset = [c.node() for c in repo.set(b'::%ln', heads)]
22353 47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	2504 markers = repo.obsstore.relevantmarkers(subset)
43426 e513e87b0476 py3: fix sorting of obsolete markers in obsutil (issue6217) Denis Laxalde <denis@laxalde.org> parents: 43278 diff changeset	2505 markers = obsutil.sortedmarkers(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	2506 bundle2.buildobsmarkerspart(bundler, markers)
22353 47e3420ae889 getbundle: add `obsmarkers` argument to getbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 22352 diff changeset	2507
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2508
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2509 @getbundle2partsgenerator(b'phases')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2510 def _getbundlephasespart(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2511 bundler, repo, source, bundlecaps=None, b2caps=None, heads=None, **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2512 ):
34329 10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2513 """add phase heads part to the requested bundle"""
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2514 if kwargs.get('phases', False):
43813 0f6782df1100 exchange: replace a "not x in ys" by more Pythonic "x not in ys" Martin von Zweigbergk <martinvonz@google.com> parents: 43790 diff changeset	2515 if not b2caps or b'heads' not in b2caps.get(b'phases'):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2516 raise error.Abort(_(b'no common phases exchange method'))
34329 10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2517 if heads is None:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2518 heads = repo.heads()
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2519
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2520 headsbyphase = collections.defaultdict(set)
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2521 if repo.publishing():
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2522 headsbyphase[phases.public] = heads
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2523 else:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2524 # find the appropriate heads to move
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2525
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2526 phase = repo._phasecache.phase
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2527 node = repo.changelog.node
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2528 rev = repo.changelog.rev
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2529 for h in heads:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2530 headsbyphase[phase(repo, rev(h))].add(h)
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2531 seenphases = list(headsbyphase.keys())
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2532
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2533 # We do not handle anything but public and draft phase for now)
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2534 if seenphases:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2535 assert max(seenphases) <= phases.draft
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2536
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2537 # if client is pulling non-public changesets, we need to find
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2538 # intermediate public heads.
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2539 draftheads = headsbyphase.get(phases.draft, set())
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2540 if draftheads:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2541 publicheads = headsbyphase.get(phases.public, set())
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2542
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2543 revset = b'heads(only(%ln, %ln) and public())'
34329 10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2544 extraheads = repo.revs(revset, draftheads, publicheads)
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2545 for r in extraheads:
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2546 headsbyphase[phases.public].add(node(r))
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2547
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2548 # transform data in a format used by the encoding function
45117 b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	2549 phasemapping = {
b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	2550 phase: sorted(headsbyphase[phase]) for phase in phases.allphases
b1e51ef4e536 phases: sparsify phase lists Joerg Sonnenberger <joerg@bec.de> parents: 45063 diff changeset	2551 }
34329 10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2552
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2553 # generate the actual part
10e162bb9bf5 pull: use 'phase-heads' to retrieve phase information Boris Feld <boris.feld@octobus.net> parents: 34324 diff changeset	2554 phasedata = phases.binaryencode(phasemapping)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2555 bundler.newpart(b'phase-heads', data=phasedata)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2556
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2557
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2558 @getbundle2partsgenerator(b'hgtagsfnodes')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2559 def _getbundletagsfnodes(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2560 bundler,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2561 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2562 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2563 bundlecaps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2564 b2caps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2565 heads=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2566 common=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2567 **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2568 ):
25402 0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2569 """Transfer the .hgtags filenodes mapping.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2570
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2571 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	2572
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2573 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	2574 filenodes raw values.
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2575 """
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2576 # Don't send unless:
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2577 # - changeset are being exchanged,
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2578 # - the client supports it.
43790 44b605638918 exchange: guard against method invocation on `b2caps=None` args Matt Harbison <matt_harbison@yahoo.com> parents: 43789 diff changeset	2579 if not b2caps or not (kwargs.get('cg', True) and b'hgtagsfnodes' in b2caps):
25402 0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2580 return
0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2581
29819 8d226db31f20 computeoutgoing: move the function from 'changegroup' to 'exchange' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29818 diff changeset	2582 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	2583 bundle2.addparttagsfnodescache(repo, bundler, outgoing)
25402 0c2ded041d10 exchange: support transferring .hgtags fnodes mapping Gregory Szorc <gregory.szorc@gmail.com> parents: 25369 diff changeset	2584
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2585
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2586 @getbundle2partsgenerator(b'cache:rev-branch-cache')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2587 def _getbundlerevbranchcache(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2588 bundler,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2589 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2590 source,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2591 bundlecaps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2592 b2caps=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2593 heads=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2594 common=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2595 **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2596 ):
36972 c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2597 """Transfer the rev-branch-cache mapping
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2598
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2599 The payload is a series of data related to each branch
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2600
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2601 1) branch name length
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2602 2) number of open heads
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2603 3) number of closed heads
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2604 4) open heads nodes
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2605 5) closed heads nodes
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2606 """
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2607 # Don't send unless:
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2608 # - changeset are being exchanged,
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2609 # - the client supports it.
38829 9b64b73d702b exchange: move disabling of rev-branch-cache bundle part out of narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38615 diff changeset	2610 # - narrow bundle isn't in play (not currently compatible).
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2611 if (
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2612 not kwargs.get('cg', True)
43790 44b605638918 exchange: guard against method invocation on `b2caps=None` args Matt Harbison <matt_harbison@yahoo.com> parents: 43789 diff changeset	2613 or not b2caps
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2614 or b'rev-branch-cache' not in b2caps
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43278 diff changeset	2615 or kwargs.get('narrow', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2616 or repo.ui.has_section(_NARROWACL_SECTION)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2617 ):
36972 c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2618 return
38829 9b64b73d702b exchange: move disabling of rev-branch-cache bundle part out of narrow Gregory Szorc <gregory.szorc@gmail.com> parents: 38615 diff changeset	2619
36972 c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2620 outgoing = _computeoutgoing(repo, heads, common)
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2621 bundle2.addpartrevbranchcache(repo, bundler, outgoing)
c0e90df1ab1e revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Boris Feld <boris.feld@octobus.net> parents: 36944 diff changeset	2622
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2623
20967 984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	2624 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	2625 """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	2626
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	2627 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	2628 """
984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	2629 heads = repo.heads()
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43919 diff changeset	2630 heads_hash = hashutil.sha1(b''.join(sorted(heads))).digest()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2631 if not (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2632 their_heads == [b'force']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2633 or their_heads == heads
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2634 or their_heads == [b'hashed', heads_hash]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2635 ):
20967 984850270acb unbundle: extract checkheads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20956 diff changeset	2636 # 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	2637 # were transferring data
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2638 raise error.PushRaced(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	2639 b'repository changed while %s - please try again' % context
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2640 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2641
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2642
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2643 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	2644 """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	2645
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2646 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	2647 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	2648 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	2649
33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2650 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	2651 r = 0
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21043 diff changeset	2652 # 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	2653 # [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	2654 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	2655 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	2656 # quick fix for output mismatch with bundle2 in 3.4
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2657 captureoutput = repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2658 b'experimental', b'bundle2-output-capture'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2659 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2660 if url.startswith(b'remote:http:') or url.startswith(b'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	2661 captureoutput = True
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2662 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	2663 # 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	2664 # 'check_heads' call wil be a no-op
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2665 check_heads(repo, heads, b'uploading changes')
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2666 # push can proceed
32909 7e2eb964a561 exchange: switch to usual way of testing for bundle2-ness Martin von Zweigbergk <martinvonz@google.com> parents: 32863 diff changeset	2667 if not isinstance(cg, bundle2.unbundle20):
30904 c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	2668 # legacy case: bundle1 (changegroup 01)
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	2669 txnname = b"\n".join([source, urlutil.hidepassword(url)])
32948 af31d531dda0 changegroup: let callers pass in transaction to apply() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32945 diff changeset	2670 with repo.lock(), repo.transaction(txnname) as tr:
33055 18c2489ac96d bundle: make applybundle() delegate v1 bundles to applybundle1() Martin von Zweigbergk <martinvonz@google.com> parents: 33052 diff changeset	2671 op = bundle2.applybundle(repo, cg, tr, source, url)
33052 2baef42a2881 bundle: make applybundle1() return a bundleoperation Martin von Zweigbergk <martinvonz@google.com> parents: 33051 diff changeset	2672 r = bundle2.combinechangegroupresults(op)
30904 c5bee6aa4971 unbundle: swap conditional branches for clarity Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30903 diff changeset	2673 else:
24795 f9aa4cb8f2dd bundle2: store the salvaged output on the exception object Pierre-Yves David <pierre-yves.david@fb.com> parents: 24754 diff changeset	2674 r = None
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	2675 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2676
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2677 def gettransaction():
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2678 if not lockandtr[2]:
42348 5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	2679 if not bookmod.bookmarksinstore(repo):
5d4ec64a6fcb exchange: don't take wlock if bookmarks are stored in .hg/store/ Martin von Zweigbergk <martinvonz@google.com> parents: 42158 diff changeset	2680 lockandtr[0] = repo.wlock()
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2681 lockandtr[1] = repo.lock()
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2682 lockandtr[2] = repo.transaction(source)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2683 lockandtr[2].hookargs[b'source'] = source
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2684 lockandtr[2].hookargs[b'url'] = url
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2685 lockandtr[2].hookargs[b'bundle2'] = b'1'
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2686 return lockandtr[2]
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2687
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2688 # 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	2689 # locking.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2690 if not repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2691 b'experimental', b'bundle2lazylocking'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2692 ):
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2693 gettransaction()
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2694
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2695 op = bundle2.bundleoperation(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2696 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2697 gettransaction,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2698 captureoutput=captureoutput,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2699 source=b'push',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2700 )
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	2701 try:
25896 6805a4f76cda exchange: fix dead assignment Martin von Zweigbergk <martinvonz@google.com> parents: 25895 diff changeset	2702 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	2703 finally:
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	2704 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	2705 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	2706 repo.ui.pushbuffer(error=True, subproc=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2707
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	2708 def recordout(output):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2709 r.newpart(b'output', data=output, mandatory=False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2710
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2711 if lockandtr[2] is not None:
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2712 lockandtr[2].close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25640 diff changeset	2713 except BaseException as exc:
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	2714 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	2715 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	2716 parts = exc._bundle2salvagedoutput = r.salvageoutput()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2717
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	2718 def recordout(output):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2719 part = bundle2.bundlepart(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2720 b'output', data=output, mandatory=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2721 )
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24795 diff changeset	2722 parts.append(part)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2723
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21184 diff changeset	2724 raise
20968 33d5fdd9bd99 unbundle: extract the core logic in another function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20967 diff changeset	2725 finally:
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 26471 diff changeset	2726 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	2727 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	2728 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	2729 return r
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2730
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2731
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2732 def _maybeapplyclonebundle(pullop):
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2733 """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	2734
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2735 repo = pullop.repo
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2736 remote = pullop.remote
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2737
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2738 if not repo.ui.configbool(b'ui', b'clonebundles'):
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2739 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2740
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	2741 # 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	2742 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	2743 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	2744
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2745 if pullop.heads:
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2746 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2747
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2748 if not remote.capable(b'clonebundles'):
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2749 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2750
37649 a168799687e5 wireproto: properly call clonebundles command Gregory Szorc <gregory.szorc@gmail.com> parents: 37648 diff changeset	2751 with remote.commandexecutor() as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2752 res = e.callcommand(b'clonebundles', {}).result()
26689 2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	2753
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	2754 # 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	2755 # attempt.
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	2756 pullop.clonebundleattempted = True
2c9f15366982 exchange: record that we attempted to fetch a clone bundle Gregory Szorc <gregory.szorc@gmail.com> parents: 26688 diff changeset	2757
45807 74271829ddc0 clonebundles: move a bundle of clone bundle related code to a new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45681 diff changeset	2758 entries = bundlecaches.parseclonebundlesmanifest(repo, res)
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2759 if not entries:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2760 repo.ui.note(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2761 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2762 b'no clone bundles available on remote; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2763 b'falling back to regular clone\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2764 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2765 )
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2766 return
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2767
45807 74271829ddc0 clonebundles: move a bundle of clone bundle related code to a new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45681 diff changeset	2768 entries = bundlecaches.filterclonebundleentries(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2769 repo, entries, streamclonerequested=pullop.streamclonerequested
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2770 )
34365 ff406f3e57b2 exchange: perform stream clone with clone bundle with --uncompressed Gregory Szorc <gregory.szorc@gmail.com> parents: 34330 diff changeset	2771
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	2772 if not entries:
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	2773 # 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	2774 # 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	2775 # 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	2776 # 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	2777 # clone!
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2778 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2779 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2780 b'no compatible clone bundles available on server; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2781 b'falling back to regular clone\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2782 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2783 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2784 repo.ui.warn(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	2785 _(b'(you may want to report this to the server operator)\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2786 )
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	2787 return
74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	2788
45807 74271829ddc0 clonebundles: move a bundle of clone bundle related code to a new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45681 diff changeset	2789 entries = bundlecaches.sortclonebundleentries(repo.ui, entries)
26644 74de1c59f71c clonebundles: filter on bundle specification Gregory Szorc <gregory.szorc@gmail.com> parents: 26643 diff changeset	2790
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2791 url = entries[0][b'URL']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2792 repo.ui.status(_(b'applying clone bundle from %s\n') % url)
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2793 if trypullbundlefromurl(repo.ui, repo, url):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2794 repo.ui.status(_(b'finished applying clone bundle\n'))
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2795 # Bundle failed.
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2796 #
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2797 # 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	2798 # 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	2799 # clone load to be offloaded.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2800 elif repo.ui.configbool(b'ui', b'clonebundlefallback'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2801 repo.ui.warn(_(b'falling back to normal clone\n'))
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2802 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2803 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2804 _(b'error applying bundle'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2805 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2806 b'if this error persists, consider contacting '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2807 b'the server operator or disable clone '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2808 b'bundles via '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2809 b'"--config ui.clonebundles=false"'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2810 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2811 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2812
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2813
5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2814 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	2815 """Attempt to apply a bundle from a URL."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2816 with repo.lock(), repo.transaction(b'bundleurl') as tr:
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2817 try:
32861 a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2818 fh = urlmod.open(ui, url)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2819 cg = readbundle(ui, fh, b'stream')
26643 d2e16419d3f4 clonebundle: support bundle2 Gregory Szorc <gregory.szorc@gmail.com> parents: 26640 diff changeset	2820
33055 18c2489ac96d bundle: make applybundle() delegate v1 bundles to applybundle1() Martin von Zweigbergk <martinvonz@google.com> parents: 33052 diff changeset	2821 if isinstance(cg, streamclone.streamcloneapplier):
32861 a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2822 cg.apply(repo)
a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2823 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2824 bundle2.applybundle(repo, cg, tr, b'clonebundles', url)
32861 a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2825 return True
a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2826 except urlerr.httperror as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2827 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2828 _(b'HTTP error fetching bundle: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2829 % stringutil.forcebytestr(e)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2830 )
32861 a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2831 except urlerr.urlerror as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2832 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2833 _(b'error fetching bundle: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2834 % stringutil.forcebytestr(e.reason)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42929 diff changeset	2835 )
26623 5a95fe44121d clonebundles: support for seeding clones from pre-generated bundles Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	2836
32861 a470bbb4e3af clonebundle: use context managers for lock and transaction Martin von Zweigbergk <martinvonz@google.com> parents: 32729 diff changeset	2837 return False

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/exchange.py @ 48591:ad0c6bf6f02e