diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py index c8860a2127704fb196e73a367b4713cb226f804f_bWVyY3VyaWFsL2RlYnVnY29tbWFuZHMucHk=..1a72e483979581e37a5bf2d89eec343cc0c98c1e_bWVyY3VyaWFsL2RlYnVnY29tbWFuZHMucHk= 100644 --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -2253,7 +2253,7 @@ raise TypeError() return n except TypeError: - raise error.Abort( + raise error.InputError( b'changeset references must be full hexadecimal ' b'node identifiers' ) @@ -2264,7 +2264,7 @@ try: indices.append(int(v)) except ValueError: - raise error.Abort( + raise error.InputError( _(b'invalid index value: %r') % v, hint=_(b'use integers for indices'), ) @@ -2282,7 +2282,9 @@ if precursor is not None: if opts[b'rev']: - raise error.Abort(b'cannot select revision when creating marker') + raise error.InputError( + b'cannot select revision when creating marker' + ) metadata = {} metadata[b'user'] = encoding.fromlocal(opts[b'user'] or ui.username()) succs = tuple(parsenodeid(succ) for succ in successors) diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t index c8860a2127704fb196e73a367b4713cb226f804f_dGVzdHMvdGVzdC1vYnNvbGV0ZS50..1a72e483979581e37a5bf2d89eec343cc0c98c1e_dGVzdHMvdGVzdC1vYnNvbGV0ZS50 100644 --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -47,6 +47,6 @@ $ hg debugobsolete 0 abort: changeset references must be full hexadecimal node identifiers - [255] + [10] $ hg debugobsolete '00' abort: changeset references must be full hexadecimal node identifiers @@ -51,6 +51,6 @@ $ hg debugobsolete '00' abort: changeset references must be full hexadecimal node identifiers - [255] + [10] $ hg debugobsolete -d '0 0' `getid kill_me` -u babar 1 new obsolescence markers obsoleted 1 changesets