| durin42 | |
| spectral |
| hg-reviewers |
This patch adds a --narrowspec flag to hg clone command in narrow extension
which can be used to read a file and parse narrowspecs from it and use it while
cloning a repository.
The --narrowspec flag assumes that the user wanted to narrow the clone.
Tests are added both for ellipsis and non-ellipsis mode.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
I'm +1 on this, but I'd like someone else to chime in. @spectral how do you feel about this? It's at least somewhat related to functionality we've added via aliases, right?
In D4156#64662, @durin42 wrote:I'm +1 on this, but I'd like someone else to chime in. @spectral how do you feel about this? It's at least somewhat related to functionality we've added via aliases, right?
I've wanted it a few times; I don't think we have any aliases to do it though, so I'm +1 on it as well.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowcommands.py (25 lines) | |||
| M | tests/test-narrow-clone-no-ellipsis.t (36 lines) | |||
| M | tests/test-narrow-clone.t (36 lines) |
| # narrowcommands.py - command modifications for narrowhg extension | # narrowcommands.py - command modifications for narrowhg extension | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import itertools | import itertools | ||||
| import os | |||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| cmdutil, | cmdutil, | ||||
| commands, | commands, | ||||
| discovery, | discovery, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| extensions, | extensions, | ||||
| hg, | hg, | ||||
| merge, | merge, | ||||
| narrowspec, | narrowspec, | ||||
| node, | node, | ||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repair, | repair, | ||||
| repository, | repository, | ||||
| repoview, | repoview, | ||||
| sparse, | |||||
| util, | util, | ||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| narrowbundle2, | narrowbundle2, | ||||
| ) | ) | ||||
| table = {} | table = {} | ||||
| command = registrar.command(table) | command = registrar.command(table) | ||||
| def setup(): | def setup(): | ||||
| """Wraps user-facing mercurial commands with narrow-aware versions.""" | """Wraps user-facing mercurial commands with narrow-aware versions.""" | ||||
| entry = extensions.wrapcommand(commands.table, 'clone', clonenarrowcmd) | entry = extensions.wrapcommand(commands.table, 'clone', clonenarrowcmd) | ||||
| entry[1].append(('', 'narrow', None, | entry[1].append(('', 'narrow', None, | ||||
| _("create a narrow clone of select files"))) | _("create a narrow clone of select files"))) | ||||
| entry[1].append(('', 'depth', '', | entry[1].append(('', 'depth', '', | ||||
| _("limit the history fetched by distance from heads"))) | _("limit the history fetched by distance from heads"))) | ||||
| entry[1].append(('', 'narrowspec', '', | |||||
| _("read narrowspecs from file"))) | |||||
| # TODO(durin42): unify sparse/narrow --include/--exclude logic a bit | # TODO(durin42): unify sparse/narrow --include/--exclude logic a bit | ||||
| if 'sparse' not in extensions.enabled(): | if 'sparse' not in extensions.enabled(): | ||||
| entry[1].append(('', 'include', [], | entry[1].append(('', 'include', [], | ||||
| _("specifically fetch this file/directory"))) | _("specifically fetch this file/directory"))) | ||||
| entry[1].append( | entry[1].append( | ||||
| ('', 'exclude', [], | ('', 'exclude', [], | ||||
| _("do not fetch this file/directory, even if included"))) | _("do not fetch this file/directory, even if included"))) | ||||
| includepats, excludepats)) | includepats, excludepats)) | ||||
| return set(includepats), set(excludepats) | return set(includepats), set(excludepats) | ||||
| def clonenarrowcmd(orig, ui, repo, *args, **opts): | def clonenarrowcmd(orig, ui, repo, *args, **opts): | ||||
| """Wraps clone command, so 'hg clone' first wraps localrepo.clone().""" | """Wraps clone command, so 'hg clone' first wraps localrepo.clone().""" | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| wrappedextraprepare = util.nullcontextmanager() | wrappedextraprepare = util.nullcontextmanager() | ||||
| opts_narrow = opts['narrow'] | opts_narrow = opts['narrow'] | ||||
| narrowspecfile = opts['narrowspec'] | |||||
| if narrowspecfile: | |||||
| filepath = os.path.join(pycompat.getcwd(), narrowspecfile) | |||||
| ui.status(_("reading narrowspec from '%s'\n") % filepath) | |||||
| try: | |||||
| fp = open(filepath, 'rb') | |||||
| except IOError: | |||||
| raise error.Abort(_("file '%s' not found") % filepath) | |||||
| includes, excludes, profiles = sparse.parseconfig(ui, fp.read(), | |||||
| 'narrow') | |||||
| if profiles: | |||||
| raise error.Abort(_("cannot specify other files using '%include' in" | |||||
| " narrowspec")) | |||||
| # narrowspec is passed so we should assume that user wants narrow clone | |||||
| opts_narrow = True | |||||
| opts['include'].extend(includes) | |||||
| opts['exclude'].extend(excludes) | |||||
| if opts_narrow: | if opts_narrow: | ||||
| def pullbundle2extraprepare_widen(orig, pullop, kwargs): | def pullbundle2extraprepare_widen(orig, pullop, kwargs): | ||||
| # Create narrow spec patterns from clone flags | # Create narrow spec patterns from clone flags | ||||
| includepats = narrowspec.parsepatterns(opts['include']) | includepats = narrowspec.parsepatterns(opts['include']) | ||||
| excludepats = narrowspec.parsepatterns(opts['exclude']) | excludepats = narrowspec.parsepatterns(opts['exclude']) | ||||
| # If necessary, ask the server to expand the narrowspec. | # If necessary, ask the server to expand the narrowspec. | ||||
| includepats, excludepats = expandpull( | includepats, excludepats = expandpull( | ||||
| dir/src/f4 | dir/src/f4 | ||||
| dir/src/f5 | dir/src/f5 | ||||
| dir/src/f6 | dir/src/f6 | ||||
| dir/src/f7 | dir/src/f7 | ||||
| dir/src/f8 | dir/src/f8 | ||||
| dir/src/f9 | dir/src/f9 | ||||
| $ cd .. | $ cd .. | ||||
| Testing the --narrowspec flag to clone | |||||
| $ cat >> narrowspecs <<EOF | |||||
| > %include foo | |||||
| > [include] | |||||
| > path:dir/tests/ | |||||
| > file:dir/src/f12 | |||||
| > EOF | |||||
| $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs | |||||
| reading narrowspec from '$TESTTMP/narrowspecs' | |||||
| abort: cannot specify other files using '%include' in narrowspec | |||||
| [255] | |||||
| $ cat > narrowspecs <<EOF | |||||
| > [include] | |||||
| > path:dir/tests/ | |||||
| > file:dir/src/f12 | |||||
| > EOF | |||||
| $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs | |||||
| reading narrowspec from '$TESTTMP/narrowspecs' | |||||
| requesting all changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 40 changesets with 20 changes to 20 files | |||||
| new changesets 681085829a73:26ce255d5b5d | |||||
| updating to branch default | |||||
| 20 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ cd specfile | |||||
| $ hg tracked | |||||
| I path:dir/tests | |||||
| I path:file:dir/src/f12 | |||||
| $ cd .. | |||||
| dir/tests/t4 | dir/tests/t4 | ||||
| dir/tests/t5 | dir/tests/t5 | ||||
| dir/tests/t6 | dir/tests/t6 | ||||
| dir/tests/t7 | dir/tests/t7 | ||||
| dir/tests/t8 | dir/tests/t8 | ||||
| dir/tests/t9 | dir/tests/t9 | ||||
| $ cd .. | $ cd .. | ||||
| Testing the --narrowspec flag to clone | |||||
| $ cat >> narrowspecs <<EOF | |||||
| > %include foo | |||||
| > [include] | |||||
| > path:dir/tests/ | |||||
| > dir/src/f12 | |||||
| > EOF | |||||
| $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs | |||||
| reading narrowspec from '$TESTTMP/narrowspecs' | |||||
| abort: cannot specify other files using '%include' in narrowspec | |||||
| [255] | |||||
| $ cat > narrowspecs <<EOF | |||||
| > [include] | |||||
| > path:dir/tests/ | |||||
| > file:dir/src/f12 | |||||
| > EOF | |||||
| $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs | |||||
| reading narrowspec from '$TESTTMP/narrowspecs' | |||||
| requesting all changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 21 changesets with 20 changes to 20 files | |||||
| new changesets f93383bb3e99:26ce255d5b5d | |||||
| updating to branch default | |||||
| 20 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ cd specfile | |||||
| $ hg tracked | |||||
| I path:dir/tests | |||||
| I path:file:dir/src/f12 | |||||
| $ cd .. | |||||