context: use hex nodeid in error about filtered node stable
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 30 Jul 2018 14:36:42 -0700
branchstable
changeset 38755 545a3e6650cd
parent 38754 8b5f97ab5774
child 38756 91c405f84cf7
context: use hex nodeid in error about filtered node I went a little too far in my cleanup in 9231148ea599 (context: convert to hex for error message only for 20-byte changeid, 2018-04-06). I missed that the case where a binary nodeid refers to a filtered node. Differential Revision: https://phab.mercurial-scm.org/D3987
mercurial/context.py
--- a/mercurial/context.py	Tue Jul 31 10:55:14 2018 +0200
+++ b/mercurial/context.py	Mon Jul 30 14:36:42 2018 -0700
@@ -411,6 +411,7 @@
                     self._rev = repo.changelog.rev(changeid)
                     return
                 except error.FilteredLookupError:
+                    changeid = hex(changeid) # for the error message
                     raise
                 except LookupError:
                     # check if it might have come from damaged dirstate