mercurial-scm/hg-stable: hgext/lfs/blobstore.py annotate

annotate hgext/lfs/blobstore.py @ 44224:2ad4e8aefcf4

lfs: explicitly close the file handle for the blob being uploaded The previous code relied on reading the blob fully to close it. The obvious problem is if an error occurs before that point. But there is also a problem when using workers where the data may need to be re-read, which can't happen once it is closed. This eliminates the surprising behavior before attempting to fix the worker problem. Differential Revision: https://phab.mercurial-scm.org/D7957

author	Matt Harbison <matt_harbison@yahoo.com>
date	Tue, 21 Jan 2020 09:51:39 -0500
parents	5f841daf3b41
children	b2408acaa4c9

rev	line source
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	1 # blobstore.py - local and remote (speaking Git-LFS protocol) blob storages
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	2 #
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	3 # Copyright 2017 Facebook, Inc.
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	4 #
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	7
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	8 from __future__ import absolute_import
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	9
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	10 import contextlib
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	11 import errno
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	12 import hashlib
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	13 import json
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	14 import os
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	15 import re
35479 b0c01a5ee35c lfs: narrow the exceptions that trigger a transfer retry Matt Harbison <matt_harbison@yahoo.com> parents: 35477 diff changeset	16 import socket
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	17
35122 b8e5fb8d2389 lfs: quiesce check-module-import warnings Matt Harbison <matt_harbison@yahoo.com> parents: 35121 diff changeset	18 from mercurial.i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	19 from mercurial.pycompat import getattr
35122 b8e5fb8d2389 lfs: quiesce check-module-import warnings Matt Harbison <matt_harbison@yahoo.com> parents: 35121 diff changeset	20
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	21 from mercurial import (
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	22 encoding,
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	23 error,
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40706 diff changeset	24 node,
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	25 pathutil,
36630 4da09b46451e lfs: add some bytestring wrappers in blobstore.py Augie Fackler <augie@google.com> parents: 36485 diff changeset	26 pycompat,
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	27 url as urlmod,
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	28 util,
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	29 vfs as vfsmod,
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	30 worker,
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	31 )
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	32
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	33 from mercurial.utils import stringutil
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	34
35289 8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	35 from ..largefiles import lfutil
8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	36
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	37 # 64 bytes for SHA256
36485 9e3cb58c7ab3 py3: make sure regexes are bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 35967 diff changeset	38 _lfsre = re.compile(br'\A[a-f0-9]{64}\Z')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	39
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	40
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	41 class lfsvfs(vfsmod.vfs):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	42 def join(self, path):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	43 """split the path at first two characters, like: XX/XXXXX..."""
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	44 if not _lfsre.match(path):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	45 raise error.ProgrammingError(b'unexpected lfs path: %s' % path)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	46 return super(lfsvfs, self).join(path[0:2], path[2:])
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	47
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	48 def walk(self, path=None, onerror=None):
35403 c8edeb03ca94 lfs: correct the directory list value returned by lfsvfs.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 35371 diff changeset	49 """Yield (dirpath, [], oids) tuple for blobs under path
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	50
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	51 Oids only exist in the root of this vfs, so dirpath is always ''.
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	52 """
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	53 root = os.path.normpath(self.base)
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	54 # when dirpath == root, dirpath[prefixlen:] becomes empty
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	55 # because len(dirpath) < prefixlen.
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	56 prefixlen = len(pathutil.normasprefix(root))
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	57 oids = []
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	58
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	59 for dirpath, dirs, files in os.walk(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	60 self.reljoin(self.base, path or b''), onerror=onerror
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	61 ):
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	62 dirpath = dirpath[prefixlen:]
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	63
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	64 # Silently skip unexpected files and directories
79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	65 if len(dirpath) == 2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	66 oids.extend(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	67 [dirpath + f for f in files if _lfsre.match(dirpath + f)]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	68 )
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	69
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	70 yield (b'', [], oids)
35371 79968f91ad0c lfs: override walk() in lfsvfs Matt Harbison <matt_harbison@yahoo.com> parents: 35289 diff changeset	71
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	72
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	73 class nullvfs(lfsvfs):
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	74 def __init__(self):
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	75 pass
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	76
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	77 def exists(self, oid):
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	78 return False
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	79
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	80 def read(self, oid):
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	81 # store.read() calls into here if the blob doesn't exist in its
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	82 # self.vfs. Raise the same error as a normal vfs when asked to read a
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	83 # file that doesn't exist. The only difference is the full file path
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	84 # isn't available in the error.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	85 raise IOError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	86 errno.ENOENT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	87 pycompat.sysstr(b'%s: No such file or directory' % oid),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	88 )
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	89
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	90 def walk(self, path=None, onerror=None):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	91 return (b'', [], [])
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	92
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	93 def write(self, oid, data):
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	94 pass
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	95
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	96
44223 5f841daf3b41 lfs: drop the unused progressbar code in the `filewithprogress` class Matt Harbison <matt_harbison@yahoo.com> parents: 44086 diff changeset	97 class lfsuploadfile(object):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	98 """a file-like object that supports __len__ and read.
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	99 """
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	100
44223 5f841daf3b41 lfs: drop the unused progressbar code in the `filewithprogress` class Matt Harbison <matt_harbison@yahoo.com> parents: 44086 diff changeset	101 def __init__(self, fp):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	102 self._fp = fp
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	103 fp.seek(0, os.SEEK_END)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	104 self._len = fp.tell()
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	105 fp.seek(0)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	106
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	107 def __len__(self):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	108 return self._len
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	109
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	110 def read(self, size):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	111 if self._fp is None:
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	112 return b''
44224 2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	113 return self._fp.read(size)
2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	114
2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	115 def close(self):
2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	116 if self._fp is not None:
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	117 self._fp.close()
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	118 self._fp = None
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	119
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	120
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	121 class local(object):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	122 """Local blobstore for large file contents.
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	123
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	124 This blobstore is used both as a cache and as a staging area for large blobs
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	125 to be uploaded to the remote blobstore.
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	126 """
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	127
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	128 def __init__(self, repo):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	129 fullpath = repo.svfs.join(b'lfs/objects')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	130 self.vfs = lfsvfs(fullpath)
37562 e5cd8d1a094d lfs: special case the null:// usercache instead of treating it as a url Matt Harbison <matt_harbison@yahoo.com> parents: 37518 diff changeset	131
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	132 if repo.ui.configbool(b'experimental', b'lfs.disableusercache'):
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	133 self.cachevfs = nullvfs()
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	134 else:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	135 usercache = lfutil._usercachedir(repo.ui, b'lfs')
37562 e5cd8d1a094d lfs: special case the null:// usercache instead of treating it as a url Matt Harbison <matt_harbison@yahoo.com> parents: 37518 diff changeset	136 self.cachevfs = lfsvfs(usercache)
35477 02f54a1ec9eb lfs: add note messages indicating what store holds the lfs blob Matt Harbison <matt_harbison@yahoo.com> parents: 35444 diff changeset	137 self.ui = repo.ui
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	138
35529 83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	139 def open(self, oid):
83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	140 """Open a read-only file descriptor to the named blob, in either the
83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	141 usercache or the local store."""
35541 58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	142 # The usercache is the most likely place to hold the file. Commit will
58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	143 # write to both it and the local store, as will anything that downloads
58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	144 # the blobs. However, things like clone without an update won't
58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	145 # populate the local store. For an init + push of a local clone,
58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	146 # the usercache is the only place it _could_ be. If not present, the
58fda95a0202 lfs: add a comment to describe subtle local blobstore open() behavior Matt Harbison <matt_harbison@yahoo.com> parents: 35530 diff changeset	147 # missing file msg here will indicate the local repo, not the usercache.
35529 83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	148 if self.cachevfs.exists(oid):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	149 return self.cachevfs(oid, b'rb')
35529 83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	150
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	151 return self.vfs(oid, b'rb')
35529 83903433c2eb lfs: add a local store method for opening a blob Matt Harbison <matt_harbison@yahoo.com> parents: 35482 diff changeset	152
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	153 def download(self, oid, src, content_length):
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	154 """Read the blob from the remote source in chunks, verify the content,
fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	155 and write to this local blobstore."""
fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	156 sha256 = hashlib.sha256()
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	157 size = 0
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	158
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	159 with self.vfs(oid, b'wb', atomictemp=True) as fp:
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	160 for chunk in util.filechunkiter(src, size=1048576):
fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	161 fp.write(chunk)
fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	162 sha256.update(chunk)
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	163 size += len(chunk)
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	164
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	165 # If the server advertised a length longer than what we actually
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	166 # received, then we should expect that the server crashed while
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	167 # producing the response (but the server has no way of telling us
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	168 # that), and we really don't need to try to write the response to
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	169 # the localstore, because it's not going to match the expected.
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	170 if content_length is not None and int(content_length) != size:
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	171 msg = (
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	172 b"Response length (%s) does not match Content-Length "
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	173 b"header (%d): likely server-side crash"
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	174 )
0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	175 raise LfsRemoteError(_(msg) % (size, int(content_length)))
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	176
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40706 diff changeset	177 realoid = node.hex(sha256.digest())
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	178 if realoid != oid:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	179 raise LfsCorruptionError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	180 _(b'corrupt remote lfs object: %s') % oid
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	181 )
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	182
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	183 self._linktousercache(oid)
35551 fa9dd53eb23e lfs: introduce a localstore method for downloading from remote stores Matt Harbison <matt_harbison@yahoo.com> parents: 35541 diff changeset	184
35553 a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	185 def write(self, oid, data):
a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	186 """Write blob to local blobstore.
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	187
35553 a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	188 This should only be called from the filelog during a commit or similar.
a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	189 As such, there is no need to verify the data. Imports from a remote
a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	190 store must use ``download()`` instead."""
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	191 with self.vfs(oid, b'wb', atomictemp=True) as fp:
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	192 fp.write(data)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	193
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	194 self._linktousercache(oid)
491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	195
39474 a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	196 def linkfromusercache(self, oid):
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	197 """Link blobs found in the user cache into this store.
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	198
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	199 The server module needs to do this when it lets the client know not to
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	200 upload the blob, to ensure it is always available in this store.
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	201 Normally this is done implicitly when the client reads or writes the
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	202 blob, but that doesn't happen when the server tells the client that it
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	203 already has the blob.
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	204 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	205 if not isinstance(self.cachevfs, nullvfs) and not self.vfs.exists(oid):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	206 self.ui.note(_(b'lfs: found %s in the usercache\n') % oid)
39474 a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	207 lfutil.link(self.cachevfs.join(oid), self.vfs.join(oid))
a913d2892e17 lfs: ensure the blob is linked to the remote store on skipped uploads Matt Harbison <matt_harbison@yahoo.com> parents: 39416 diff changeset	208
37517 491edf2435a0 lfs: add the ability to disable the usercache Matt Harbison <matt_harbison@yahoo.com> parents: 37245 diff changeset	209 def _linktousercache(self, oid):
35289 8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	210 # XXX: should we verify the content of the cache, and hardlink back to
8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	211 # the local store on success, but truncate, write and link on failure?
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	212 if not self.cachevfs.exists(oid) and not isinstance(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	213 self.cachevfs, nullvfs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	214 ):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	215 self.ui.note(_(b'lfs: adding %s to the usercache\n') % oid)
35553 a77418095530 lfs: remove the verification option when writing to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 35552 diff changeset	216 lfutil.link(self.vfs.join(oid), self.cachevfs.join(oid))
35289 8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	217
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	218 def read(self, oid, verify=True):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	219 """Read blob from local blobstore."""
35289 8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	220 if not self.vfs.exists(oid):
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	221 blob = self._read(self.cachevfs, oid, verify)
35481 bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	222
bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	223 # Even if revlog will verify the content, it needs to be verified
bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	224 # now before making the hardlink to avoid propagating corrupt blobs.
bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	225 # Don't abort if corruption is detected, because `hg verify` will
bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	226 # give more useful info about the corruption- simply don't add the
bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	227 # hardlink.
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40706 diff changeset	228 if verify or node.hex(hashlib.sha256(blob).digest()) == oid:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	229 self.ui.note(_(b'lfs: found %s in the usercache\n') % oid)
35481 bb6a80fc969a lfs: only hardlink between the usercache and local store if the blob verifies Matt Harbison <matt_harbison@yahoo.com> parents: 35480 diff changeset	230 lfutil.link(self.cachevfs.join(oid), self.vfs.join(oid))
35477 02f54a1ec9eb lfs: add note messages indicating what store holds the lfs blob Matt Harbison <matt_harbison@yahoo.com> parents: 35444 diff changeset	231 else:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	232 self.ui.note(_(b'lfs: found %s in the local lfs store\n') % oid)
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	233 blob = self._read(self.vfs, oid, verify)
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	234 return blob
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	235
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	236 def _read(self, vfs, oid, verify):
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	237 """Read blob (after verifying) from the given store"""
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	238 blob = vfs.read(oid)
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	239 if verify:
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	240 _verify(oid, blob)
417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	241 return blob
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	242
37148 56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	243 def verify(self, oid):
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	244 """Indicate whether or not the hash of the underlying file matches its
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	245 name."""
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	246 sha256 = hashlib.sha256()
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	247
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	248 with self.open(oid) as fp:
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	249 for chunk in util.filechunkiter(fp, size=1048576):
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	250 sha256.update(chunk)
56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	251
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40706 diff changeset	252 return oid == node.hex(sha256.digest())
37148 56c7cd067477 lfs: add a blob verification method to the local store Matt Harbison <matt_harbison@yahoo.com> parents: 36932 diff changeset	253
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	254 def has(self, oid):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	255 """Returns True if the local blobstore contains the requested blob,
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	256 False otherwise."""
35289 8e72f9152c4d lfs: introduce a user level cache for lfs files Matt Harbison <matt_harbison@yahoo.com> parents: 35123 diff changeset	257 return self.cachevfs.exists(oid) or self.vfs.exists(oid)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	258
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	259
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	260 def _urlerrorreason(urlerror):
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	261 '''Create a friendly message for the given URLError to be used in an
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	262 LfsRemoteError message.
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	263 '''
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	264 inst = urlerror
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	265
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	266 if isinstance(urlerror.reason, Exception):
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	267 inst = urlerror.reason
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	268
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	269 if util.safehasattr(inst, b'reason'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	270 try: # usually it is in the form (errno, strerror)
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	271 reason = inst.reason.args[1]
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	272 except (AttributeError, IndexError):
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	273 # it might be anything, for example a string
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	274 reason = inst.reason
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	275 if isinstance(reason, pycompat.unicode):
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	276 # SSLError of Python 2.7.9 contains a unicode
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	277 reason = encoding.unitolocal(reason)
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	278 return reason
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	279 elif getattr(inst, "strerror", None):
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	280 return encoding.strtolocal(inst.strerror)
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	281 else:
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	282 return stringutil.forcebytestr(urlerror)
380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	283
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	284
41620 698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	285 class lfsauthhandler(util.urlreq.basehandler):
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	286 handler_order = 480 # Before HTTPDigestAuthHandler (== 490)
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	287
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	288 def http_error_401(self, req, fp, code, msg, headers):
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	289 """Enforces that any authentication performed is HTTP Basic
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	290 Authentication. No authentication is also acceptable.
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	291 """
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	292 authreq = headers.get('www-authenticate', None)
41620 698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	293 if authreq:
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	294 scheme = authreq.split()[0]
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	295
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	296 if scheme.lower() != 'basic':
41620 698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	297 msg = _(b'the server must support Basic Authentication')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	298 raise util.urlerr.httperror(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	299 req.get_full_url(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	300 code,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	301 encoding.strfromlocal(msg),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	302 headers,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	303 fp,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	304 )
41620 698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	305 return None
698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	306
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	307
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	308 class _gitlfsremote(object):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	309 def __init__(self, repo, url):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	310 ui = repo.ui
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	311 self.ui = ui
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	312 baseurl, authinfo = url.authinfo()
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	313 self.baseurl = baseurl.rstrip(b'/')
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	314 useragent = repo.ui.config(b'experimental', b'lfs.user-agent')
35444 e333d27514b0 lfs: add an experimental config to override User-Agent for the blob transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35443 diff changeset	315 if not useragent:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	316 useragent = b'git-lfs/2.3.4 (Mercurial %s)' % util.version()
35443 e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 35437 diff changeset	317 self.urlopener = urlmod.opener(ui, authinfo, useragent)
41620 698667eb7523 lfs: disable all authentication except Basic for HTTP(S) connections Matt Harbison <matt_harbison@yahoo.com> parents: 41462 diff changeset	318 self.urlopener.add_handler(lfsauthhandler())
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	319 self.retry = ui.configint(b'lfs', b'retry')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	320
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	321 def writebatch(self, pointers, fromstore):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	322 """Batch upload from local to remote blobstore."""
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	323 self._batch(_deduplicate(pointers), fromstore, b'upload')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	324
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	325 def readbatch(self, pointers, tostore):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	326 """Batch download from remote to local blostore."""
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	327 self._batch(_deduplicate(pointers), tostore, b'download')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	328
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	329 def _batchrequest(self, pointers, action):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	330 """Get metadata about objects pointed by pointers for given action
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	331
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	332 Return decoded JSON object like {'objects': [{'oid': '', 'size': 1}]}
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	333 See https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	334 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	335 objects = [
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	336 {'oid': pycompat.strurl(p.oid()), 'size': p.size()}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	337 for p in pointers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	338 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	339 requestdata = pycompat.bytesurl(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	340 json.dumps(
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	341 {'objects': objects, 'operation': pycompat.strurl(action),}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	342 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	343 )
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	344 url = b'%s/objects/batch' % self.baseurl
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	345 batchreq = util.urlreq.request(pycompat.strurl(url), data=requestdata)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	346 batchreq.add_header('Accept', 'application/vnd.git-lfs+json')
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	347 batchreq.add_header('Content-Type', 'application/vnd.git-lfs+json')
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	348 try:
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	349 with contextlib.closing(self.urlopener.open(batchreq)) as rsp:
fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	350 rawjson = rsp.read()
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	351 except util.urlerr.httperror as ex:
40701 9f78d10742af lfs: improve the hints for common errors in the Batch API Matt Harbison <matt_harbison@yahoo.com> parents: 40700 diff changeset	352 hints = {
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	353 400: _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	354 b'check that lfs serving is enabled on %s and "%s" is '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	355 b'supported'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	356 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	357 % (self.baseurl, action),
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	358 404: _(b'the "lfs.url" config may be used to override %s')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	359 % self.baseurl,
40701 9f78d10742af lfs: improve the hints for common errors in the Batch API Matt Harbison <matt_harbison@yahoo.com> parents: 40700 diff changeset	360 }
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	361 hint = hints.get(ex.code, _(b'api=%s, action=%s') % (url, action))
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	362 raise LfsRemoteError(
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	363 _(b'LFS HTTP error: %s') % stringutil.forcebytestr(ex),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	364 hint=hint,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	365 )
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	366 except util.urlerr.urlerror as ex:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	367 hint = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	368 _(b'the "lfs.url" config may be used to override %s')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	369 % self.baseurl
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	370 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	371 raise LfsRemoteError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	372 _(b'LFS error: %s') % _urlerrorreason(ex), hint=hint
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	373 )
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	374 try:
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43091 diff changeset	375 response = pycompat.json_loads(rawjson)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	376 except ValueError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	377 raise LfsRemoteError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	378 _(b'LFS server returns invalid JSON: %s')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	379 % rawjson.encode("utf-8")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	380 )
36932 0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	381
0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	382 if self.ui.debugflag:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	383 self.ui.debug(b'Status: %d\n' % rsp.status)
36932 0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	384 # lfs-test-server and hg serve return headers in different order
41453 0b636d1720a0 lfs: strip the response headers from the Batch API before printing Matt Harbison <matt_harbison@yahoo.com> parents: 41451 diff changeset	385 headers = pycompat.bytestr(rsp.info()).strip()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	386 self.ui.debug(b'%s\n' % b'\n'.join(sorted(headers.splitlines())))
36932 0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	387
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	388 if 'objects' in response:
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	389 response['objects'] = sorted(
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	390 response['objects'], key=lambda p: p['oid']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	391 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	392 self.ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	393 b'%s\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	394 % pycompat.bytesurl(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	395 json.dumps(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	396 response,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	397 indent=2,
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	398 separators=('', ': '),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	399 sort_keys=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	400 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	401 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	402 )
36932 0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	403
41451 7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	404 def encodestr(x):
7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	405 if isinstance(x, pycompat.unicode):
43091 127cc1f72e70 py3: stop normalizing .encode()/.decode() arguments to unicode Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	406 return x.encode('utf-8')
41451 7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	407 return x
7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	408
7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	409 return pycompat.rapply(encodestr, response)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	410
35666 2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	411 def _checkforservererror(self, pointers, responses, action):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	412 """Scans errors from objects
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	413
35694 8a23082f4d93 lfs: correct documentation typo Matt Harbison <matt_harbison@yahoo.com> parents: 35666 diff changeset	414 Raises LfsRemoteError if any objects have an error"""
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	415 for response in responses:
35666 2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	416 # The server should return 404 when objects cannot be found. Some
2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	417 # server implementation (ex. lfs-test-server) does not set "error"
2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	418 # but just removes "download" from "actions". Treat that case
2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	419 # as the same as 404 error.
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	420 if b'error' not in response:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	421 if action == b'download' and action not in response.get(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	422 b'actions', []
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	423 ):
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	424 code = 404
35695 dd672e3d059f lfs: raise an error if the server sends an unsolicited oid Matt Harbison <matt_harbison@yahoo.com> parents: 35694 diff changeset	425 else:
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	426 continue
67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	427 else:
67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	428 # An error dict without a code doesn't make much sense, so
67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	429 # treat as a server error.
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	430 code = response.get(b'error').get(b'code', 500)
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	431
67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	432 ptrmap = {p.oid(): p for p in pointers}
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	433 p = ptrmap.get(response[b'oid'], None)
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	434 if p:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	435 filename = getattr(p, 'filename', b'unknown')
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	436 errors = {
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	437 404: b'The object does not exist',
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	438 410: b'The object was removed by the owner',
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	439 422: b'Validation error',
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	440 500: b'Internal server error',
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	441 }
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	442 msg = errors.get(code, b'status code %d' % code)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	443 raise LfsRemoteError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	444 _(b'LFS server error for "%s": %s') % (filename, msg)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	445 )
37244 67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	446 else:
67db84842356 lfs: improve the client message when the server signals an object error Matt Harbison <matt_harbison@yahoo.com> parents: 37219 diff changeset	447 raise LfsRemoteError(
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	448 _(b'LFS server error. Unsolicited response for oid %s')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	449 % response[b'oid']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	450 )
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	451
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	452 def _extractobjects(self, response, pointers, action):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	453 """extract objects from response of the batch API
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	454
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	455 response: parsed JSON object returned by batch API
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	456 return response['objects'] filtered by action
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	457 raise if any object has an error
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	458 """
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	459 # Scan errors from objects - fail early
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	460 objects = response.get(b'objects', [])
35666 2c6ebd0c850e lfs: remove internal url in test Jun Wu <quark@fb.com> parents: 35614 diff changeset	461 self._checkforservererror(pointers, objects, action)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	462
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	463 # Filter objects with given action. Practically, this skips uploading
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	464 # objects which exist in the server.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	465 filteredobjects = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	466 o for o in objects if action in o.get(b'actions', [])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	467 ]
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	468
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	469 return filteredobjects
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	470
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	471 def _basictransfer(self, obj, action, localstore):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	472 """Download or upload a single object using basic transfer protocol
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	473
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	474 obj: dict, an object description returned by batch API
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	475 action: string, one of ['upload', 'download']
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	476 localstore: blobstore.local
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	477
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	478 See https://github.com/git-lfs/git-lfs/blob/master/docs/api/\
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	479 basic-transfers.md
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	480 """
41451 7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	481 oid = obj[b'oid']
7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	482 href = obj[b'actions'][action].get(b'href')
7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	483 headers = obj[b'actions'][action].get(b'header', {}).items()
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	484
41451 7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	485 request = util.urlreq.request(pycompat.strurl(href))
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	486 if action == b'upload':
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	487 # If uploading blobs, read data from local blobstore.
37219 b00bd974eef5 lfs: drop a duplicate blob verification method Matt Harbison <matt_harbison@yahoo.com> parents: 37149 diff changeset	488 if not localstore.verify(oid):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	489 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	490 _(b'detected corrupt lfs object: %s') % oid,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	491 hint=_(b'run hg verify'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	492 )
44223 5f841daf3b41 lfs: drop the unused progressbar code in the `filewithprogress` class Matt Harbison <matt_harbison@yahoo.com> parents: 44086 diff changeset	493 request.data = lfsuploadfile(localstore.open(oid))
41449 40efcf78f3df py3: raw stringify various JSON and HTTP headers in the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 41448 diff changeset	494 request.get_method = lambda: r'PUT'
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	495 request.add_header('Content-Type', 'application/octet-stream')
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43380 diff changeset	496 request.add_header('Content-Length', len(request.data))
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	497
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	498 for k, v in headers:
41451 7df10ea7a5b8 py3: byteify the decoded JSON responses upon receipt in the LFS blobstore Matt Harbison <matt_harbison@yahoo.com> parents: 41449 diff changeset	499 request.add_header(pycompat.strurl(k), pycompat.strurl(v))
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	500
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	501 try:
44084 84f2becbd106 lfs: rename a variable to clarify its use Matt Harbison <matt_harbison@yahoo.com> parents: 44077 diff changeset	502 with contextlib.closing(self.urlopener.open(request)) as res:
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	503 contentlength = res.info().get(b"content-length")
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	504 ui = self.ui # Shorten debug lines
fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	505 if self.ui.debugflag:
44084 84f2becbd106 lfs: rename a variable to clarify its use Matt Harbison <matt_harbison@yahoo.com> parents: 44077 diff changeset	506 ui.debug(b'Status: %d\n' % res.status)
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	507 # lfs-test-server and hg serve return headers in different
fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	508 # order
44084 84f2becbd106 lfs: rename a variable to clarify its use Matt Harbison <matt_harbison@yahoo.com> parents: 44077 diff changeset	509 headers = pycompat.bytestr(res.info()).strip()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	510 ui.debug(b'%s\n' % b'\n'.join(sorted(headers.splitlines())))
36932 0dcf50dc90b6 lfs: debug print HTTP headers and JSON payload received from the server Matt Harbison <matt_harbison@yahoo.com> parents: 36630 diff changeset	511
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	512 if action == b'download':
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	513 # If downloading blobs, store downloaded data to local
fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	514 # blobstore
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	515 localstore.download(oid, res, contentlength)
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	516 else:
44086 ffac09da7a19 lfs: avoid quadratic performance in processing server responses Matt Harbison <matt_harbison@yahoo.com> parents: 44085 diff changeset	517 blocks = []
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	518 while True:
44084 84f2becbd106 lfs: rename a variable to clarify its use Matt Harbison <matt_harbison@yahoo.com> parents: 44077 diff changeset	519 data = res.read(1048576)
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	520 if not data:
fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	521 break
44086 ffac09da7a19 lfs: avoid quadratic performance in processing server responses Matt Harbison <matt_harbison@yahoo.com> parents: 44085 diff changeset	522 blocks.append(data)
ffac09da7a19 lfs: avoid quadratic performance in processing server responses Matt Harbison <matt_harbison@yahoo.com> parents: 44085 diff changeset	523
ffac09da7a19 lfs: avoid quadratic performance in processing server responses Matt Harbison <matt_harbison@yahoo.com> parents: 44085 diff changeset	524 response = b"".join(blocks)
40706 fb379b78b93e lfs: ensure that the return of urlopener.open() is closed Matt Harbison <matt_harbison@yahoo.com> parents: 40703 diff changeset	525 if response:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	526 ui.debug(b'lfs %s response: %s' % (action, response))
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	527 except util.urlerr.httperror as ex:
35734 b4e1d0654736 lfs: dump the full response on httperror in debug mode Matt Harbison <matt_harbison@yahoo.com> parents: 35733 diff changeset	528 if self.ui.debugflag:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	529 self.ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	530 b'%s: %s\n' % (oid, ex.read())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	531 ) # XXX: also bytes?
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	532 raise LfsRemoteError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	533 _(b'LFS HTTP error: %s (oid=%s, action=%s)')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	534 % (stringutil.forcebytestr(ex), oid, action)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	535 )
40702 380f5131ee7b lfs: handle URLErrors to add additional information Matt Harbison <matt_harbison@yahoo.com> parents: 40701 diff changeset	536 except util.urlerr.urlerror as ex:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	537 hint = _(b'attempted connection to %s') % pycompat.bytesurl(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	538 util.urllibcompat.getfullurl(request)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	539 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	540 raise LfsRemoteError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	541 _(b'LFS error: %s') % _urlerrorreason(ex), hint=hint
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	542 )
44224 2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	543 finally:
2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	544 if request.data:
2ad4e8aefcf4 lfs: explicitly close the file handle for the blob being uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 44223 diff changeset	545 request.data.close()
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	546
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	547 def _batch(self, pointers, localstore, action):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	548 if action not in [b'upload', b'download']:
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	549 raise error.ProgrammingError(b'invalid Git-LFS action: %s' % action)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	550
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	551 response = self._batchrequest(pointers, action)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	552 objects = self._extractobjects(response, pointers, action)
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	553 total = sum(x.get(b'size', 0) for x in objects)
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	554 sizes = {}
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	555 for obj in objects:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	556 sizes[obj.get(b'oid')] = obj.get(b'size', 0)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	557 topic = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	558 b'upload': _(b'lfs uploading'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	559 b'download': _(b'lfs downloading'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	560 }[action]
35482 5a73a0446afd lfs: use ui.note() and ui.debug() instead of ui.write() and their flags Matt Harbison <matt_harbison@yahoo.com> parents: 35481 diff changeset	561 if len(objects) > 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	562 self.ui.note(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	563 _(b'lfs: need to transfer %d objects (%s)\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	564 % (len(objects), util.bytecount(total))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	565 )
39416 b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	566
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	567 def transfer(chunk):
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	568 for obj in chunk:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	569 objsize = obj.get(b'size', 0)
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	570 if self.ui.verbose:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	571 if action == b'download':
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	572 msg = _(b'lfs: downloading %s (%s)\n')
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	573 elif action == b'upload':
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	574 msg = _(b'lfs: uploading %s (%s)\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	575 self.ui.note(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	576 msg % (obj.get(b'oid'), util.bytecount(objsize))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	577 )
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	578 retry = self.retry
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	579 while True:
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	580 try:
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	581 self._basictransfer(obj, action, localstore)
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	582 yield 1, obj.get(b'oid')
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	583 break
35479 b0c01a5ee35c lfs: narrow the exceptions that trigger a transfer retry Matt Harbison <matt_harbison@yahoo.com> parents: 35477 diff changeset	584 except socket.error as ex:
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	585 if retry > 0:
35482 5a73a0446afd lfs: use ui.note() and ui.debug() instead of ui.write() and their flags Matt Harbison <matt_harbison@yahoo.com> parents: 35481 diff changeset	586 self.ui.note(
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	587 _(b'lfs: failed: %r (remaining retry %d)\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	588 % (stringutil.forcebytestr(ex), retry)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	589 )
35437 f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	590 retry -= 1
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	591 continue
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	592 raise
f98fac24b757 lfs: using workers in lfs prefetch Wojciech Lis <wlis@fb.com> parents: 35403 diff changeset	593
35732 10e62d5efa73 lfs: default to not using workers for upload/download Matt Harbison <matt_harbison@yahoo.com> parents: 35695 diff changeset	594 # Until https multiplexing gets sorted out
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	595 if self.ui.configbool(b'experimental', b'lfs.worker-enable'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	596 oids = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	597 self.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	598 0.1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	599 transfer,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	600 (),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	601 sorted(objects, key=lambda o: o.get(b'oid')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	602 )
35732 10e62d5efa73 lfs: default to not using workers for upload/download Matt Harbison <matt_harbison@yahoo.com> parents: 35695 diff changeset	603 else:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	604 oids = transfer(sorted(objects, key=lambda o: o.get(b'oid')))
35732 10e62d5efa73 lfs: default to not using workers for upload/download Matt Harbison <matt_harbison@yahoo.com> parents: 35695 diff changeset	605
44077 05881d002cb2 lfs: add "bytes" as the unit to the upload/download progress bar Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	606 with self.ui.makeprogress(
05881d002cb2 lfs: add "bytes" as the unit to the upload/download progress bar Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	607 topic, unit=_(b"bytes"), total=total
05881d002cb2 lfs: add "bytes" as the unit to the upload/download progress bar Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	608 ) as progress:
39416 b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	609 progress.update(0)
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	610 processed = 0
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	611 blobs = 0
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	612 for _one, oid in oids:
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	613 processed += sizes[oid]
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	614 blobs += 1
b26350d9d7b5 lfs: use a context manager to control the progress bar lifetime Matt Harbison <matt_harbison@yahoo.com> parents: 38411 diff changeset	615 progress.update(processed)
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	616 self.ui.note(_(b'lfs: processed: %s\n') % oid)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	617
35921 fa993c3c8462 lfs: emit a status message to indicate how many blobs were uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 35753 diff changeset	618 if blobs > 0:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	619 if action == b'upload':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	620 self.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	621 _(b'lfs: uploaded %d files (%s)\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	622 % (blobs, util.bytecount(processed))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	623 )
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	624 elif action == b'download':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	625 self.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	626 _(b'lfs: downloaded %d files (%s)\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	627 % (blobs, util.bytecount(processed))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	628 )
35921 fa993c3c8462 lfs: emit a status message to indicate how many blobs were uploaded Matt Harbison <matt_harbison@yahoo.com> parents: 35753 diff changeset	629
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	630 def __del__(self):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	631 # copied from mercurial/httppeer.py
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	632 urlopener = getattr(self, 'urlopener', None)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	633 if urlopener:
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	634 for h in urlopener.handlers:
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	635 h.close()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	636 getattr(h, "close_all", lambda: None)()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	637
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	638
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	639 class _dummyremote(object):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	640 """Dummy store storing blobs to temp directory."""
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	641
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	642 def __init__(self, repo, url):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	643 fullpath = repo.vfs.join(b'lfs', url.path)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	644 self.vfs = lfsvfs(fullpath)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	645
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	646 def writebatch(self, pointers, fromstore):
35967 9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	647 for p in _deduplicate(pointers):
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	648 content = fromstore.read(p.oid(), verify=True)
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	649 with self.vfs(p.oid(), b'wb', atomictemp=True) as fp:
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	650 fp.write(content)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	651
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	652 def readbatch(self, pointers, tostore):
35967 9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	653 for p in _deduplicate(pointers):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	654 with self.vfs(p.oid(), b'rb') as fp:
44085 0ee0a3f6a990 lfs: check content length after downloading content Matt Harbison <matt_harbison@yahoo.com> parents: 44084 diff changeset	655 tostore.download(p.oid(), fp, None)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	656
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	657
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	658 class _nullremote(object):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	659 """Null store storing blobs to /dev/null."""
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	660
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	661 def __init__(self, repo, url):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	662 pass
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	663
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	664 def writebatch(self, pointers, fromstore):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	665 pass
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	666
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	667 def readbatch(self, pointers, tostore):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	668 pass
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	669
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	670
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	671 class _promptremote(object):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	672 """Prompt user to set lfs.url when accessed."""
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	673
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	674 def __init__(self, repo, url):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	675 pass
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	676
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	677 def writebatch(self, pointers, fromstore, ui=None):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	678 self._prompt()
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	679
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	680 def readbatch(self, pointers, tostore, ui=None):
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	681 self._prompt()
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	682
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	683 def _prompt(self):
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	684 raise error.Abort(_(b'lfs.url needs to be configured'))
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	685
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	686
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	687 _storemap = {
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	688 b'https': _gitlfsremote,
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	689 b'http': _gitlfsremote,
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	690 b'file': _dummyremote,
02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	691 b'null': _nullremote,
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	692 None: _promptremote,
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	693 }
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	694
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	695
35967 9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	696 def _deduplicate(pointers):
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	697 """Remove any duplicate oids that exist in the list"""
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	698 reduced = util.sortdict()
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	699 for p in pointers:
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	700 reduced[p.oid()] = p
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	701 return reduced.values()
9b413478f261 lfs: deduplicate oids in the transfer Matt Harbison <matt_harbison@yahoo.com> parents: 35921 diff changeset	702
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	703
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	704 def _verify(oid, content):
40714 9fcf8084ada8 py3: use node.hex(m.digest()) instead of m.hexdigest() Pulkit Goyal <pulkit@yandex-team.ru> parents: 40706 diff changeset	705 realoid = node.hex(hashlib.sha256(content).digest())
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	706 if realoid != oid:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	707 raise LfsCorruptionError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	708 _(b'detected corrupt lfs object: %s') % oid,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	709 hint=_(b'run hg verify'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	710 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	711
35480 417e8e040102 lfs: verify lfs object content when transferring to and from the remote store Matt Harbison <matt_harbison@yahoo.com> parents: 35479 diff changeset	712
37564 31a4ea773369 lfs: infer the blob store URL from an explicit push dest or default-push Matt Harbison <matt_harbison@yahoo.com> parents: 37563 diff changeset	713 def remote(repo, remote=None):
37518 092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	714 """remotestore factory. return a store in _storemap depending on config
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	715
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	716 If ``lfs.url`` is specified, use that remote endpoint. Otherwise, try to
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	717 infer the endpoint, based on the remote repository using the same path
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	718 adjustments as git. As an extension, 'http' is supported as well so that
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	719 ``hg serve`` works out of the box.
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	720
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	721 https://github.com/git-lfs/git-lfs/blob/master/docs/api/server-discovery.md
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	722 """
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	723 lfsurl = repo.ui.config(b'lfs', b'url')
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	724 url = util.url(lfsurl or b'')
37565 9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	725 if lfsurl is None:
37564 31a4ea773369 lfs: infer the blob store URL from an explicit push dest or default-push Matt Harbison <matt_harbison@yahoo.com> parents: 37563 diff changeset	726 if remote:
37565 9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	727 path = remote
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	728 elif util.safehasattr(repo, b'_subtoppath'):
37563 be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	729 # The pull command sets this during the optional update phase, which
be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	730 # tells exactly where the pull originated, whether 'paths.default'
be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	731 # or explicit.
37565 9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	732 path = repo._subtoppath
37563 be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	733 else:
be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	734 # TODO: investigate 'paths.remote:lfsurl' style path customization,
be1cc65bdb1c lfs: infer the blob store URL from an explicit pull source Matt Harbison <matt_harbison@yahoo.com> parents: 37562 diff changeset	735 # and fall back to inferring from 'paths.remote' if unspecified.
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	736 path = repo.ui.config(b'paths', b'default') or b''
37565 9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	737
9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	738 defaulturl = util.url(path)
37518 092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	739
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	740 # TODO: support local paths as well.
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	741 # TODO: consider the ssh -> https transformation that git applies
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	742 if defaulturl.scheme in (b'http', b'https'):
37565 9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	743 if defaulturl.path and defaulturl.path[:-1] != b'/':
9c7a25ef5b49 lfs: handle paths that don't end with '/' when inferring the blob store Matt Harbison <matt_harbison@yahoo.com> parents: 37564 diff changeset	744 defaulturl.path += b'/'
37691 d241e6632669 lfs: fix the inferred remote store path when using a --prefix Matt Harbison <matt_harbison@yahoo.com> parents: 37565 diff changeset	745 defaulturl.path = (defaulturl.path or b'') + b'.git/info/lfs'
37518 092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	746
092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	747 url = util.url(bytes(defaulturl))
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	748 repo.ui.note(_(b'lfs: assuming remote store: %s\n') % url)
37518 092eff6833a7 lfs: infer the blob store URL from paths.default Matt Harbison <matt_harbison@yahoo.com> parents: 37517 diff changeset	749
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	750 scheme = url.scheme
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	751 if scheme not in _storemap:
41448 02d0a7774882 py3: byteify the LFS blobstore module Matt Harbison <matt_harbison@yahoo.com> parents: 40714 diff changeset	752 raise error.Abort(_(b'lfs: unknown url scheme: %s') % scheme)
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	753 return _storemap[scheme](repo, url)
66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	754
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	755
39793 b63dee7bd0d9 global: replace most uses of RevlogError with StorageError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39474 diff changeset	756 class LfsRemoteError(error.StorageError):
35121 66c5a8cf2868 lfs: import the Facebook git-lfs client extension Matt Harbison <matt_harbison@yahoo.com> parents: diff changeset	757 pass
37692 10e5bb9678f4 lfs: gracefully handle aborts on the server when corrupt blobs are detected Matt Harbison <matt_harbison@yahoo.com> parents: 37691 diff changeset	758
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41620 diff changeset	759
37692 10e5bb9678f4 lfs: gracefully handle aborts on the server when corrupt blobs are detected Matt Harbison <matt_harbison@yahoo.com> parents: 37691 diff changeset	760 class LfsCorruptionError(error.Abort):
10e5bb9678f4 lfs: gracefully handle aborts on the server when corrupt blobs are detected Matt Harbison <matt_harbison@yahoo.com> parents: 37691 diff changeset	761 """Raised when a corrupt blob is detected, aborting an operation
10e5bb9678f4 lfs: gracefully handle aborts on the server when corrupt blobs are detected Matt Harbison <matt_harbison@yahoo.com> parents: 37691 diff changeset	762
10e5bb9678f4 lfs: gracefully handle aborts on the server when corrupt blobs are detected Matt Harbison <matt_harbison@yahoo.com> parents: 37691 diff changeset	763 It exists to allow specialized handling on the server side."""

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/lfs/blobstore.py @ 44224:2ad4e8aefcf4