Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: use revlog.display_id in narrow error message
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 03 May 2021 12:23:37 +0200
changeset 47156 89e11a6da785
parent 47155 96ee8ca99f5a
child 47157 3a9f3470922c
revlog: use revlog.display_id in narrow error message Differential Revision: https://phab.mercurial-scm.org/D10582
mercurial/changegroup.py file | annotate | diff | comparison | revisions
tests/test-narrow-pull.t file | annotate | diff | comparison | revisions 
--- 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"
--- 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
Mercurial