Show More
@@ -183,6 +183,7 b' unexpectedly::' | |||||
183 |
|
183 | |||
184 | from __future__ import absolute_import |
|
184 | from __future__ import absolute_import | |
185 |
|
185 | |||
|
186 | import binascii | |||
186 | import errno |
|
187 | import errno | |
187 | import os |
|
188 | import os | |
188 |
|
189 | |||
@@ -425,7 +426,7 b' class histeditaction(object):' | |||||
425 | rulehash = rule.strip().split(' ', 1)[0] |
|
426 | rulehash = rule.strip().split(' ', 1)[0] | |
426 | try: |
|
427 | try: | |
427 | rev = node.bin(rulehash) |
|
428 | rev = node.bin(rulehash) | |
428 | except TypeError: |
|
429 | except (TypeError, binascii.Error): | |
429 | raise error.ParseError("invalid changeset %s" % rulehash) |
|
430 | raise error.ParseError("invalid changeset %s" % rulehash) | |
430 | return cls(state, rev) |
|
431 | return cls(state, rev) | |
431 |
|
432 |
General Comments 0
You need to be logged in to leave comments.
Login now