##// END OF EJS Templates
rebase: move bookmarks with --keep (issue5682)...
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727

File last commit:

r33758:dcdc1755 default
r34364:2f427b57 4.3.3 stable
Show More
remotestore.py
129 lines | 4.8 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'''
liscju
py3: make largefiles/remotestore.py use absolute_import
r29313 from __future__ import absolute_import
various
hgext: add largefiles extension...
r15168
from mercurial.i18n import _
liscju
py3: make largefiles/remotestore.py use absolute_import
r29313 from mercurial import (
error,
util,
wireproto,
)
from . import (
basestore,
lfutil,
localstore,
)
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 urlerr = util.urlerr
urlreq = util.urlreq
various
hgext: add largefiles extension...
r15168 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)
liscju
largefiles: send statlfile remote calls only for nonexisting locally files...
r29218 self._lstore = localstore.localstore(self.ui, self.repo, self.repo)
various
hgext: add largefiles extension...
r15168
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))
try:
Mads Kiilerich
largefiles: use context for file closing...
r30142 with lfutil.httpsendfile(self.ui, filename) as fd:
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
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)
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 except urlerr.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))
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 except urlerr.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
liscju
largefiles: send statlfile remote calls only for nonexisting locally files...
r29218 def _hashesavailablelocally(self, hashes):
existslocallymap = self._lstore.exists(hashes)
localhashes = [hash for hash in hashes if existslocallymap[hash]]
return localhashes
liscju
largefiles: change basestore._verifyfile to take list of files to check...
r29067 def _verifyfiles(self, contents, filestocheck):
failed = False
liscju
largefiles: makes verify batching stat calls to remote...
r29068 expectedhashes = [expectedhash
for cset, filename, expectedhash in filestocheck]
liscju
largefiles: send statlfile remote calls only for nonexisting locally files...
r29218 localhashes = self._hashesavailablelocally(expectedhashes)
stats = self._stat([expectedhash for expectedhash in expectedhashes
if expectedhash not in localhashes])
liscju
largefiles: change basestore._verifyfile to take list of files to check...
r29067 for cset, filename, expectedhash in filestocheck:
liscju
largefiles: send statlfile remote calls only for nonexisting locally files...
r29218 if expectedhash in localhashes:
filetocheck = (cset, filename, expectedhash)
verifyresult = self._lstore._verifyfiles(contents,
[filetocheck])
if verifyresult:
liscju
largefiles: change basestore._verifyfile to take list of files to check...
r29067 failed = True
liscju
largefiles: send statlfile remote calls only for nonexisting locally files...
r29218 else:
stat = stats[expectedhash]
if stat:
if stat == 1:
self.ui.warn(
_('changeset %s: %s: contents differ\n')
% (cset, filename))
failed = True
elif stat == 2:
self.ui.warn(
_('changeset %s: %s missing\n')
% (cset, filename))
failed = True
else:
raise RuntimeError('verify failed: unexpected response '
'from statlfile (%r)' % stat)
liscju
largefiles: change basestore._verifyfile to take list of files to check...
r29067 return failed
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)
liscju
largefiles: add abstract methods in remotestore class...
r28442
def _put(self, hash, fd):
'''Put file with the given hash in the remote store.'''
raise NotImplementedError('abstract method')
def _get(self, hash):
Mads Kiilerich
largefiles: always use filechunkiter when iterating files...
r30180 '''Get a iterator for content with the given hash.'''
liscju
largefiles: add abstract methods in remotestore class...
r28442 raise NotImplementedError('abstract method')
def _stat(self, hashes):
'''Get information about availability of files specified by
hashes in the remote store. Return dictionary mapping hashes
to return code where 0 means that file is available, other
values if not.'''
raise NotImplementedError('abstract method')