Mercurial > hg
comparison mercurial/changegroup.py @ 47156:89e11a6da785
revlog: use revlog.display_id in narrow error message
Differential Revision: https://phab.mercurial-scm.org/D10582
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 03 May 2021 12:23:37 +0200 |
parents | a07d5cb03a85 |
children | 2bd4b5218918 |
comparison
equal
deleted
inserted
replaced
47155:96ee8ca99f5a | 47156:89e11a6da785 |
---|---|
802 if store.linkrev(i) == clrev: | 802 if store.linkrev(i) == clrev: |
803 return i | 803 return i |
804 # We failed to resolve a parent for this node, so | 804 # We failed to resolve a parent for this node, so |
805 # we crash the changegroup construction. | 805 # we crash the changegroup construction. |
806 if util.safehasattr(store, 'target'): | 806 if util.safehasattr(store, 'target'): |
807 target = store._indexfile | 807 target = store.display_id |
808 else: | 808 else: |
809 # some revlog not actually a revlog | 809 # some revlog not actually a revlog |
810 target = store._revlog._indexfile | 810 target = store._revlog.display_id |
811 | 811 |
812 raise error.Abort( | 812 raise error.Abort( |
813 b"unable to resolve parent while packing '%s' %r" | 813 b"unable to resolve parent while packing '%s' %r" |
814 b' for changeset %r' % (target, rev, clrev) | 814 b' for changeset %r' % (target, rev, clrev) |
815 ) | 815 ) |