##// END OF EJS Templates
largefiles revert: update lfdirstate with result from first cleanliness check...
largefiles revert: update lfdirstate with result from first cleanliness check Largefiles revert do for some reason have two lfdirstates and lfdirstatestatus invocations in one function. The result from the first lfdirstate check was however not written back to the lfdirstate, and some files was thus checked twice.

File last commit:

r17192:1ac628cd default
r18140:e388273f stable
Show More
proto.py
173 lines | 6.3 KiB | text/x-python | PythonLexer
various
hgext: add largefiles extension...
r15168 # Copyright 2011 Fog Creek Software
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
import os
import urllib2
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 from mercurial import error, httppeer, util, wireproto
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 from mercurial.wireproto import batchable, future
various
hgext: add largefiles extension...
r15168 from mercurial.i18n import _
import lfutil
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 LARGEFILES_REQUIRED_MSG = ('\nThis repository uses the largefiles extension.'
'\n\nPlease enable it in your Mercurial config '
'file.\n')
various
hgext: add largefiles extension...
r15168
def putlfile(repo, proto, sha):
Benjamin Pollack
largefiles: make the store primary, and the user cache secondary...
r15317 '''Put a largefile into a repository's local store and into the
user cache.'''
various
hgext: add largefiles extension...
r15168 proto.redirect()
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391
hlian
largefiles: in putlfile, ensure tempfile's directory exists prior to creation...
r16594 path = lfutil.storepath(repo, sha)
util.makedirs(os.path.dirname(path))
tmpfp = util.atomictempfile(path, createmode=repo.store.createmode)
various
hgext: add largefiles extension...
r15168 try:
try:
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 proto.getfile(tmpfp)
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 tmpfp._fp.seek(0)
if sha != lfutil.hexsha1(tmpfp._fp):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 raise IOError(0, _('largefile contents do not match hash'))
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 tmpfp.close()
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 lfutil.linktousercache(repo, sha)
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 except IOError, e:
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 repo.ui.warn(_('largefiles: failed to put %s into store: %s') %
(sha, e.strerror))
various
hgext: add largefiles extension...
r15168 return wireproto.pushres(1)
finally:
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 tmpfp.discard()
various
hgext: add largefiles extension...
r15168
return wireproto.pushres(0)
def getlfile(repo, proto, sha):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''Retrieve a largefile from the repository-local cache or system
cache.'''
various
hgext: add largefiles extension...
r15168 filename = lfutil.findfile(repo, sha)
if not filename:
raise util.Abort(_('requested largefile %s not present in cache') % sha)
f = open(filename, 'rb')
length = os.fstat(f.fileno())[6]
Greg Ward
largefiles: improve comments, internal docstrings...
r15252
# Since we can't set an HTTP content-length header here, and
# Mercurial core provides no way to give the length of a streamres
# (and reading the entire file into RAM would be ill-advised), we
# just send the length on the first line of the response, like the
# ssh proto does for string responses.
various
hgext: add largefiles extension...
r15168 def generator():
yield '%d\n' % length
for chunk in f:
yield chunk
return wireproto.streamres(generator())
def statlfile(repo, proto, sha):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''Return '2\n' if the largefile is missing, '1\n' if it has a
mismatched checksum, or '0\n' if it is in good condition'''
various
hgext: add largefiles extension...
r15168 filename = lfutil.findfile(repo, sha)
if not filename:
return '2\n'
fd = None
try:
fd = open(filename, 'rb')
return lfutil.hexsha1(fd) == sha and '0\n' or '1\n'
finally:
if fd:
fd.close()
def wirereposetup(ui, repo):
class lfileswirerepository(repo.__class__):
def putlfile(self, sha, fd):
# unfortunately, httprepository._callpush tries to convert its
# input file-like into a bundle before sending it, so we can't use
# it ...
Peter Arrenbrecht
peer: introduce real peer classes...
r17192 if issubclass(self.__class__, httppeer.httppeer):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 res = None
various
hgext: add largefiles extension...
r15168 try:
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 res = self._call('putlfile', data=fd, sha=sha,
headers={'content-type':'application/mercurial-0.1'})
d, output = res.split('\n', 1)
for l in output.splitlines(True):
self.ui.warn(_('remote: '), l, '\n')
return int(d)
various
hgext: add largefiles extension...
r15168 except (ValueError, urllib2.HTTPError):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 self.ui.warn(_('unexpected putlfile response: %s') % res)
various
hgext: add largefiles extension...
r15168 return 1
# ... but we can't use sshrepository._call because the data=
# argument won't get sent, and _callpush does exactly what we want
# in this case: send the data straight through
else:
try:
ret, output = self._callpush("putlfile", fd, sha=sha)
if ret == "":
raise error.ResponseError(_('putlfile failed:'),
output)
return int(ret)
except IOError:
return 1
except ValueError:
raise error.ResponseError(
_('putlfile failed (unexpected response):'), ret)
def getlfile(self, sha):
stream = self._callstream("getlfile", sha=sha)
length = stream.readline()
try:
length = int(length)
except ValueError:
Matt Mackall
largefiles: fix over-long lines
r15170 self._abort(error.ResponseError(_("unexpected response:"),
length))
various
hgext: add largefiles extension...
r15168 return (length, stream)
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 @batchable
various
hgext: add largefiles extension...
r15168 def statlfile(self, sha):
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 f = future()
result = {'sha': sha}
yield result, f
various
hgext: add largefiles extension...
r15168 try:
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 yield int(f.value)
various
hgext: add largefiles extension...
r15168 except (ValueError, urllib2.HTTPError):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # If the server returns anything but an integer followed by a
various
hgext: add largefiles extension...
r15168 # newline, newline, it's not speaking our language; if we get
# an HTTP error, we can't be sure the largefile is present;
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # either way, consider it missing.
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 yield 2
various
hgext: add largefiles extension...
r15168
repo.__class__ = lfileswirerepository
# advertise the largefiles=serve capability
def capabilities(repo, proto):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return capabilitiesorig(repo, proto) + ' largefiles=serve'
various
hgext: add largefiles extension...
r15168
# duplicate what Mercurial's new out-of-band errors mechanism does, because
# clients old and new alike both handle it well
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 def webprotorefuseclient(self, message):
various
hgext: add largefiles extension...
r15168 self.req.header([('Content-Type', 'application/hg-error')])
return message
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 def sshprotorefuseclient(self, message):
various
hgext: add largefiles extension...
r15168 self.ui.write_err('%s\n-\n' % message)
self.fout.write('\n')
self.fout.flush()
return ''
def heads(repo, proto):
if lfutil.islfilesrepo(repo):
Na'Tosha Bard
largefiles: remove pre-1.9 code from extension first bundled with 1.9
r15224 return wireproto.ooberror(LARGEFILES_REQUIRED_MSG)
various
hgext: add largefiles extension...
r15168 return wireproto.heads(repo, proto)
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 def sshrepocallstream(self, cmd, **args):
various
hgext: add largefiles extension...
r15168 if cmd == 'heads' and self.capable('largefiles'):
cmd = 'lheads'
if cmd == 'batch' and self.capable('largefiles'):
args['cmds'] = args['cmds'].replace('heads ', 'lheads ')
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return ssholdcallstream(self, cmd, **args)
various
hgext: add largefiles extension...
r15168
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 def httprepocallstream(self, cmd, **args):
various
hgext: add largefiles extension...
r15168 if cmd == 'heads' and self.capable('largefiles'):
cmd = 'lheads'
if cmd == 'batch' and self.capable('largefiles'):
args['cmds'] = args['cmds'].replace('heads ', 'lheads ')
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return httpoldcallstream(self, cmd, **args)