diff --git a/hgext/lfs/blobstore.py b/hgext/lfs/blobstore.py --- a/hgext/lfs/blobstore.py +++ b/hgext/lfs/blobstore.py @@ -240,7 +240,7 @@ class _gitlfsremote(object): filename = getattr(p, 'filename', 'unknown') raise LfsRemoteError( _(('LFS server error. Remote object ' - 'for file %s not found: %r')) % (filename, response)) + 'for "%s" not found: %r')) % (filename, response)) raise LfsRemoteError(_('LFS server error: %r') % response) def _extractobjects(self, response, pointers, action): diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py --- a/hgext/lfs/wrapper.py +++ b/hgext/lfs/wrapper.py @@ -60,7 +60,7 @@ def readfromstore(self, text): oid = p.oid() store = self.opener.lfslocalblobstore if not store.has(oid): - p.filename = getattr(self, 'indexfile', None) + p.filename = self.filename self.opener.lfsremoteblobstore.readbatch([p], store) # The caller will validate the content diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t --- a/tests/test-lfs-test-server.t +++ b/tests/test-lfs-test-server.t @@ -185,7 +185,7 @@ Check error message when object does not $ rm -rf `hg config lfs.usercache` $ hg --config 'lfs.url=https://dewey-lfs.vip.facebook.com/lfs' clone test test2 updating to branch default - abort: LFS server error. Remote object for file data/a.i not found:(.*)! (re) + abort: LFS server error. Remote object for "a" not found:(.*)! (re) [255] $ $PYTHON $RUNTESTDIR/killdaemons.py $DAEMON_PIDS