This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5468

narrow: replace "ui.warn(); return 1" by "raise error.Abort()"
ClosedPublic

Authored by martinvonz on Dec 20 2018, 1:11 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG74e023f5a922: narrow: replace "ui.warn(); return 1" by "raise error.Abort()"
rHG6e574b5f158c: narrow: replace "ui.warn(); return 1" by "raise error.Abort()"
Summary

This is the usual way of doing it and I don't see a reason to do it
differently here.

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.

Revision Contents
Changeset List

Diff 12935

hgext/narrow/narrowcommands.py

If --clear is specified, then all previous includes and excludes are DROPPED If --clear is specified, then all previous includes and excludes are DROPPED
and replaced by the new ones specified to --addinclude and --addexclude. and replaced by the new ones specified to --addinclude and --addexclude.
If --clear is specified without any further options, the narrowspec will be If --clear is specified without any further options, the narrowspec will be
empty and will not match any files. empty and will not match any files.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
ui.warn(_('The narrow command is only supported on respositories cloned' raise error.Abort(_('the narrow command is only supported on '
' with --narrow.\n')) 'respositories cloned with --narrow'))
return 1
# 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['clear']: if opts['clear']:
ui.warn(_('The --clear option is not yet supported.\n')) raise error.Abort(_('the --clear option is not yet supported'))
return 1
# import rules from a file # import rules from a file
newrules = opts.get('import_rules') newrules = opts.get('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:

tests/test-narrow-trackedcmd.t

$ hg tracked $ hg tracked
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
The --clear option is not yet supported. abort: the --clear option is not yet supported
[1] [255]
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