Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/basestore.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 06 Oct 2019 09:45:02 -0400 |
parents | 566daffc607d |
children | 687b865b95ad |
line wrap: on
line diff
--- a/hgext/largefiles/basestore.py Sat Oct 05 10:29:34 2019 -0400 +++ b/hgext/largefiles/basestore.py Sun Oct 06 09:45:02 2019 -0400 @@ -15,9 +15,11 @@ from . import lfutil + class StoreError(Exception): '''Raised when there is a problem getting files from or putting files to a central store.''' + def __init__(self, filename, hash, url, detail): self.filename = filename self.hash = hash @@ -25,13 +27,17 @@ self.detail = detail def longmessage(self): - return (_("error getting id %s from url %s for file %s: %s\n") % - (self.hash, util.hidepassword(self.url), self.filename, - self.detail)) + return _("error getting id %s from url %s for file %s: %s\n") % ( + self.hash, + util.hidepassword(self.url), + self.filename, + self.detail, + ) def __str__(self): return "%s: %s" % (util.hidepassword(self.url), self.detail) + class basestore(object): def __init__(self, ui, repo, url): self.ui = ui @@ -62,16 +68,19 @@ at = 0 available = self.exists(set(hash for (_filename, hash) in files)) - with ui.makeprogress(_('getting largefiles'), unit=_('files'), - total=len(files)) as progress: + with ui.makeprogress( + _('getting largefiles'), unit=_('files'), total=len(files) + ) as progress: for filename, hash in files: progress.update(at) at += 1 ui.note(_('getting %s:%s\n') % (filename, hash)) if not available.get(hash): - ui.warn(_('%s: largefile %s not available from %s\n') - % (filename, hash, util.hidepassword(self.url))) + ui.warn( + _('%s: largefile %s not available from %s\n') + % (filename, hash, util.hidepassword(self.url)) + ) missing.append(filename) continue @@ -91,8 +100,9 @@ storefilename = lfutil.storepath(self.repo, hash) tmpname = storefilename + '.tmp' - with util.atomictempfile(tmpname, - createmode=self.repo.store.createmode) as tmpfile: + with util.atomictempfile( + tmpname, createmode=self.repo.store.createmode + ) as tmpfile: try: gothash = self._getfile(tmpfile, filename, hash) except StoreError as err: @@ -101,8 +111,10 @@ if gothash != hash: if gothash != "": - self.ui.warn(_('%s: data corruption (expected %s, got %s)\n') - % (filename, hash, gothash)) + self.ui.warn( + _('%s: data corruption (expected %s, got %s)\n') + % (filename, hash, gothash) + ) util.unlink(tmpname) return False @@ -115,10 +127,11 @@ file revision referenced by every changeset in revs. Return 0 if all is well, non-zero on any errors.''' - self.ui.status(_('searching %d changesets for largefiles\n') % - len(revs)) - verified = set() # set of (filename, filenode) tuples - filestocheck = [] # list of (cset, filename, expectedhash) + self.ui.status( + _('searching %d changesets for largefiles\n') % len(revs) + ) + verified = set() # set of (filename, filenode) tuples + filestocheck = [] # list of (cset, filename, expectedhash) for rev in revs: cctx = self.repo[rev] cset = "%d:%s" % (cctx.rev(), node.short(cctx.node())) @@ -140,11 +153,13 @@ if contents: self.ui.status( _('verified contents of %d revisions of %d largefiles\n') - % (numrevs, numlfiles)) + % (numrevs, numlfiles) + ) else: self.ui.status( _('verified existence of %d revisions of %d largefiles\n') - % (numrevs, numlfiles)) + % (numrevs, numlfiles) + ) return int(failed) def _getfile(self, tmpfile, filename, hash):