##// END OF EJS Templates
add: support adding explicit files in subrepos...
add: support adding explicit files in subrepos Change the behavior of the add command such that explicit paths in subrepos are always added. This eliminates the previous behavior where if you called "hg add" for an explicit path in a subrepo without specifying the -S option, it would be silently ignored. If you specify patterns, or no arguments at all, the -S option will still be needed to activate recursion into subrepos.

File last commit:

r15253:67d01077 default
r15410:9e99d2bb default
Show More
remotestore.py
106 lines | 3.6 KiB | text/x-python | PythonLexer
various
hgext: add largefiles extension...
r15168 # 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.
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''remote largefile store; the base class for servestore'''
various
hgext: add largefiles extension...
r15168
import urllib2
from mercurial import util
from mercurial.i18n import _
import lfutil
import basestore
class remotestore(basestore.basestore):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''a largefile store accessed over a network'''
various
hgext: add largefiles extension...
r15168 def __init__(self, ui, repo, url):
super(remotestore, self).__init__(ui, repo, url)
def put(self, source, hash):
if self._verify(hash):
return
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, hash):
return self._verify(hash)
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)
Greg Ward
largefiles: improve error reporting...
r15253 if stat == 1:
raise util.Abort(_('remotestore: largefile %s is invalid') % hash)
elif stat == 2:
raise util.Abort(_('remotestore: largefile %s is missing') % hash)
various
hgext: add largefiles extension...
r15168
try:
length, infile = self._get(hash)
Greg Ward
largefiles: don't break existing tests (syntax error, bad imports)
r15188 except urllib2.HTTPError, e:
various
hgext: add largefiles extension...
r15168 # 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.
Greg Ward
largefiles: improve error reporting...
r15253 raise util.Abort('%s: %s' % (self.url, e.reason))
various
hgext: add largefiles extension...
r15168 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 _verify(self, hash):
return not self._stat(hash)
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)
stat = self._stat(hash)
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:
Greg Ward
largefiles: improve error reporting...
r15253 raise RuntimeError('verify failed: unexpected response from '
'statlfile (%r)' % stat)