This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4538

commands: pass include and exclude options to hg.clone()
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG4c807ec07888: commands: pass include and exclude options to hg.clone()
Summary

These arguments are defined by the narrow extension. Let's teach
core to recognize them so we can delete some code from the narrow
extension and start to exercise the in-core code for performing a
narrow clone.

We have no way of easily testing it, but this change should result in
.hg/requires having the narrow requirement from the time the file
is written rather than added as part of pull. We'll confirm this when
we delete some monkeypatched functions from the narrow extension in
later commits.

Test output changed because hg.clone() is now receiving patterns
and validation of those values is occurring sooner, before the exchange
code runs and prints the message that was deleted.

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 rHG4c807ec07888: commands: pass include and exclude options to hg.clone() (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/commands.py (19 lines)
Mtests/test-narrow-clone.t (3 lines)
Mtests/test-narrow.t (3 lines)

Diff 10928

mercurial/commands.py

filemerge, filemerge,
formatter, formatter,
graphmod, graphmod,
hbisect, hbisect,
help, help,
hg, hg,
logcmdutil, logcmdutil,
merge as mergemod, merge as mergemod,
narrowspec,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
repair, repair,
See :hg:`help urls` for details on specifying URLs. See :hg:`help urls` for details on specifying URLs.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get('noupdate') and opts.get('updaterev'): if opts.get('noupdate') and opts.get('updaterev'):
raise error.Abort(_("cannot specify both --noupdate and --updaterev")) raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
# --include/--exclude can come from narrow or sparse.
includepats, excludepats = None, None
# hg.clone() differentiates between None and an empty set. So make sure
# patterns are sets if narrow is requested without patterns.
if opts.get('narrow'):
includepats = set()
excludepats = set()
if opts.get('include'):
includepats = narrowspec.parsepatterns(opts.get('include'))
if opts.get('exclude'):
excludepats = narrowspec.parsepatterns(opts.get('exclude'))
r = hg.clone(ui, opts, source, dest, r = hg.clone(ui, opts, source, dest,
pull=opts.get('pull'), pull=opts.get('pull'),
stream=opts.get('stream') or opts.get('uncompressed'), stream=opts.get('stream') or opts.get('uncompressed'),
revs=opts.get('rev'), revs=opts.get('rev'),
update=opts.get('updaterev') or not opts.get('noupdate'), update=opts.get('updaterev') or not opts.get('noupdate'),
branch=opts.get('branch'), branch=opts.get('branch'),
shareopts=opts.get('shareopts')) shareopts=opts.get('shareopts'),
storeincludepats=includepats,
storeexcludepats=excludepats)
return r is None return r is None
@command('^commit|ci', @command('^commit|ci',
[('A', 'addremove', None, [('A', 'addremove', None,
_('mark new/missing files as added/removed before committing')), _('mark new/missing files as added/removed before committing')),
('', 'close-branch', None, ('', 'close-branch', None,
_('mark a branch head as closed')), _('mark a branch head as closed')),

tests/test-narrow-clone.t

$ mkdir tests $ mkdir tests
$ cd tests $ cd tests
$ for x in `$TESTDIR/seq.py 20`; do echo $x > "t$x"; hg add "t$x"; hg commit -m "Commit test $x"; done $ for x in `$TESTDIR/seq.py 20`; do echo $x > "t$x"; hg add "t$x"; hg commit -m "Commit test $x"; done
$ cd ../../.. $ cd ../../..
Only path: and rootfilesin: pattern prefixes are allowed Only path: and rootfilesin: pattern prefixes are allowed
$ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --include 'glob:**' $ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --include 'glob:**'
requesting all changes
abort: invalid prefix on narrow pattern: glob:** abort: invalid prefix on narrow pattern: glob:**
(narrow patterns must begin with one of the following: path:, rootfilesin:) (narrow patterns must begin with one of the following: path:, rootfilesin:)
[255] [255]
$ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --exclude 'set:ignored' $ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --exclude 'set:ignored'
requesting all changes
abort: invalid prefix on narrow pattern: set:ignored abort: invalid prefix on narrow pattern: set:ignored
(narrow patterns must begin with one of the following: path:, rootfilesin:) (narrow patterns must begin with one of the following: path:, rootfilesin:)
[255] [255]
narrow clone a file, f10 narrow clone a file, f10
$ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10" $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10"
requesting all changes requesting all changes
10 10
$ cd .. $ cd ..
narrow clone with a newline should fail narrow clone with a newline should fail
$ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10 $ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10
> ' > '
requesting all changes
abort: newlines are not allowed in narrowspec paths abort: newlines are not allowed in narrowspec paths
[255] [255]
narrow clone a directory, tests/, except tests/t19 narrow clone a directory, tests/, except tests/t19
$ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19" $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
requesting all changes requesting all changes
adding changesets adding changesets

tests/test-narrow.t

3: add d3/f 3: add d3/f
2: add d2/f 2: add d2/f
1: add d1/f 1: add d1/f
0: add d0/f 0: add d0/f
$ cd .. $ cd ..
Error if '.' or '..' are in the directory to track. Error if '.' or '..' are in the directory to track.
$ hg clone --narrow ssh://user@dummy/master foo --include ./asdf $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf
requesting all changes
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
$ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. $ hg clone --narrow ssh://user@dummy/master foo --include asdf/..
requesting all changes
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
$ hg clone --narrow ssh://user@dummy/master foo --include a/./c $ hg clone --narrow ssh://user@dummy/master foo --include a/./c
requesting all changes
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
Names with '.' in them are OK. Names with '.' in them are OK.
$ hg clone --narrow ssh://user@dummy/master should-work --include a/.b/c $ hg clone --narrow ssh://user@dummy/master should-work --include a/.b/c
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests