This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9386

errors: raise more specifc errors from narrowcommands
ClosedPublic

Authored by martinvonz on Nov 24 2020, 1:05 PM.

Details

Reviewers
durin42
pulkit
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG6cc269bd1c29: errors: raise more specifc errors from narrowcommands

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 24 2020, 1:05 PM
mharbison72 added a subscriber: mharbison72.Nov 25 2020, 1:29 AM
mharbison72 added inline comments.
hgext/narrow/narrowcommands.py
251–253

StateError?

505–508

StorageError, per the wiki?

pulkit requested changes to this revision.Dec 4 2020, 1:49 PM
pulkit added a subscriber: pulkit.

Requesting changes as I agree with @mharbison72 suggestions here.

hgext/narrow/narrowcommands.py
251–253

+1

505–508

+1

This revision now requires changes to proceed.Dec 4 2020, 1:49 PM
martinvonz marked 2 inline comments as done.Dec 15 2020, 10:48 AM
mharbison72 accepted this revision.Dec 15 2020, 10:59 PM
martinvonz added a commit: rHG6cc269bd1c29: errors: raise more specifc errors from narrowcommands.Dec 15 2020, 11:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6cc269bd1c29: errors: raise more specifc errors from narrowcommands (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24268

hgext/narrow/narrowcommands.py

except IOError as inst: except IOError as inst:
raise error.Abort( raise error.Abort(
_(b"cannot read narrowspecs from '%s': %s") _(b"cannot read narrowspecs from '%s': %s")
% (filepath, encoding.strtolocal(inst.strerror)) % (filepath, encoding.strtolocal(inst.strerror))
) )
includes, excludes, profiles = sparse.parseconfig(ui, fdata, b'narrow') includes, excludes, profiles = sparse.parseconfig(ui, fdata, b'narrow')
if profiles: if profiles:
raise error.Abort( raise error.ConfigError(
_( _(
b"cannot specify other files using '%include' in" b"cannot specify other files using '%include' in"
b" narrowspec" b" narrowspec"
) )
) )
narrowspec.validatepatterns(includes) narrowspec.validatepatterns(includes)
narrowspec.validatepatterns(excludes) narrowspec.validatepatterns(excludes)
else: else:
for n in visibletostrip[:maxnodes]: for n in visibletostrip[:maxnodes]:
ui.status(b'%s\n' % node.short(n)) ui.status(b'%s\n' % node.short(n))
ui.status( ui.status(
_(b'...and %d more, use --verbose to list all\n') _(b'...and %d more, use --verbose to list all\n')
% (len(visibletostrip) - maxnodes) % (len(visibletostrip) - maxnodes)
) )
if not force: if not force:
raise error.Abort( raise error.StateError(
_(b'local changes found'), _(b'local changes found'),
hint=_(b'use --force-delete-local-changes to ignore'), hint=_(b'use --force-delete-local-changes to ignore'),
mharbison72Unsubmitted
Done

StateError?

mharbison72: StateError?
pulkitUnsubmitted
Done

+1

pulkit: +1
) )
with ui.uninterruptible(): with ui.uninterruptible():
if revstostrip: if revstostrip:
tostrip = [unfi.changelog.node(r) for r in revstostrip] tostrip = [unfi.changelog.node(r) for r in revstostrip]
if repo[b'.'].node() in tostrip: if repo[b'.'].node() in tostrip:
# stripping working copy, so move to a different commit first # stripping working copy, so move to a different commit first
urev = max( urev = max(
remove. remove.
--import-rules accepts a path to a file containing rules, allowing you to --import-rules accepts a path to a file containing rules, allowing you to
add --addinclude, --addexclude rules in bulk. Like the other include and add --addinclude, --addexclude rules in bulk. Like the other include and
exclude switches, the changes are applied immediately. exclude switches, the changes are applied immediately.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if requirements.NARROW_REQUIREMENT not in repo.requirements: if requirements.NARROW_REQUIREMENT not in repo.requirements:
raise error.Abort( raise error.InputError(
_( _(
b'the tracked command is only supported on ' b'the tracked command is only supported on '
b'repositories cloned with --narrow' b'repositories cloned with --narrow'
) )
) )
# Before supporting, decide whether it "hg tracked --clear" should mean # Before supporting, decide whether it "hg tracked --clear" should mean
# tracking no paths or all paths. # tracking no paths or all paths.
if opts[b'clear']: if opts[b'clear']:
raise error.Abort(_(b'the --clear option is not yet supported')) raise error.InputError(_(b'the --clear option is not yet supported'))
# import rules from a file # import rules from a file
newrules = opts.get(b'import_rules') newrules = opts.get(b'import_rules')
if newrules: if newrules:
try: try:
filepath = os.path.join(encoding.getcwd(), newrules) filepath = os.path.join(encoding.getcwd(), newrules)
fdata = util.readfile(filepath) fdata = util.readfile(filepath)
except IOError as inst: except IOError as inst:
raise error.Abort( raise error.StorageError(
_(b"cannot read narrowspecs from '%s': %s") _(b"cannot read narrowspecs from '%s': %s")
% (filepath, encoding.strtolocal(inst.strerror)) % (filepath, encoding.strtolocal(inst.strerror))
) )
mharbison72Unsubmitted
Done

StorageError, per the wiki?

mharbison72: StorageError, per the wiki?
pulkitUnsubmitted
Done

+1

pulkit: +1
includepats, excludepats, profiles = sparse.parseconfig( includepats, excludepats, profiles = sparse.parseconfig(
ui, fdata, b'narrow' ui, fdata, b'narrow'
) )
if profiles: if profiles:
raise error.Abort( raise error.InputError(
_( _(
b"including other spec files using '%include' " b"including other spec files using '%include' "
b"is not supported in narrowspec" b"is not supported in narrowspec"
) )
) )
opts[b'addinclude'].extend(includepats) opts[b'addinclude'].extend(includepats)
opts[b'addexclude'].extend(excludepats) opts[b'addexclude'].extend(excludepats)

tests/test-narrow-clone-no-ellipsis.t

> %include foo > %include foo
> [include] > [include]
> path:dir/tests/ > path:dir/tests/
> path:dir/src/f12 > path:dir/src/f12
> EOF > EOF
$ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs
reading narrowspec from '$TESTTMP/narrowspecs' reading narrowspec from '$TESTTMP/narrowspecs'
abort: cannot specify other files using '%include' in narrowspec config error: cannot specify other files using '%include' in narrowspec
[255] [30]
$ cat > narrowspecs <<EOF $ cat > narrowspecs <<EOF
> [include] > [include]
> path:dir/tests/ > path:dir/tests/
> path:dir/src/f12 > path:dir/src/f12
> EOF > EOF
$ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs

tests/test-narrow-clone.t

> %include foo > %include foo
> [include] > [include]
> path:dir/tests/ > path:dir/tests/
> path:dir/src/f12 > path:dir/src/f12
> EOF > EOF
$ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs
reading narrowspec from '$TESTTMP/narrowspecs' reading narrowspec from '$TESTTMP/narrowspecs'
abort: cannot specify other files using '%include' in narrowspec config error: cannot specify other files using '%include' in narrowspec
[255] [30]
$ cat > narrowspecs <<EOF $ cat > narrowspecs <<EOF
> [include] > [include]
> path:dir/tests/ > path:dir/tests/
> path:dir/src/f12 > path:dir/src/f12
> EOF > EOF
$ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs

tests/test-narrow-trackedcmd.t

--remotecmd CMD specify hg command to run on the remote side --remotecmd CMD specify hg command to run on the remote side
--insecure do not verify server certificate (ignoring --insecure do not verify server certificate (ignoring
web.cacerts config) web.cacerts config)
(use 'hg tracked -h' to show more help) (use 'hg tracked -h' to show more help)
[255] [255]
$ hg tracked --import-rules doesnotexist $ hg tracked --import-rules doesnotexist
abort: cannot read narrowspecs from '$TESTTMP/narrow/doesnotexist': $ENOENT$ abort: cannot read narrowspecs from '$TESTTMP/narrow/doesnotexist': $ENOENT$
[255] [50]
$ cat > specs <<EOF $ cat > specs <<EOF
> %include foo > %include foo
> [include] > [include]
> path:widest/ > path:widest/
> [exclude] > [exclude]
> path:inside/ > path:inside/
> EOF > EOF
$ hg tracked --import-rules specs $ hg tracked --import-rules specs
abort: including other spec files using '%include' is not supported in narrowspec abort: including other spec files using '%include' is not supported in narrowspec
[255] [10]
$ cat > specs <<EOF $ cat > specs <<EOF
> [include] > [include]
> outisde > outisde
> [exclude] > [exclude]
> inside > inside
> EOF > EOF
I path:outisde I path:outisde
I path:wider I path:wider
X path:inside X path:inside
X path:outside2 X path:outside2
X path:widest X path:widest
$ hg tracked --import-rules specs --clear $ hg tracked --import-rules specs --clear
abort: the --clear option is not yet supported abort: the --clear option is not yet supported
[255] [10]
Testing with passing a out of wdir file Testing with passing a out of wdir file
$ cat > ../nspecs <<EOF $ cat > ../nspecs <<EOF
> [include] > [include]
> widest > widest
> EOF > EOF
$ cd .. $ cd ..
Testing tracked command on a non-narrow repo Testing tracked command on a non-narrow repo
$ hg init non-narrow $ hg init non-narrow
$ cd non-narrow $ cd non-narrow
$ hg tracked --addinclude foobar $ hg tracked --addinclude foobar
abort: the tracked command is only supported on repositories cloned with --narrow abort: the tracked command is only supported on repositories cloned with --narrow
[255] [10]

tests/test-narrow.t

$ hg tracked --removeinclude d0 $ hg tracked --removeinclude d0
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
The following changeset(s) or their ancestors have local changes not on the remote: The following changeset(s) or their ancestors have local changes not on the remote:
* (glob) * (glob)
abort: local changes found abort: local changes found
(use --force-delete-local-changes to ignore) (use --force-delete-local-changes to ignore)
[255] [20]
Check that nothing was removed by the failed attempts Check that nothing was removed by the failed attempts
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d6 I path:d6
$ hg files $ hg files
d0/f d0/f
d3/f d3/f
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
...and 5 more, use --verbose to list all ...and 5 more, use --verbose to list all
abort: local changes found abort: local changes found
(use --force-delete-local-changes to ignore) (use --force-delete-local-changes to ignore)
[255] [20]
Now test it *with* verbose. Now test it *with* verbose.
$ hg tracked --removeinclude d9 --verbose $ hg tracked --removeinclude d9 --verbose
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
The following changeset(s) or their ancestors have local changes not on the remote: The following changeset(s) or their ancestors have local changes not on the remote:
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
^[0-9a-f]{12}$ (re) ^[0-9a-f]{12}$ (re)
abort: local changes found abort: local changes found
(use --force-delete-local-changes to ignore) (use --force-delete-local-changes to ignore)
[255] [20]
$ cd .. $ cd ..
Test --auto-remove-includes Test --auto-remove-includes
$ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \ $ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \
> --include d0 --include d1 --include d2 > --include d0 --include d1 --include d2
$ cd narrow-auto-remove $ cd narrow-auto-remove
$ echo a >> d0/f $ echo a >> d0/f
$ hg ci -m 'local change to d0' $ hg ci -m 'local change to d0'