This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11496

errors: use InputError for some invalid revsets and such
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7d908ee19b5b: errors: use InputError for some invalid revsets and such

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:23 AM
This revision is now accepted and ready to land.Sep 24 2021, 6:23 AM

Revision Contents
Changeset List

Diff 30395

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
) )
) )
else: else:
node, p2 = repo.dirstate.parents() node, p2 = repo.dirstate.parents()
if p2 != repo.nullid: if p2 != repo.nullid:
raise error.StateError(_(b'current bisect revision is a merge')) raise error.StateError(_(b'current bisect revision is a merge'))
if rev: if rev:
if not nodes: if not nodes:
raise error.Abort(_(b'empty revision set')) raise error.InputError(_(b'empty revision set'))
node = repo[nodes[-1]].node() node = repo[nodes[-1]].node()
with hbisect.restore_state(repo, state, node): with hbisect.restore_state(repo, state, node):
while changesets: while changesets:
# update state # update state
state[b'current'] = [node] state[b'current'] = [node]
hbisect.save_state(repo, state) hbisect.save_state(repo, state)
status = ui.system( status = ui.system(
command, command,

mercurial/scmutil.py

def revsingle(repo, revspec, default=b'.', localalias=None): def revsingle(repo, revspec, default=b'.', localalias=None):
if not revspec and revspec != 0: if not revspec and revspec != 0:
return repo[default] return repo[default]
l = revrange(repo, [revspec], localalias=localalias) l = revrange(repo, [revspec], localalias=localalias)
if not l: if not l:
raise error.Abort(_(b'empty revision set')) raise error.InputError(_(b'empty revision set'))
return repo[l.last()] return repo[l.last()]
def _pairspec(revspec): def _pairspec(revspec):
tree = revsetlang.parse(revspec) tree = revsetlang.parse(revspec)
return tree and tree[0] in ( return tree and tree[0] in (
b'range', b'range',
b'rangepre', b'rangepre',
b'rangepost', b'rangepost',
b'rangeall', b'rangeall',
) )
def revpair(repo, revs): def revpair(repo, revs):
if not revs: if not revs:
return repo[b'.'], repo[None] return repo[b'.'], repo[None]
l = revrange(repo, revs) l = revrange(repo, revs)
if not l: if not l:
raise error.Abort(_(b'empty revision range')) raise error.InputError(_(b'empty revision range'))
first = l.first() first = l.first()
second = l.last() second = l.last()
if ( if (
first == second first == second
and len(revs) >= 2 and len(revs) >= 2
and not all(revrange(repo, [r]) for r in revs) and not all(revrange(repo, [r]) for r in revs)
): ):
raise error.Abort(_(b'empty revision on one side of range')) raise error.InputError(_(b'empty revision on one side of range'))
# if top-level is range expression, the result must always be a pair # if top-level is range expression, the result must always be a pair
if first == second and len(revs) == 1 and not _pairspec(revs[0]): if first == second and len(revs) == 1 and not _pairspec(revs[0]):
return repo[first], repo[None] return repo[first], repo[None]
return repo[first], repo[second] return repo[first], repo[second]

tests/test-diff-change.t

diff -r bf5ff72eb7e0 file.txt diff -r bf5ff72eb7e0 file.txt
--- a/file.txt --- a/file.txt
+++ b/file.txt +++ b/file.txt
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-third -third
+wdir +wdir
$ hg diff -r "2 and 1" $ hg diff -r "2 and 1"
abort: empty revision range abort: empty revision range
[255] [10]
$ cd .. $ cd ..
$ hg clone -qr0 a dumbspec-rev0 $ hg clone -qr0 a dumbspec-rev0
$ cd dumbspec-rev0 $ cd dumbspec-rev0
$ echo "wdir" > file.txt $ echo "wdir" > file.txt
$ hg diff -r : $ hg diff -r :

tests/test-extdiff.t

[1] [1]
$ hg revert a $ hg revert a
$ rm a.orig $ rm a.orig
Specifying an empty revision should abort. Specifying an empty revision should abort.
$ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1 $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1
abort: empty revision on one side of range abort: empty revision on one side of range
[255] [10]
Test diff during merge: Test diff during merge:
$ hg update -C 0 $ hg update -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> c $ echo c >> c
$ hg add c $ hg add c
$ hg ci -m "new branch" -d '1 0' $ hg ci -m "new branch" -d '1 0'

tests/test-rebase-parameters.t

[1] [1]
$ hg rebase --dest 8 -b. $ hg rebase --dest 8 -b.
nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6
[1] [1]
$ hg rebase --dest '1 & !1' $ hg rebase --dest '1 & !1'
abort: empty revision set abort: empty revision set
[255] [10]
These work: These work:
Rebase with no arguments (from 3 onto 8): Rebase with no arguments (from 3 onto 8):
$ cd .. $ cd ..
$ hg clone -q -u . a2heads a1 $ hg clone -q -u . a2heads a1
$ cd a1 $ cd a1

tests/test-revset2.t

+++ b/.hgtags * (glob) +++ b/.hgtags * (glob)
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0 +d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0
(no rev) (no rev)
$ hg diff -r 'author("babar") or author("celeste")' $ hg diff -r 'author("babar") or author("celeste")'
abort: empty revision range abort: empty revision range
[255] [10]
aliases: aliases:
$ echo '[revsetalias]' >> .hg/hgrc $ echo '[revsetalias]' >> .hg/hgrc
$ echo 'm = merge()' >> .hg/hgrc $ echo 'm = merge()' >> .hg/hgrc
(revset aliases can override builtin revsets) (revset aliases can override builtin revsets)
$ echo 'p2($1) = p1($1)' >> .hg/hgrc $ echo 'p2($1) = p1($1)' >> .hg/hgrc
$ echo 'sincem = descendants(m)' >> .hg/hgrc $ echo 'sincem = descendants(m)' >> .hg/hgrc