##// END OF EJS Templates
merge: split up checks for unknown and ignored files that differ...
merge: split up checks for unknown and ignored files that differ In some real-world cases it is preferable to allow overwriting ignored files while continuing to abort on unknown files. This primarily happens when we're replacing build artifacts (which are ignored) with checked in files, but continuing to abort on differing files that aren't ignored. We're redefining merge.checkunknown to only control the behavior for files that aren't ignored. That's fine because this config was only very recently introduced and has not made its way into any Mercurial releases yet.

File last commit:

r26587:56b2bcea default
r27742:6b639caa default
Show More
remotestore.py
98 lines | 3.3 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.
Mads Kiilerich
fix wording and not-completely-trivial spelling errors and bad docstrings
r17425 '''remote largefile store; the base class for wirestore'''
various
hgext: add largefiles extension...
r15168
import urllib2
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 from mercurial import util, wireproto, error
various
hgext: add largefiles extension...
r15168 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.sendfile(source, hash):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
various
hgext: add largefiles extension...
r15168 _('remotestore: could not put %s to remote store %s')
Mads Kiilerich
largefiles: hide passwords in URLs in ui messages
r19950 % (source, util.hidepassword(self.url)))
various
hgext: add largefiles extension...
r15168 self.ui.debug(
Mads Kiilerich
largefiles: hide passwords in URLs in ui messages
r19950 _('remotestore: put %s to remote store %s\n')
% (source, util.hidepassword(self.url)))
various
hgext: add largefiles extension...
r15168
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127 def exists(self, hashes):
Augie Fackler
check-code: disallow use of dict(key=value) construction...
r20688 return dict((h, s == 0) for (h, s) in # dict-from-generator
self._stat(hashes).iteritems())
various
hgext: add largefiles extension...
r15168
def sendfile(self, filename, hash):
self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash))
fd = None
try:
Matt Mackall
largefiles: use try/except/finally
r25079 fd = lfutil.httpsendfile(self.ui, filename)
various
hgext: add largefiles extension...
r15168 return self._put(hash, fd)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as e:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Matt Mackall
largefiles: use try/except/finally
r25079 _('remotestore: could not open file %s: %s')
% (filename, str(e)))
various
hgext: add largefiles extension...
r15168 finally:
if fd:
fd.close()
def _getfile(self, tmpfile, filename, hash):
try:
Mads Kiilerich
largefiles: move protocol conversion into getlfile and make it an iterable...
r19004 chunks = self._get(hash)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except urllib2.HTTPError as e:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 # 401s get converted to error.Aborts; everything else is fine being
various
hgext: add largefiles extension...
r15168 # turned into a StoreError
raise basestore.StoreError(filename, hash, self.url, str(e))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except urllib2.URLError as e:
various
hgext: add largefiles extension...
r15168 # This usually indicates a connection problem, so don't
# keep trying with the other files... they will probably
# all fail too.
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort('%s: %s' %
Mads Kiilerich
largefiles: hide passwords in URLs in ui messages
r19950 (util.hidepassword(self.url), e.reason))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as e:
various
hgext: add largefiles extension...
r15168 raise basestore.StoreError(filename, hash, self.url, str(e))
Mads Kiilerich
largefiles: move protocol conversion into getlfile and make it an iterable...
r19004 return lfutil.copyandhash(chunks, tmpfile)
various
hgext: add largefiles extension...
r15168
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)
Mads Kiilerich
largefiles: adapt verify to batched remote statlfile (issue3780)...
r18482 expecthash = fctx.data()[0:40]
stat = self._stat([expecthash])[expecthash]
various
hgext: add largefiles extension...
r15168 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)
Na'Tosha Bard
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)...
r17127
def batch(self):
'''Support for remote batching.'''
Mads Kiilerich
largefiles: import whole modules instead of importing parts of them...
r21084 return wireproto.remotebatch(self)