| hg-reviewers |
Upcoming commits will teach exchangev2 how to perform a shallow
clone. This commit teaches hg.clone(), exchange.pull(), and
exchange.pulloperation to recognize a request for a shallow clone
by having the caller specify a numeric depth of the maximum number of
ancestor changesets to fetch.
There are certainly other ways we could control shallow-ness. But this
one is simple to implement and is also how the narrow extension
controls things. So it seems to make sense to start here.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/exchange.py (11 lines) | |||
| M | mercurial/hg.py (5 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Sep 14 2018, 5:56 PM |
| 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): | includepats=None, excludepats=None, depth=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) | ||||
| # 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. | # Set of file patterns to include. | ||||
| self.includepats = includepats | self.includepats = includepats | ||||
| # Set of file patterns to exclude. | # Set of file patterns to exclude. | ||||
| self.excludepats = excludepats | self.excludepats = excludepats | ||||
| # Number of ancestor changesets to pull from each pulled head. | |||||
| self.depth = depth | |||||
| @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, includepats=None, excludepats=None): | streamclonerequested=None, includepats=None, excludepats=None, | ||||
| depth=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 | ``includepats`` and ``excludepats`` define explicit file patterns to | ||||
| include and exclude in storage, respectively. If not defined, narrow | include and exclude in storage, respectively. If not defined, narrow | ||||
| patterns from the repo instance are used, if available. | patterns from the repo instance are used, if available. | ||||
| ``depth`` is an integer indicating the DAG depth of history we're | |||||
| interested in. If defined, for each revision specified in ``heads``, we | |||||
| will fetch up to this many of its ancestors and data associated with them. | |||||
| 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 | # We allow the narrow patterns to be passed in explicitly to provide more | ||||
| # flexibility for API consumers. | # flexibility for API consumers. | ||||
| if includepats or excludepats: | if includepats or excludepats: | ||||
| includepats = includepats or set() | includepats = includepats or set() | ||||
| excludepats = excludepats or set() | excludepats = excludepats or set() | ||||
| else: | else: | ||||
| includepats, excludepats = repo.narrowpats | includepats, excludepats = repo.narrowpats | ||||
| narrowspec.validatepatterns(includepats) | narrowspec.validatepatterns(includepats) | ||||
| narrowspec.validatepatterns(excludepats) | 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, | includepats=includepats, excludepats=excludepats, | ||||
| depth=depth, | |||||
| **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:" | ||||
| dstbranchcache = os.path.join(dstcachedir, fname) | dstbranchcache = os.path.join(dstcachedir, fname) | ||||
| if os.path.exists(srcbranchcache): | if os.path.exists(srcbranchcache): | ||||
| if not os.path.exists(dstcachedir): | if not os.path.exists(dstcachedir): | ||||
| os.mkdir(dstcachedir) | os.mkdir(dstcachedir) | ||||
| util.copyfile(srcbranchcache, dstbranchcache) | util.copyfile(srcbranchcache, dstbranchcache) | ||||
| def clone(ui, peeropts, source, dest=None, pull=False, revs=None, | def clone(ui, peeropts, source, dest=None, pull=False, revs=None, | ||||
| update=True, stream=False, branch=None, shareopts=None, | update=True, stream=False, branch=None, shareopts=None, | ||||
| storeincludepats=None, storeexcludepats=None): | storeincludepats=None, storeexcludepats=None, depth=None): | ||||
| """Make a copy of an existing repository. | """Make a copy of an existing repository. | ||||
| Create a copy of an existing repository in a new directory. The | Create a copy of an existing repository in a new directory. The | ||||
| source and destination are URLs, as passed to the repository | source and destination are URLs, as passed to the repository | ||||
| function. Returns a pair of repository peers, the source and | function. Returns a pair of repository peers, the source and | ||||
| newly created destination. | newly created destination. | ||||
| The location of the source is added to the new repository's | The location of the source is added to the new repository's | ||||
| 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, | includepats=storeincludepats, | ||||
| excludepats=storeexcludepats) | excludepats=storeexcludepats, | ||||
| depth=depth) | |||||
| 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, | ||||