Mercurial > hg
view hgext/largefiles/remotestore.py @ 18974:d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
We were calling back to the original commands.cat from inside the walk loop
that handled and filtered out largefiles. That did however happen with file
paths relative to repo root and the original cat would fail when it applied its
own walk and match on top of that.
Instead we now duplicate and modify the code from commands.cat and patch it to
handle both normal and largefiles.
A change in test output shows that this also makes the exit code with
largefiles consistent with the normal one in the case where one of several
specified files are missing.
This also fixes the combination of --output and largefiles.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 15 Apr 2013 01:43:31 +0200 |
parents | 003730ca254d |
children | 2a35296a6304 |
line wrap: on
line source
# Copyright 2010-2011 Fog Creek Software # Copyright 2010-2011 Unity Technologies # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''remote largefile store; the base class for wirestore''' import urllib2 from mercurial import util from mercurial.i18n import _ from mercurial.wireproto import remotebatch import lfutil import basestore class remotestore(basestore.basestore): '''a largefile store accessed over a network''' def __init__(self, ui, repo, url): super(remotestore, self).__init__(ui, repo, url) def put(self, source, hash): if self.sendfile(source, hash): raise util.Abort( _('remotestore: could not put %s to remote store %s') % (source, self.url)) self.ui.debug( _('remotestore: put %s to remote store %s') % (source, self.url)) def exists(self, hashes): return dict((h, s == 0) for (h, s) in self._stat(hashes).iteritems()) def sendfile(self, filename, hash): self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash)) fd = None try: try: fd = lfutil.httpsendfile(self.ui, filename) except IOError, e: raise util.Abort( _('remotestore: could not open file %s: %s') % (filename, str(e))) return self._put(hash, fd) finally: if fd: fd.close() def _getfile(self, tmpfile, filename, hash): # quit if the largefile isn't there stat = self._stat([hash])[hash] if stat == 1: raise util.Abort(_('remotestore: largefile %s is invalid') % hash) elif stat == 2: raise util.Abort(_('remotestore: largefile %s is missing') % hash) elif stat != 0: raise RuntimeError('error getting file: unexpected response from ' 'statlfile (%r)' % stat) try: length, infile = self._get(hash) except urllib2.HTTPError, e: # 401s get converted to util.Aborts; everything else is fine being # turned into a StoreError raise basestore.StoreError(filename, hash, self.url, str(e)) except urllib2.URLError, e: # This usually indicates a connection problem, so don't # keep trying with the other files... they will probably # all fail too. raise util.Abort('%s: %s' % (self.url, e.reason)) except IOError, e: raise basestore.StoreError(filename, hash, self.url, str(e)) # Mercurial does not close its SSH connections after writing a stream if length is not None: infile = lfutil.limitreader(infile, length) return lfutil.copyandhash(lfutil.blockstream(infile), tmpfile) def _verifyfile(self, cctx, cset, contents, standin, verified): filename = lfutil.splitstandin(standin) if not filename: return False fctx = cctx[standin] key = (filename, fctx.filenode()) if key in verified: return False verified.add(key) expecthash = fctx.data()[0:40] stat = self._stat([expecthash])[expecthash] if not stat: return False elif stat == 1: self.ui.warn( _('changeset %s: %s: contents differ\n') % (cset, filename)) return True # failed elif stat == 2: self.ui.warn( _('changeset %s: %s missing\n') % (cset, filename)) return True # failed else: raise RuntimeError('verify failed: unexpected response from ' 'statlfile (%r)' % stat) def batch(self): '''Support for remote batching.''' return remotebatch(self)