This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4539

exchange: support defining narrow file patterns for pull
ClosedPublic

Authored by indygreg on Sep 11 2018, 8:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG130e5df346d5: exchange: support defining narrow file patterns for pull
Summary

This commit teaches exchange.pull() about the desire to perform a
narrow file pull. We simply pass include and exclude patterns to
the function. The values are validated and stored on the pulloperation
instance.

hg.clone() has been taught to pass these arguments to exchange.pull().

If the arguments are not passed to exchange.pull(), the active narrow
patterns from the repository will automatically be used. We /could/
always use the narrow patterns from the repo. However, allowing
explicit values to be passed in allows us to perform data fetching
that doesn't necessarily align with the repo configuration. This
provides more flexibility.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 11 2018, 8:27 PM
Closed by commit rHG130e5df346d5: exchange: support defining narrow file patterns for pull (authored by indygreg). · Explain WhySep 12 2018, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (25 lines)
Mmercurial/hg.py (4 lines)

Diff 10929

mercurial/exchange.py

It purpose is to carry pull related state and very common operation. It purpose is to carry pull related state and very common operation.
A new should be created at the beginning of each pull and discarded A new should be created at the beginning of each pull and discarded
afterward. afterward.
""" """
def __init__(self, repo, remote, heads=None, force=False, bookmarks=(), def __init__(self, repo, remote, heads=None, force=False, bookmarks=(),
remotebookmarks=None, streamclonerequested=None): remotebookmarks=None, streamclonerequested=None,
includepats=None, excludepats=None):
# repo we pull into # repo we pull into
self.repo = repo self.repo = repo
# repo we pull from # repo we pull from
self.remote = remote self.remote = remote
# revision we try to pull (None is "all") # revision we try to pull (None is "all")
self.heads = heads self.heads = heads
# bookmark pulled explicitly # bookmark pulled explicitly
self.explicitbookmarks = [repo._bookmarks.expandname(bookmark) self.explicitbookmarks = [repo._bookmarks.expandname(bookmark)
# remote bookmarks data # remote bookmarks data
self.remotebookmarks = remotebookmarks self.remotebookmarks = remotebookmarks
# result of changegroup pulling (used as return code by pull) # result of changegroup pulling (used as return code by pull)
self.cgresult = None self.cgresult = None
# list of step already done # list of step already done
self.stepsdone = set() self.stepsdone = set()
# Whether we attempted a clone from pre-generated bundles. # Whether we attempted a clone from pre-generated bundles.
self.clonebundleattempted = False self.clonebundleattempted = False
# Set of file patterns to include.
self.includepats = includepats
# Set of file patterns to exclude.
self.excludepats = excludepats
@util.propertycache @util.propertycache
def pulledsubset(self): def pulledsubset(self):
"""heads of the set of changeset target by the pull""" """heads of the set of changeset target by the pull"""
# compute target subset # compute target subset
if self.heads is None: if self.heads is None:
# We pulled every thing possible # We pulled every thing possible
# sync on everything common # sync on everything common
break break
if all(unficl.hasnode(n) for n in pullop.rheads): if all(unficl.hasnode(n) for n in pullop.rheads):
break break
new_heads = headsofdiff(unficl.heads(), old_heads) new_heads = headsofdiff(unficl.heads(), old_heads)
pullop.common = headsofunion(new_heads, pullop.common) pullop.common = headsofunion(new_heads, pullop.common)
pullop.rheads = set(pullop.rheads) - pullop.common pullop.rheads = set(pullop.rheads) - pullop.common
def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None, def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None,
streamclonerequested=None): streamclonerequested=None, includepats=None, excludepats=None):
"""Fetch repository data from a remote. """Fetch repository data from a remote.
This is the main function used to retrieve data from a remote repository. This is the main function used to retrieve data from a remote repository.
``repo`` is the local repository to clone into. ``repo`` is the local repository to clone into.
``remote`` is a peer instance. ``remote`` is a peer instance.
``heads`` is an iterable of revisions we want to pull. ``None`` (the ``heads`` is an iterable of revisions we want to pull. ``None`` (the
default) means to pull everything from the remote. default) means to pull everything from the remote.
``bookmarks`` is an iterable of bookmarks requesting to be pulled. By ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By
default, all remote bookmarks are pulled. default, all remote bookmarks are pulled.
``opargs`` are additional keyword arguments to pass to ``pulloperation`` ``opargs`` are additional keyword arguments to pass to ``pulloperation``
initialization. initialization.
``streamclonerequested`` is a boolean indicating whether a "streaming ``streamclonerequested`` is a boolean indicating whether a "streaming
clone" is requested. A "streaming clone" is essentially a raw file copy clone" is requested. A "streaming clone" is essentially a raw file copy
of revlogs from the server. This only works when the local repository is of revlogs from the server. This only works when the local repository is
empty. The default value of ``None`` means to respect the server empty. The default value of ``None`` means to respect the server
configuration for preferring stream clones. configuration for preferring stream clones.
``includepats`` and ``excludepats`` define explicit file patterns to
include and exclude in storage, respectively. If not defined, narrow
patterns from the repo instance are used, if available.
Returns the ``pulloperation`` created for this pull. Returns the ``pulloperation`` created for this pull.
""" """
if opargs is None: if opargs is None:
opargs = {} opargs = {}
# We allow the narrow patterns to be passed in explicitly to provide more
# flexibility for API consumers.
if includepats or excludepats:
includepats = includepats or set()
excludepats = excludepats or set()
else:
includepats, excludepats = repo.narrowpats
narrowspec.validatepatterns(includepats)
narrowspec.validatepatterns(excludepats)
pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks,
streamclonerequested=streamclonerequested, streamclonerequested=streamclonerequested,
includepats=includepats, excludepats=excludepats,
**pycompat.strkwargs(opargs)) **pycompat.strkwargs(opargs))
peerlocal = pullop.remote.local() peerlocal = pullop.remote.local()
if peerlocal: if peerlocal:
missing = set(peerlocal.requirements) - pullop.repo.supported missing = set(peerlocal.requirements) - pullop.repo.supported
if missing: if missing:
msg = _("required features are not" msg = _("required features are not"
" supported in the destination:" " supported in the destination:"

mercurial/hg.py

if pull: if pull:
stream = False stream = False
else: else:
stream = None stream = None
# internal config: ui.quietbookmarkmove # internal config: ui.quietbookmarkmove
overrides = {('ui', 'quietbookmarkmove'): True} overrides = {('ui', 'quietbookmarkmove'): True}
with local.ui.configoverride(overrides, 'clone'): with local.ui.configoverride(overrides, 'clone'):
exchange.pull(local, srcpeer, revs, exchange.pull(local, srcpeer, revs,
streamclonerequested=stream) streamclonerequested=stream,
includepats=storeincludepats,
excludepats=storeexcludepats)
elif srcrepo: elif srcrepo:
# TODO lift restriction once exchange.push() accepts narrow # TODO lift restriction once exchange.push() accepts narrow
# push. # push.
if narrow: if narrow:
raise error.Abort(_('narrow clone not available for ' raise error.Abort(_('narrow clone not available for '
'remote destinations')) 'remote destinations'))
exchange.push(srcrepo, destpeer, revs=revs, exchange.push(srcrepo, destpeer, revs=revs,