[PATCH 7 of 7] histedit: handle exceptions from node.bin in fromrule

timeless timeless at mozdev.org
Mon Dec 28 17:29:18 CST 2015


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1450914689 0
#      Wed Dec 23 23:51:29 2015 +0000
# Node ID dd764f65509c8683b4096974bf11f878a6c7cbde
# Parent  8b8f2d84ebca1f211671edb329ef867203f290bc
histedit: handle exceptions from node.bin in fromrule

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -356,7 +356,11 @@
         """Parses the given rule, returning an instance of the histeditaction.
         """
         rulehash = rule.strip().split(' ', 1)[0]
-        return cls(state, node.bin(rulehash))
+        try:
+            rev = node.bin(rulehash)
+        except TypeError:
+            raise error.ParseError("invalid changeset %s" % rulehash)
+        return cls(state, rev)
 
     def verify(self, prev):
         """ Verifies semantic correctness of the rule"""
diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -219,6 +219,17 @@
   hg: parse error: duplicated command for changeset eb57da33312f
   [255]
 
+Test bogus rev
+---------------------------------------
+
+  $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
+  > pick eb57da33312f 2 three
+  > pick 0
+  > pick 08d98a8350f3 4 five
+  > EOF
+  hg: parse error: invalid changeset 0
+  [255]
+
 Test short version of command
 ---------------------------------------
 


More information about the Mercurial-devel mailing list