Patchwork D10582: revlog: use revlog.display_id in narrow error message

login
register
mail settings
Submitter phabricator
Date May 3, 2021, 12:03 p.m.
Message ID <differential-rev-PHID-DREV-swnczugtahwdgvtie4qt-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48899/
State New
Headers show

Comments

phabricator - May 3, 2021, 12:03 p.m.
marmoute created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/changegroup.py
  tests/test-narrow-pull.t

CHANGE DETAILS




To: marmoute, durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-narrow-pull.t b/tests/test-narrow-pull.t
--- a/tests/test-narrow-pull.t
+++ b/tests/test-narrow-pull.t
@@ -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
diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -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"