# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1620037417 -7200
# Node ID 89e11a6da7858eaab397d224d61fbb01e7d303f7
# Parent  96ee8ca99f5ae6a039b038f9e2bfe3db61b3f878
revlog: use revlog.display_id in narrow error message

Differential Revision: https://phab.mercurial-scm.org/D10582

diff -r 96ee8ca99f5a -r 89e11a6da785 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Mon May 03 12:23:27 2021 +0200
+++ b/mercurial/changegroup.py	Mon May 03 12:23:37 2021 +0200
@@ -804,10 +804,10 @@
                 # We failed to resolve a parent for this node, so
                 # we crash the changegroup construction.
                 if util.safehasattr(store, 'target'):
-                    target = store._indexfile
+                    target = store.display_id
                 else:
                     # some revlog not actually a revlog
-                    target = store._revlog._indexfile
+                    target = store._revlog.display_id
 
                 raise error.Abort(
                     b"unable to resolve parent while packing '%s' %r"
diff -r 96ee8ca99f5a -r 89e11a6da785 tests/test-narrow-pull.t
--- a/tests/test-narrow-pull.t	Mon May 03 12:23:27 2021 +0200
+++ b/tests/test-narrow-pull.t	Mon May 03 12:23:37 2021 +0200
@@ -147,7 +147,7 @@
   $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
   $ cd narrow2
   $ hg pull -q -r 1
-  remote: abort: unexpected error: unable to resolve parent while packing '00manifest.i' 1 for changeset 0
+  remote: abort: unexpected error: unable to resolve parent while packing '00manifest' 1 for changeset 0
   transaction abort!
   rollback completed
   abort: pull failed on remote