Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 38755:545a3e6650cd stable
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 30 Jul 2018 14:36:42 -0700 |
| parents | 71d6886d27cf |
| children | d558e53cd6b6 |
comparison
equal
deleted
inserted
replaced
| 38754:8b5f97ab5774 | 38755:545a3e6650cd |
|---|---|
| 409 try: | 409 try: |
| 410 self._node = changeid | 410 self._node = changeid |
| 411 self._rev = repo.changelog.rev(changeid) | 411 self._rev = repo.changelog.rev(changeid) |
| 412 return | 412 return |
| 413 except error.FilteredLookupError: | 413 except error.FilteredLookupError: |
| 414 changeid = hex(changeid) # for the error message | |
| 414 raise | 415 raise |
| 415 except LookupError: | 416 except LookupError: |
| 416 # check if it might have come from damaged dirstate | 417 # check if it might have come from damaged dirstate |
| 417 # | 418 # |
| 418 # XXX we could avoid the unfiltered if we had a recognizable | 419 # XXX we could avoid the unfiltered if we had a recognizable |