Patchwork [2,of,2,V2] lfs: improve the error message for a missing remote blob

login
register
mail settings
Submitter Matt Harbison
Date Jan. 9, 2018, 3:57 a.m.
Message ID <012bbd5e82b6a23c8cfb.1515470252@Envy>
Download mbox | patch
Permalink /patch/26624/
State Accepted
Headers show

Comments

Matt Harbison - Jan. 9, 2018, 3:57 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1515356476 18000
#      Sun Jan 07 15:21:16 2018 -0500
# Node ID 012bbd5e82b6a23c8cfb8aa2a0b5dde034510679
# Parent  12d63e3a9bcf3df302341ade98d014ecc98a0276
lfs: improve the error message for a missing remote blob

It seems better to print the name known to the user, not the internal file.  The
previous code unconditionally set 'p.filename'.  That potentially made the
attribute None, and would be printed as such in
_gitlfsremote._checkforservererror() instead of "unknown".  Normally, files are
printed relative to CWD, but I don't see a way to get the repo path to make that
adjustment.

The test modified here apparently only runs within Facebook, but a print
statement confirmed the name change.  I tried uploading the blob to a different
remote store (so the git server never saw it), and also killing the git server
and removing the blob directory, and removing the 'lfs.db' file.  All resulted
in a message:

  abort: LFS server claims required objects do not exist:
  bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a!

So I have no idea how to make this test generally runnable.

Patch

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 @@ 
                     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 @@ 
     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 @@ 
   $ 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