Mercurial > public > mercurial-scm > hg-stable
diff mercurial/streamclone.py @ 50669:5e60abf811f3
stream-clone: make it the responsability of the store entry to stream content
The store entry has more context, this will especially be true when it comes to
revlogs. So we move the details of how to retrieve binary content to the
StoreEntry. The stream clone code now focus on the protocol bits.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 28 May 2023 05:52:58 +0200 |
| parents | c90ea9bbf327 |
| children | 9caa860dcbec |
line wrap: on
line diff
--- a/mercurial/streamclone.py Mon May 29 11:42:16 2023 +0200 +++ b/mercurial/streamclone.py Sun May 28 05:52:58 2023 +0200 @@ -11,7 +11,6 @@ import struct from .i18n import _ -from .pycompat import open from .interfaces import repository from . import ( bookmarks, @@ -658,36 +657,25 @@ totalbytecount = 0 for src, vfs, e in entries: - for f in e.files(): + for name, stream, size in e.get_streams(vfs, copies=copy): yield src - name = f.unencoded_path yield util.uvarintencode(len(name)) - actual_path = copy[vfs.join(name)] - fp = open(actual_path, b'rb') - size = f.file_size(vfs) + yield util.uvarintencode(size) + yield name bytecount = 0 - 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: - bytecount += len(chunk) - totalbytecount += len(chunk) - progress.update(totalbytecount) - yield chunk - if bytecount != size: - # Would most likely be caused by a race due to `hg - # strip` or a revlog split - msg = _( - b'clone could only read %d bytes from %s, but ' - b'expected %d bytes' - ) - raise error.Abort(msg % (bytecount, name, size)) - finally: - fp.close() + for chunk in stream: + bytecount += len(chunk) + totalbytecount += len(chunk) + progress.update(totalbytecount) + yield chunk + if bytecount != size: + # Would most likely be caused by a race due to `hg + # strip` or a revlog split + msg = _( + b'clone could only read %d bytes from %s, but ' + b'expected %d bytes' + ) + raise error.Abort(msg % (bytecount, name, size)) def _test_sync_point_walk_1(repo):