This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1754

streamclone: move wire protocol status code from wireproto command
ClosedPublic

Authored by indygreg on Dec 24 2017, 1:47 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGded3a63f305b: streamclone: move wire protocol status code from wireproto command
Summary

This consolidates the code for the streaming clone wire protocol format
into streamclone.py. It also eliminates a generator wrapper, which might
make streaming clones slightly faster.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Dec 24 2017, 1:47 PM
yuja accepted this revision.Dec 26 2017, 8:10 AM
This revision is now accepted and ready to land.Dec 26 2017, 8:10 AM
Closed by commit rHGded3a63f305b: streamclone: move wire protocol status code from wireproto command (authored by indygreg). · Explain WhyDec 26 2017, 9:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (22 lines)
Mmercurial/wireproto.py (16 lines)

Diff 4614

mercurial/streamclone.py

for chunk in util.filechunkiter(fp, limit=size): for chunk in util.filechunkiter(fp, limit=size):
yield chunk yield chunk
return len(entries), total_bytes, emitrevlogdata() return len(entries), total_bytes, emitrevlogdata()
def generatev1wireproto(repo): def generatev1wireproto(repo):
"""Emit content for version 1 of streaming clone suitable for the wire. """Emit content for version 1 of streaming clone suitable for the wire.
This is the data output from ``generatev1()`` with a header line This is the data output from ``generatev1()`` with 2 header lines. The
indicating file count and byte size. 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).
""" """
if not allowservergeneration(repo):
yield '1\n'
return
try:
filecount, bytecount, it = generatev1(repo) filecount, bytecount, it = generatev1(repo)
except error.LockError:
yield '2\n'
return
# Indicates successful response.
yield '0\n'
yield '%d %d\n' % (filecount, bytecount) yield '%d %d\n' % (filecount, bytecount)
for chunk in it: for chunk in it:
yield chunk yield chunk
def generatebundlev1(repo, compression='UN'): def generatebundlev1(repo, compression='UN'):
"""Emit content for version 1 of a stream clone bundle. """Emit content for version 1 of a stream clone bundle.
The first 4 bytes of the output ("HGS1") denote this as stream clone The first 4 bytes of the output ("HGS1") denote this as stream clone

mercurial/wireproto.py

return '%s\n' % int(r) return '%s\n' % int(r)
@wireprotocommand('stream_out') @wireprotocommand('stream_out')
def stream(repo, proto): def stream(repo, proto):
'''If the server supports streaming clone, it advertises the "stream" '''If the server supports streaming clone, it advertises the "stream"
capability with a value representing the version and flags of the repo capability with a value representing the version and flags of the repo
it is serving. Client checks to see if it understands the format. it is serving. Client checks to see if it understands the format.
''' '''
if not streamclone.allowservergeneration(repo): return streamres(streamclone.generatev1wireproto(repo))
return '1\n'
def getstream(it):
yield '0\n'
for chunk in it:
yield chunk
try:
# LockError may be raised before the first result is yielded. Don't
# emit output until we're sure we got the lock successfully.
it = streamclone.generatev1wireproto(repo)
return streamres(gen=getstream(it))
except error.LockError:
return '2\n'
@wireprotocommand('unbundle', 'heads') @wireprotocommand('unbundle', 'heads')
def unbundle(repo, proto, heads): def unbundle(repo, proto, heads):
their_heads = decodelist(heads) their_heads = decodelist(heads)
try: try:
proto.redirect() proto.redirect()