D3987: context: use hex nodeid in error about filtered node

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Jul 30 21:46:31 UTC 2018


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I went a little too far in my cleanup in https://phab.mercurial-scm.org/rHG9231148ea5999ecd08eecbe6ab7f5191e727937c (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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3987

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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



To: martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list