Show More
@@ -7,6 +7,7 b'' | |||
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | import contextlib | |
|
10 | 11 | import errno |
|
11 | 12 | import hashlib |
|
12 | 13 | import json |
@@ -297,8 +298,8 b' class _gitlfsremote(object):' | |||
|
297 | 298 | batchreq.add_header('Accept', 'application/vnd.git-lfs+json') |
|
298 | 299 | batchreq.add_header('Content-Type', 'application/vnd.git-lfs+json') |
|
299 | 300 | try: |
|
300 |
|
|
|
301 | rawjson = rsp.read() | |
|
301 | with contextlib.closing(self.urlopener.open(batchreq)) as rsp: | |
|
302 | rawjson = rsp.read() | |
|
302 | 303 | except util.urlerr.httperror as ex: |
|
303 | 304 | hints = { |
|
304 | 305 | 400: _('check that lfs serving is enabled on %s and "%s" is ' |
@@ -419,25 +420,27 b' class _gitlfsremote(object):' | |||
|
419 | 420 | |
|
420 | 421 | response = b'' |
|
421 | 422 | try: |
|
422 |
|
|
|
423 | ||
|
424 | if self.ui.debugflag: | |
|
425 |
|
|
|
426 |
# lfs-test-server and hg serve return headers in different |
|
|
427 | self.ui.debug('%s\n' | |
|
428 | % '\n'.join(sorted(str(req.info()).splitlines()))) | |
|
423 | with contextlib.closing(self.urlopener.open(request)) as req: | |
|
424 | ui = self.ui # Shorten debug lines | |
|
425 | if self.ui.debugflag: | |
|
426 | ui.debug('Status: %d\n' % req.status) | |
|
427 | # lfs-test-server and hg serve return headers in different | |
|
428 | # order | |
|
429 | ui.debug('%s\n' | |
|
430 | % '\n'.join(sorted(str(req.info()).splitlines()))) | |
|
429 | 431 | |
|
430 | if action == 'download': | |
|
431 |
# If downloading blobs, store downloaded data to local |
|
|
432 |
|
|
|
433 | else: | |
|
434 |
|
|
|
435 |
|
|
|
436 |
|
|
|
437 |
|
|
|
438 |
|
|
|
439 |
|
|
|
440 | self.ui.debug('lfs %s response: %s' % (action, response)) | |
|
432 | if action == 'download': | |
|
433 | # If downloading blobs, store downloaded data to local | |
|
434 | # blobstore | |
|
435 | localstore.download(oid, req) | |
|
436 | else: | |
|
437 | while True: | |
|
438 | data = req.read(1048576) | |
|
439 | if not data: | |
|
440 | break | |
|
441 | response += data | |
|
442 | if response: | |
|
443 | ui.debug('lfs %s response: %s' % (action, response)) | |
|
441 | 444 | except util.urlerr.httperror as ex: |
|
442 | 445 | if self.ui.debugflag: |
|
443 | 446 | self.ui.debug('%s: %s\n' % (oid, ex.read())) |
General Comments 0
You need to be logged in to leave comments.
Login now