diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -199,7 +199,7 @@ if hunkinrange((b1, (b2 - b1)), rangeb): filteredblocks.append(block) if lba is None or uba is None or uba < lba: - raise error.Abort(_(b'line range exceeds file size')) + raise error.InputError(_(b'line range exceeds file size')) return filteredblocks, (lba, uba) diff --git a/tests/test-annotate.t b/tests/test-annotate.t --- a/tests/test-annotate.t +++ b/tests/test-annotate.t @@ -960,7 +960,7 @@ [255] $ hg log -r 'followlines(baz, 2:40)' abort: line range exceeds file size - [255] + [10] $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])' hg: parse error at 43: not a prefix: [ (followlines(baz, 2:4, startrev=20, descend=[1])