This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11498

errors: use InputError for bad path arguments to `hg annotate`
ClosedPublic

Authored by martinvonz on Sep 23 2021, 2:25 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG12966768595a: errors: use InputError for bad path arguments to `hg annotate`

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

martinvonz created this revision.Sep 23 2021, 2:25 PM
Alphare accepted this revision.Sep 24 2021, 6:24 AM
This revision is now accepted and ready to land.Sep 24 2021, 6:24 AM

Revision Contents
Changeset List

Diff 30397

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
fields = b' '.join( fields = b' '.join(
fn fn
for fn, sep, get, fmt in opmap for fn, sep, get, fmt in opmap
if opts.get(opnamemap.get(fn, fn)) or fn in datahint if opts.get(opnamemap.get(fn, fn)) or fn in datahint
) )
def bad(x, y): def bad(x, y):
raise error.Abort(b"%s: %s" % (x, y)) raise error.InputError(b"%s: %s" % (x, y))
m = scmutil.match(ctx, pats, opts, badfn=bad) m = scmutil.match(ctx, pats, opts, badfn=bad)
follow = not opts.get(b'no_follow') follow = not opts.get(b'no_follow')
diffopts = patch.difffeatureopts( diffopts = patch.difffeatureopts(
ui, opts, section=b'annotate', whitespace=True ui, opts, section=b'annotate', whitespace=True
) )
skiprevs = opts.get(b'skip') skiprevs = opts.get(b'skip')

tests/test-annotate.t

$ hg annotate --follow foo $ hg annotate --follow foo
foo: foo foo: foo
missing file missing file
$ hg ann nosuchfile $ hg ann nosuchfile
abort: nosuchfile: no such file in rev e9e6b4fa872f abort: nosuchfile: no such file in rev e9e6b4fa872f
[255] [10]
annotate file without '\n' on last line annotate file without '\n' on last line
$ printf "" > c $ printf "" > c
$ hg ci -A -m test -u nobody -d '1 0' $ hg ci -A -m test -u nobody -d '1 0'
adding c adding c
$ hg annotate c $ hg annotate c
$ printf "a\nb" > c $ printf "a\nb" > c

tests/test-fastannotate-hg.t

$ hg annotate --follow foo $ hg annotate --follow foo
foo: foo foo: foo
missing file missing file
$ hg ann nosuchfile $ hg ann nosuchfile
abort: nosuchfile: no such file in rev e9e6b4fa872f abort: nosuchfile: no such file in rev e9e6b4fa872f
[255] [10]
annotate file without '\n' on last line annotate file without '\n' on last line
$ printf "" > c $ printf "" > c
$ hg ci -A -m test -u nobody -d '1 0' $ hg ci -A -m test -u nobody -d '1 0'
adding c adding c
$ hg annotate c $ hg annotate c
$ printf "a\nb" > c $ printf "a\nb" > c