Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise InputError when line range to followlines() is out of bounds
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 16 Nov 2020 16:25:04 -0800
changeset 45888 c8860a212770
parent 45887 ec73a6a75985
child 45889 1a72e4839795
errors: raise InputError when line range to followlines() is out of bounds Differential Revision: https://phab.mercurial-scm.org/D9333
mercurial/mdiff.py file | annotate | diff | comparison | revisions
tests/test-annotate.t file | annotate | diff | comparison | revisions 
--- a/mercurial/mdiff.py	Sat Nov 07 22:31:29 2020 +0100
+++ b/mercurial/mdiff.py	Mon Nov 16 16:25:04 2020 -0800
@@ -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)
 
 
--- a/tests/test-annotate.t	Sat Nov 07 22:31:29 2020 +0100
+++ b/tests/test-annotate.t	Mon Nov 16 16:25:04 2020 -0800
@@ -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])
hg-stable