changeset 37149:cc0a6ea95d98

lfs: add support for serving blob files
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 17 Mar 2018 01:53:44 -0400
parents ea6fc58524d7
children 335e19c6b7fa
files hgext/lfs/wireprotolfsserver.py mercurial/hgweb/common.py
diffstat 2 files changed, 40 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/lfs/wireprotolfsserver.py	Sat Mar 17 01:47:57 2018 -0400
+++ b/hgext/lfs/wireprotolfsserver.py	Sat Mar 17 01:53:44 2018 -0400
@@ -10,6 +10,7 @@
 import datetime
 import errno
 import json
+import os
 
 from mercurial.hgweb import (
     common as hgwebcommon,
@@ -20,6 +21,7 @@
 )
 
 HTTP_OK = hgwebcommon.HTTP_OK
+HTTP_CREATED = hgwebcommon.HTTP_CREATED
 HTTP_BAD_REQUEST = hgwebcommon.HTTP_BAD_REQUEST
 
 def handlewsgirequest(orig, rctx, req, res, checkperm):
@@ -237,10 +239,46 @@
     """
 
     method = req.method
+    oid = os.path.basename(req.dispatchpath)
+    localstore = repo.svfs.lfslocalblobstore
 
     if method == b'PUT':
         checkperm('upload')
+
+        # TODO: verify Content-Type?
+
+        existed = localstore.has(oid)
+
+        # TODO: how to handle timeouts?  The body proxy handles limiting to
+        #       Content-Length, but what happens if a client sends less than it
+        #       says it will?
+
+        # TODO: download() will abort if the checksum fails.  It should raise
+        #       something checksum specific that can be caught here, and turned
+        #       into an http code.
+        localstore.download(oid, req.bodyfh)
+
+        statusmessage = hgwebcommon.statusmessage
+        res.status = statusmessage(HTTP_OK if existed else HTTP_CREATED)
+
+        # There's no payload here, but this is the header that lfs-test-server
+        # sends back.  This eliminates some gratuitous test output conditionals.
+        res.headers[b'Content-Type'] = b'text/plain; charset=utf-8'
+        res.setbodybytes(b'')
+
+        return True
     elif method == b'GET':
         checkperm('pull')
 
-    return False
+        res.status = hgwebcommon.statusmessage(HTTP_OK)
+        res.headers[b'Content-Type'] = b'application/octet-stream'
+
+        # TODO: figure out how to send back the file in chunks, instead of
+        #       reading the whole thing.
+        res.setbodybytes(localstore.read(oid))
+
+        return True
+    else:
+        _sethttperror(res, HTTP_BAD_REQUEST,
+                      message=b'Unsupported LFS transfer method: %s' % method)
+        return True
--- a/mercurial/hgweb/common.py	Sat Mar 17 01:47:57 2018 -0400
+++ b/mercurial/hgweb/common.py	Sat Mar 17 01:53:44 2018 -0400
@@ -23,6 +23,7 @@
 httpserver = util.httpserver
 
 HTTP_OK = 200
+HTTP_CREATED = 201
 HTTP_NOT_MODIFIED = 304
 HTTP_BAD_REQUEST = 400
 HTTP_UNAUTHORIZED = 401