##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r41764:328ca3b9 default
r41983:169c386c merge default
Show More
streamclone.py
658 lines | 23.0 KiB | text/x-python | PythonLexer
Gregory Szorc
streamclone: move applystreamclone() from localrepo.py...
r26441 # streamclone.py - producing and consuming streaming repository data
#
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 import contextlib
import os
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755 import struct
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
Gregory Szorc
streamclone: move stream_in() from localrepo...
r26442 from .i18n import _
Gregory Szorc
streamclone: move applystreamclone() from localrepo.py...
r26441 from . import (
Boris Feld
streamclone: also stream caches to the client...
r35785 cacheutil,
Gregory Szorc
streamclone: move stream_in() from localrepo...
r26442 error,
Pulkit Goyal
streamclone: pass narrowing related info in _walkstreamfiles()...
r40375 narrowspec,
Gregory Szorc
streamclone: consider secret changesets (BC) (issue5589)...
r32744 phases,
Yuya Nishihara
py3: wrap tempfile.mkstemp() to use bytes path...
r38182 pycompat,
Gregory Szorc
streamclone: don't support stream clone unless repo feature present...
r40064 repository,
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 store,
Gregory Szorc
streamclone: move stream_in() from localrepo...
r26442 util,
Gregory Szorc
streamclone: move applystreamclone() from localrepo.py...
r26441 )
Boris Feld
streamclone: rework canperformstreamclone...
r35775 def canperformstreamclone(pullop, bundle2=False):
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 """Whether it is possible to perform a streaming clone as part of pull.
Gregory Szorc
streamclone: move streaming clone logic from localrepo...
r26445
Boris Feld
streamclone: rework canperformstreamclone...
r35775 ``bundle2`` will cause the function to consider stream clone through
bundle2 and only through bundle2.
Gregory Szorc
streamclone: teach canperformstreamclone to be bundle2 aware...
r26467
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 Returns a tuple of (supported, requirements). ``supported`` is True if
streaming clone is supported and False otherwise. ``requirements`` is
a set of repo requirements from the remote, or ``None`` if stream clone
isn't supported.
"""
Gregory Szorc
streamclone: refactor canperformstreamclone to accept a pullop...
r26466 repo = pullop.repo
remote = pullop.remote
Gregory Szorc
streamclone: teach canperformstreamclone to be bundle2 aware...
r26467 bundle2supported = False
if pullop.canusebundle2:
Boris Feld
streamclone: rework canperformstreamclone...
r35775 if 'v2' in pullop.remotebundle2caps.get('stream', []):
Gregory Szorc
streamclone: teach canperformstreamclone to be bundle2 aware...
r26467 bundle2supported = True
# else
# Server doesn't support bundle2 stream clone or doesn't support
# the versions we support. Fall back and possibly allow legacy.
# Ensures legacy code path uses available bundle2.
Boris Feld
streamclone: rework canperformstreamclone...
r35775 if bundle2supported and not bundle2:
Gregory Szorc
streamclone: teach canperformstreamclone to be bundle2 aware...
r26467 return False, None
# Ensures bundle2 doesn't try to do a stream clone if it isn't supported.
Boris Feld
streamclone: rework canperformstreamclone...
r35775 elif bundle2 and not bundle2supported:
return False, None
Gregory Szorc
streamclone: teach canperformstreamclone to be bundle2 aware...
r26467
Gregory Szorc
streamclone: add explicit check for empty local repo...
r26447 # Streaming clone only works on empty repositories.
if len(repo):
return False, None
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 # Streaming clone only works if all data is being requested.
Gregory Szorc
streamclone: refactor canperformstreamclone to accept a pullop...
r26466 if pullop.heads:
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 return False, None
Gregory Szorc
streamclone: move streaming clone logic from localrepo...
r26445
Gregory Szorc
streamclone: refactor canperformstreamclone to accept a pullop...
r26466 streamrequested = pullop.streamclonerequested
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 # If we don't have a preference, let the server decide for us. This
# likely only comes into play in LANs.
if streamrequested is None:
# The server can advertise whether to prefer streaming clone.
streamrequested = remote.capable('stream-preferred')
if not streamrequested:
return False, None
Gregory Szorc
streamclone: move streaming clone logic from localrepo...
r26445
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 # In order for stream clone to work, the client has to support all the
# requirements advertised by the server.
#
# The server advertises its requirements via the "stream" and "streamreqs"
# capability. "stream" (a value-less capability) is advertised if and only
# if the only requirement is "revlogv1." Else, the "streamreqs" capability
# is advertised and contains a comma-delimited list of requirements.
requirements = set()
if remote.capable('stream'):
requirements.add('revlogv1')
else:
streamreqs = remote.capable('streamreqs')
# This is weird and shouldn't happen with modern servers.
if not streamreqs:
Siddharth Agarwal
clone: warn when streaming was requested but couldn't be performed...
r32259 pullop.repo.ui.warn(_(
'warning: stream clone requested but server has them '
'disabled\n'))
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 return False, None
streamreqs = set(streamreqs.split(','))
# Server requires something we don't support. Bail.
Siddharth Agarwal
clone: warn when streaming was requested but couldn't be performed...
r32259 missingreqs = streamreqs - repo.supportedformats
if missingreqs:
pullop.repo.ui.warn(_(
'warning: stream clone requested but client is missing '
'requirements: %s\n') % ', '.join(sorted(missingreqs)))
pullop.repo.ui.warn(
_('(see https://www.mercurial-scm.org/wiki/MissingRequirement '
'for more information)\n'))
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 return False, None
requirements = streamreqs
return True, requirements
Gregory Szorc
streamclone: rename and document maybeperformstreamclone()...
r26462 def maybeperformlegacystreamclone(pullop):
"""Possibly perform a legacy stream clone operation.
Legacy stream clones are performed as part of pull but before all other
operations.
A legacy stream clone will not be performed if a bundle2 stream clone is
supported.
"""
Gregory Szorc
localrepo: extract resolving of opener options to standalone functions...
r39736 from . import localrepo
Gregory Szorc
streamclone: refactor canperformstreamclone to accept a pullop...
r26466 supported, requirements = canperformstreamclone(pullop)
Gregory Szorc
streamclone: refactor maybeperformstreamclone to take a pullop...
r26458
Gregory Szorc
streamclone: refactor code for deciding to stream clone...
r26446 if not supported:
return
Gregory Szorc
streamclone: refactor canperformstreamclone to accept a pullop...
r26466 repo = pullop.repo
remote = pullop.remote
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459 # Save remote branchmap. We will use it later to speed up branchcache
# creation.
rbranchmap = None
if remote.capable('branchmap'):
Gregory Szorc
streamclone: use command executor for wire protocol commands...
r37656 with remote.commandexecutor() as e:
rbranchmap = e.callcommand('branchmap', {}).result()
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459
Gregory Szorc
streamclone: move "streaming all changes" message location...
r26470 repo.ui.status(_('streaming all changes\n'))
Gregory Szorc
streamclone: use command executor for wire protocol commands...
r37656 with remote.commandexecutor() as e:
fp = e.callcommand('stream_out', {}).result()
# TODO strictly speaking, this code should all be inside the context
# manager because the context manager is supposed to ensure all wire state
# is flushed when exiting. But the legacy peers don't do this, so it
# doesn't matter.
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459 l = fp.readline()
try:
resp = int(l)
except ValueError:
raise error.ResponseError(
_('unexpected response from remote server:'), l)
if resp == 1:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('operation forbidden by server'))
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459 elif resp == 2:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('locking the remote repository failed'))
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459 elif resp != 0:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('the server sent an unknown error code'))
Gregory Szorc
streamclone: move streamin() into maybeperformstreamclone()...
r26459
Gregory Szorc
streamclone: move payload header line consumption...
r26468 l = fp.readline()
try:
filecount, bytecount = map(int, l.split(' ', 1))
except (ValueError, TypeError):
raise error.ResponseError(
_('unexpected response from remote server:'), l)
Bryan O'Sullivan
with: use context manager in maybeperformlegacystreamclone
r27850 with repo.lock():
Gregory Szorc
streamclone: move payload header line consumption...
r26468 consumev1(repo, fp, filecount, bytecount)
Gregory Szorc
streamclone: move applyremotedata() into maybeperformstreamclone()...
r26461
# new requirements = old non-format requirements +
# new format-related remote requirements
# requirements from the streamed-in repository
repo.requirements = requirements | (
repo.requirements - repo.supportedformats)
Gregory Szorc
localrepo: extract resolving of opener options to standalone functions...
r39736 repo.svfs.options = localrepo.resolvestorevfsoptions(
Gregory Szorc
localrepo: define "features" on repository instances (API)...
r39886 repo.ui, repo.requirements, repo.features)
Gregory Szorc
streamclone: move applyremotedata() into maybeperformstreamclone()...
r26461 repo._writerequirements()
if rbranchmap:
Martijn Pieters
branchmap: encapsulate cache updating in the map itself...
r41764 repo._branchcaches.replace(repo, rbranchmap)
Gregory Szorc
streamclone: move applyremotedata() into maybeperformstreamclone()...
r26461
repo.invalidate()
Gregory Szorc
streamclone: move streaming clone logic from localrepo...
r26445
Gregory Szorc
streamclone: consider secret changesets (BC) (issue5589)...
r32744 def allowservergeneration(repo):
Gregory Szorc
streamclone: move _allowstream() from wireproto...
r26444 """Whether streaming clones are allowed from the server."""
Gregory Szorc
streamclone: don't support stream clone unless repo feature present...
r40064 if repository.REPO_FEATURE_STREAM_CLONE not in repo.features:
return False
Jun Wu
codemod: register core configitems using a script...
r33499 if not repo.ui.configbool('server', 'uncompressed', untrusted=True):
Gregory Szorc
streamclone: consider secret changesets (BC) (issue5589)...
r32744 return False
# The way stream clone works makes it impossible to hide secret changesets.
# So don't allow this by default.
secret = phases.hassecret(repo)
if secret:
configitems: register the 'server.uncompressedallowsecret' config
r33223 return repo.ui.configbool('server', 'uncompressedallowsecret')
Gregory Szorc
streamclone: consider secret changesets (BC) (issue5589)...
r32744
return True
Gregory Szorc
streamclone: move _allowstream() from wireproto...
r26444
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 # This is it's own function so extensions can override it.
Pulkit Goyal
streamclone: pass narrowing related info in _walkstreamfiles()...
r40375 def _walkstreamfiles(repo, matcher=None):
return repo.store.walk(matcher)
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
def generatev1(repo):
"""Emit content for version 1 of a streaming clone.
Gregory Szorc
streamclone: move payload header generation into own function...
r26469 This returns a 3-tuple of (file count, byte size, data iterator).
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
Gregory Szorc
streamclone: move payload header generation into own function...
r26469 The data iterator consists of N entries for each file being transferred.
Each file entry starts as a line with the file name and integer size
delimited by a null byte.
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
The raw file data follows. Following the raw file data is the next file
entry, or EOF.
When used on the wire protocol, an additional line indicating protocol
success will be prepended to the stream. This function is not responsible
for adding it.
This function will obtain a repository lock to ensure a consistent view of
the store is captured. It therefore may raise LockError.
"""
entries = []
total_bytes = 0
# Get consistent snapshot of repo, lock during scan.
Bryan O'Sullivan
with: use context manager in streamclone generatev1
r27845 with repo.lock():
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 repo.ui.debug('scanning\n')
for name, ename, size in _walkstreamfiles(repo):
if size:
entries.append((name, size))
total_bytes += size
repo.ui.debug('%d files, %d bytes to transfer\n' %
(len(entries), total_bytes))
svfs = repo.svfs
debugflag = repo.ui.debugflag
Gregory Szorc
streamclone: move payload header generation into own function...
r26469 def emitrevlogdata():
streamclone: stop using 'vfs.mustaudit = False'...
r33256 for name, size in entries:
if debugflag:
repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
# partially encode name over the wire for backwards compat
yield '%s\0%d\n' % (store.encodedir(name), size)
Yuya Nishihara
streamclone: comment why path auditing is disabled in generatev1()...
r33411 # auditing at this stage is both pointless (paths are already
# trusted by the local repo) and expensive
Yuya Nishihara
streamclone: close large revlog files explicitly in generatev1()
r33410 with svfs(name, 'rb', auditpath=False) as fp:
if size <= 65536:
streamclone: stop using 'vfs.mustaudit = False'...
r33256 yield fp.read(size)
Yuya Nishihara
streamclone: close large revlog files explicitly in generatev1()
r33410 else:
for chunk in util.filechunkiter(fp, limit=size):
yield chunk
Gregory Szorc
streamclone: move payload header generation into own function...
r26469
return len(entries), total_bytes, emitrevlogdata()
def generatev1wireproto(repo):
"""Emit content for version 1 of streaming clone suitable for the wire.
Gregory Szorc
streamclone: move wire protocol status code from wireproto command...
r35507 This is the data output from ``generatev1()`` with 2 header lines. The
first line indicates overall success. The 2nd contains the file count and
byte size of payload.
The success line contains "0" for success, "1" for stream generation not
allowed, and "2" for error locking the repository (possibly indicating
a permissions error for the server process).
Gregory Szorc
streamclone: move payload header generation into own function...
r26469 """
Gregory Szorc
streamclone: move wire protocol status code from wireproto command...
r35507 if not allowservergeneration(repo):
yield '1\n'
return
try:
filecount, bytecount, it = generatev1(repo)
except error.LockError:
yield '2\n'
return
# Indicates successful response.
yield '0\n'
Gregory Szorc
streamclone: move payload header generation into own function...
r26469 yield '%d %d\n' % (filecount, bytecount)
for chunk in it:
yield chunk
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755 def generatebundlev1(repo, compression='UN'):
"""Emit content for version 1 of a stream clone bundle.
The first 4 bytes of the output ("HGS1") denote this as stream clone
bundle version 1.
The next 2 bytes indicate the compression type. Only "UN" is currently
supported.
The next 16 bytes are two 64-bit big endian unsigned integers indicating
file count and byte count, respectively.
The next 2 bytes is a 16-bit big endian unsigned short declaring the length
of the requirements string, including a trailing \0. The following N bytes
are the requirements string, which is ASCII containing a comma-delimited
list of repo requirements that are needed to support the data.
The remaining content is the output of ``generatev1()`` (which may be
compressed in the future).
Returns a tuple of (requirements, data generator).
"""
if compression != 'UN':
raise ValueError('we do not support the compression argument yet')
requirements = repo.requirements & repo.supportedformats
requires = ','.join(sorted(requirements))
def gen():
yield 'HGS1'
yield compression
filecount, bytecount, it = generatev1(repo)
repo.ui.status(_('writing %d bytes for %d files\n') %
(bytecount, filecount))
yield struct.pack('>QQ', filecount, bytecount)
yield struct.pack('>H', len(requires) + 1)
yield requires + '\0'
# This is where we'll add compression in the future.
assert compression == 'UN'
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress = repo.ui.makeprogress(_('bundle'), total=bytecount,
unit=_('bytes'))
progress.update(0)
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755
for chunk in it:
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress.increment(step=len(chunk))
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755 yield chunk
Martin von Zweigbergk
progress: hide update(None) in a new complete() method...
r38392 progress.complete()
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755
return requirements, gen()
Gregory Szorc
streamclone: move payload header line consumption...
r26468 def consumev1(repo, fp, filecount, bytecount):
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 """Apply the contents from version 1 of a streaming clone file handle.
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 This takes the output from "stream_out" and applies it to the specified
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 repository.
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 Like "stream_out," the status line added by the wire protocol is not
handled by this function.
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 """
Bryan O'Sullivan
with: use context manager in streamclone consumev1
r27859 with repo.lock():
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 repo.ui.status(_('%d files to transfer, %s of data\n') %
Gregory Szorc
streamclone: move payload header line consumption...
r26468 (filecount, util.bytecount(bytecount)))
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress = repo.ui.makeprogress(_('clone'), total=bytecount,
unit=_('bytes'))
progress.update(0)
Simon Farnsworth
mercurial: switch to util.timer for all interval timings...
r30975 start = util.timer()
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
FUJIWARA Katsunori
streamclone: clear caches after writing changes into files for visibility...
r29919 # TODO: get rid of (potential) inconsistency
#
# If transaction is started and any @filecache property is
# changed at this point, it causes inconsistency between
# in-memory cached property and streamclone-ed file on the
# disk. Nested transaction prevents transaction scope "clone"
# below from writing in-memory changes out at the end of it,
# even though in-memory changes are discarded at the end of it
# regardless of transaction nesting.
#
# But transaction nesting can't be simply prohibited, because
# nesting occurs also in ordinary case (e.g. enabling
# clonebundles).
Bryan O'Sullivan
with: use context manager for transaction in consumev1
r27870 with repo.transaction('clone'):
Gregory Szorc
streamclone: use backgroundfilecloser (issue4889)...
r27897 with repo.svfs.backgroundclosing(repo.ui, expectedcount=filecount):
Gregory Szorc
global: use pycompat.xrange()...
r38806 for i in pycompat.xrange(filecount):
Gregory Szorc
streamclone: indent code...
r27896 # XXX doesn't support '\n' or '\r' in filenames
l = fp.readline()
try:
name, size = l.split('\0', 1)
size = int(size)
except (ValueError, TypeError):
raise error.ResponseError(
_('unexpected response from remote server:'), l)
if repo.ui.debugflag:
repo.ui.debug('adding %s (%s)\n' %
(name, util.bytecount(size)))
# for backwards compat, name was partially encoded
Gregory Szorc
streamclone: use backgroundfilecloser (issue4889)...
r27897 path = store.decodedir(name)
with repo.svfs(path, 'w', backgroundclose=True) as ofp:
Gregory Szorc
streamclone: indent code...
r27896 for chunk in util.filechunkiter(fp, limit=size):
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress.increment(step=len(chunk))
Gregory Szorc
streamclone: indent code...
r27896 ofp.write(chunk)
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
FUJIWARA Katsunori
streamclone: clear caches after writing changes into files for visibility...
r29919 # force @filecache properties to be reloaded from
# streamclone-ed file at next access
repo.invalidate(clearfilecache=True)
Gregory Szorc
streamclone: move code out of exchange.py...
r26443
Simon Farnsworth
mercurial: switch to util.timer for all interval timings...
r30975 elapsed = util.timer() - start
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 if elapsed <= 0:
elapsed = 0.001
Martin von Zweigbergk
progress: hide update(None) in a new complete() method...
r38392 progress.complete()
Gregory Szorc
streamclone: move code out of exchange.py...
r26443 repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
Gregory Szorc
streamclone: move payload header line consumption...
r26468 (util.bytecount(bytecount), elapsed,
util.bytecount(bytecount / elapsed)))
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755
Gregory Szorc
streamclone: extract code for reading header fields...
r27882 def readbundle1header(fp):
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755 compression = fp.read(2)
if compression != 'UN':
raise error.Abort(_('only uncompressed stream clone bundles are '
'supported; got %s') % compression)
filecount, bytecount = struct.unpack('>QQ', fp.read(16))
requireslen = struct.unpack('>H', fp.read(2))[0]
requires = fp.read(requireslen)
if not requires.endswith('\0'):
raise error.Abort(_('malformed stream clone bundle: '
'requirements not properly encoded'))
requirements = set(requires.rstrip('\0').split(','))
Gregory Szorc
streamclone: extract code for reading header fields...
r27882
return filecount, bytecount, requirements
def applybundlev1(repo, fp):
"""Apply the content from a stream clone bundle version 1.
We assume the 4 byte header has been read and validated and the file handle
is at the 2 byte compression identifier.
"""
if len(repo):
raise error.Abort(_('cannot apply stream clone bundle on non-empty '
'repo'))
filecount, bytecount, requirements = readbundle1header(fp)
Gregory Szorc
streamclone: support for producing and consuming stream clone bundles...
r26755 missingreqs = requirements - repo.supportedformats
if missingreqs:
raise error.Abort(_('unable to apply stream clone: '
'unsupported format: %s') %
', '.join(sorted(missingreqs)))
consumev1(repo, fp, filecount, bytecount)
class streamcloneapplier(object):
"""Class to manage applying streaming clone bundles.
We need to wrap ``applybundlev1()`` in a dedicated type to enable bundle
readers to perform bundle type-specific functionality.
"""
def __init__(self, fh):
self._fh = fh
def apply(self, repo):
return applybundlev1(repo, self._fh)
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 # type of file to stream
_fileappend = 0 # append only file
_filefull = 1 # full snapshot file
Boris Feld
streamclone: also stream caches to the client...
r35785 # Source of the file
_srcstore = 's' # store (svfs)
_srccache = 'c' # cache (cache)
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 # This is it's own function so extensions can override it.
def _walkstreamfullstorefiles(repo):
"""list snapshot file from the store"""
fnames = []
if not repo.publishing():
fnames.append('phaseroots')
return fnames
Boris Feld
streamclone: also stream caches to the client...
r35785 def _filterfull(entry, copy, vfsmap):
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 """actually copy the snapshot files"""
Boris Feld
streamclone: also stream caches to the client...
r35785 src, name, ftype, data = entry
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 if ftype != _filefull:
return entry
Boris Feld
streamclone: also stream caches to the client...
r35785 return (src, name, ftype, copy(vfsmap[src].join(name)))
Boris Feld
streamclone: add support for cloning non append-only file...
r35783
@contextlib.contextmanager
def maketempcopies():
"""return a function to temporary copy file"""
files = []
try:
def copy(src):
Yuya Nishihara
py3: wrap tempfile.mkstemp() to use bytes path...
r38182 fd, dst = pycompat.mkstemp()
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 os.close(fd)
files.append(dst)
util.copyfiles(src, dst, hardlink=True)
return dst
yield copy
finally:
for tmp in files:
util.tryunlink(tmp)
Boris Feld
streamclone: also stream caches to the client...
r35785 def _makemap(repo):
"""make a (src -> vfs) map for the repo"""
vfsmap = {
_srcstore: repo.svfs,
_srccache: repo.cachevfs,
}
# we keep repo.vfs out of the on purpose, ther are too many danger there
# (eg: .hg/hgrc)
assert repo.vfs not in vfsmap.values()
return vfsmap
Boris Feld
streamclone: rename '_emit' to '_emit2' for clarity...
r35820 def _emit2(repo, entries, totalfilesize):
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 """actually emit the stream bundle"""
Boris Feld
streamclone: also stream caches to the client...
r35785 vfsmap = _makemap(repo)
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress = repo.ui.makeprogress(_('bundle'), total=totalfilesize,
unit=_('bytes'))
progress.update(0)
Martin von Zweigbergk
progress: make the progress helper a context manager...
r38393 with maketempcopies() as copy, progress:
# copy is delayed until we are in the try
entries = [_filterfull(e, copy, vfsmap) for e in entries]
yield None # this release the lock on the repository
seen = 0
Boris Feld
streamclone: add support for cloning non append-only file...
r35783
Martin von Zweigbergk
progress: make the progress helper a context manager...
r38393 for src, name, ftype, data in entries:
vfs = vfsmap[src]
yield src
yield util.uvarintencode(len(name))
if ftype == _fileappend:
fp = vfs(name)
size = data
elif ftype == _filefull:
fp = open(data, 'rb')
size = util.fstat(fp).st_size
try:
yield util.uvarintencode(size)
yield name
if size <= 65536:
chunks = (fp.read(size),)
else:
chunks = util.filechunkiter(fp, limit=size)
for chunk in chunks:
seen += len(chunk)
progress.update(seen)
yield chunk
finally:
fp.close()
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
av6
streamclone: include obsstore file into stream bundle if client can read it
r40434 def generatev2(repo, includes, excludes, includeobsmarkers):
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 """Emit content for version 2 of a streaming clone.
the data stream consists the following entries:
Boris Feld
streamclone: also stream caches to the client...
r35785 1) A char representing the file destination (eg: store or cache)
2) A varint containing the length of the filename
3) A varint containing the length of file data
4) N bytes containing the filename (the internal, store-agnostic form)
5) N bytes containing the file data
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
Returns a 3-tuple of (file count, file size, data iterator).
"""
with repo.lock():
entries = []
totalfilesize = 0
Pulkit Goyal
streamclone: pass narrowing related info in _walkstreamfiles()...
r40375 matcher = None
if includes or excludes:
matcher = narrowspec.match(repo.root, includes, excludes)
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 repo.ui.debug('scanning\n')
Pulkit Goyal
streamclone: pass narrowing related info in _walkstreamfiles()...
r40375 for name, ename, size in _walkstreamfiles(repo, matcher):
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 if size:
Boris Feld
streamclone: also stream caches to the client...
r35785 entries.append((_srcstore, name, _fileappend, size))
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 totalfilesize += size
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 for name in _walkstreamfullstorefiles(repo):
if repo.svfs.exists(name):
totalfilesize += repo.svfs.lstat(name).st_size
Boris Feld
streamclone: also stream caches to the client...
r35785 entries.append((_srcstore, name, _filefull, None))
av6
streamclone: include obsstore file into stream bundle if client can read it
r40434 if includeobsmarkers and repo.svfs.exists('obsstore'):
totalfilesize += repo.svfs.lstat('obsstore').st_size
entries.append((_srcstore, 'obsstore', _filefull, None))
Boris Feld
streamclone: also stream caches to the client...
r35785 for name in cacheutil.cachetocopy(repo):
if repo.cachevfs.exists(name):
totalfilesize += repo.cachevfs.lstat(name).st_size
entries.append((_srccache, name, _filefull, None))
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
Boris Feld
streamclone: rename '_emit' to '_emit2' for clarity...
r35820 chunks = _emit2(repo, entries, totalfilesize)
Boris Feld
streamclone: add support for cloning non append-only file...
r35783 first = next(chunks)
assert first is None
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
return len(entries), totalfilesize, chunks
Boris Feld
streamclone: also stream caches to the client...
r35785 @contextlib.contextmanager
def nested(*ctxs):
Augie Fackler
streamclone: reimplement nested context manager...
r39793 this = ctxs[0]
rest = ctxs[1:]
with this:
if rest:
with nested(*rest):
yield
else:
Boris Feld
streamclone: also stream caches to the client...
r35785 yield
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 def consumev2(repo, fp, filecount, filesize):
"""Apply the contents from a version 2 streaming clone.
Data is read from an object that only needs to provide a ``read(size)``
method.
"""
with repo.lock():
repo.ui.status(_('%d files to transfer, %s of data\n') %
(filecount, util.bytecount(filesize)))
start = util.timer()
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress = repo.ui.makeprogress(_('clone'), total=filesize,
unit=_('bytes'))
progress.update(0)
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
Boris Feld
streamclone: also stream caches to the client...
r35785 vfsmap = _makemap(repo)
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
with repo.transaction('clone'):
Boris Feld
streamclone: also stream caches to the client...
r35785 ctxs = (vfs.backgroundclosing(repo.ui)
for vfs in vfsmap.values())
with nested(*ctxs):
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 for i in range(filecount):
Boris Feld
streamclone: use readexactly when reading stream v2...
r35821 src = util.readexactly(fp, 1)
Boris Feld
streamclone: also stream caches to the client...
r35785 vfs = vfsmap[src]
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 namelen = util.uvarintdecodestream(fp)
datalen = util.uvarintdecodestream(fp)
Boris Feld
streamclone: use readexactly when reading stream v2...
r35821 name = util.readexactly(fp, namelen)
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
if repo.ui.debugflag:
Boris Feld
streamclone: also stream caches to the client...
r35785 repo.ui.debug('adding [%s] %s (%s)\n' %
(src, name, util.bytecount(datalen)))
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
with vfs(name, 'w') as ofp:
for chunk in util.filechunkiter(fp, limit=datalen):
Martin von Zweigbergk
streamclone: use progress helper...
r38368 progress.increment(step=len(chunk))
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 ofp.write(chunk)
# force @filecache properties to be reloaded from
# streamclone-ed file at next access
repo.invalidate(clearfilecache=True)
elapsed = util.timer() - start
if elapsed <= 0:
elapsed = 0.001
repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
Martin von Zweigbergk
streamclone: use progress helper...
r38368 (util.bytecount(progress.pos), elapsed,
util.bytecount(progress.pos / elapsed)))
Martin von Zweigbergk
progress: hide update(None) in a new complete() method...
r38392 progress.complete()
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774
def applybundlev2(repo, fp, filecount, filesize, requirements):
Gregory Szorc
localrepo: extract resolving of opener options to standalone functions...
r39736 from . import localrepo
Boris Feld
streamclone: define first iteration of version 2 of stream format...
r35774 missingreqs = [r for r in requirements if r not in repo.supported]
if missingreqs:
raise error.Abort(_('unable to apply stream clone: '
'unsupported format: %s') %
', '.join(sorted(missingreqs)))
consumev2(repo, fp, filecount, filesize)
Boris Feld
streamclone: move requirement update into consumev2...
r35822
# new requirements = old non-format requirements +
# new format-related remote requirements
# requirements from the streamed-in repository
repo.requirements = set(requirements) | (
repo.requirements - repo.supportedformats)
Gregory Szorc
localrepo: extract resolving of opener options to standalone functions...
r39736 repo.svfs.options = localrepo.resolvestorevfsoptions(
Gregory Szorc
localrepo: define "features" on repository instances (API)...
r39886 repo.ui, repo.requirements, repo.features)
Boris Feld
streamclone: move requirement update into consumev2...
r35822 repo._writerequirements()