##// END OF EJS Templates
revlog: use revlog.display_id in narrow error message...
marmoute -
r47927:89e11a6d default
parent child Browse files
Show More
@@ -804,10 +804,10 b' def _resolvenarrowrevisioninfo('
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"
@@ -147,7 +147,7 b' Can pull into repo with a single commit'
147 $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
147 $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
148 $ cd narrow2
148 $ cd narrow2
149 $ hg pull -q -r 1
149 $ hg pull -q -r 1
150 remote: abort: unexpected error: unable to resolve parent while packing '00manifest.i' 1 for changeset 0
150 remote: abort: unexpected error: unable to resolve parent while packing '00manifest' 1 for changeset 0
151 transaction abort!
151 transaction abort!
152 rollback completed
152 rollback completed
153 abort: pull failed on remote
153 abort: pull failed on remote
General Comments 0
You need to be logged in to leave comments. Login now