This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12402

streamclone: avoid some obscure error in a corner case
ClosedPublic

Authored by valentin.gatienbaron on Mar 24 2022, 12:36 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd9ed7c5e915d: streamclone: avoid some obscure error in a corner case
Summary

I don't really know how, but I ran into this error:

$ hg clone --stream ssh://user@dummy/empty-repo local-empty-repo
streaming all changes
abort: unable to apply stream clone: unsupported format:
[255]

I think you need an empty list of requirements for this to happen,
which is weird, but an obscure error like this is not exactly helpful
either. Since this is the result of an encoding bug anyway, just fix
it.

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

joerg.sonnenberger added a subscriber: joerg.sonnenberger.Mar 24 2022, 8:30 PM
joerg.sonnenberger added inline comments.
mercurial/bundle2.py
2533
requirements = urlreq.unquote(part.params[b'requirements'])
requirements = requirements.split(b',') if requirements else []

or so may be better.

valentin.gatienbaron marked an inline comment as done.Mar 26 2022, 2:43 PM
Alphare accepted this revision.Mar 28 2022, 5:07 AM
This revision is now accepted and ready to land.Mar 28 2022, 5:07 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (3 lines)
Mtests/test-clone-stream.t (6 lines)

Diff 32725

mercurial/bundle2.py

key = b"USERVAR_" + key key = b"USERVAR_" + key
hookargs[key] = value hookargs[key] = value
op.addhookargs(hookargs) op.addhookargs(hookargs)
@parthandler(b'stream2', (b'requirements', b'filecount', b'bytecount')) @parthandler(b'stream2', (b'requirements', b'filecount', b'bytecount'))
def handlestreamv2bundle(op, part): def handlestreamv2bundle(op, part):
requirements = urlreq.unquote(part.params[b'requirements']).split(b',') requirements = urlreq.unquote(part.params[b'requirements'])
requirements = requirements.split(b',') if requirements else []
filecount = int(part.params[b'filecount']) filecount = int(part.params[b'filecount'])
joerg.sonnenbergerUnsubmitted
Done
requirements = urlreq.unquote(part.params[b'requirements'])
requirements = requirements.split(b',') if requirements else []

or so may be better.

joerg.sonnenberger: ``` requirements = urlreq.unquote(part.params[b'requirements']) requirements = requirements.
bytecount = int(part.params[b'bytecount']) bytecount = int(part.params[b'bytecount'])
repo = op.repo repo = op.repo
if len(repo): if len(repo):
msg = _(b'cannot apply stream clone to non empty repository') msg = _(b'cannot apply stream clone to non empty repository')
raise error.Abort(msg) raise error.Abort(msg)
repo.ui.debug(b'applying stream bundle\n') repo.ui.debug(b'applying stream bundle\n')

tests/test-clone-stream.t

streaming all changes streaming all changes
remote: abort: server has obsolescence markers, but client cannot receive them via stream clone remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
abort: pull failed on remote abort: pull failed on remote
[100] [100]
$ killdaemons.py $ killdaemons.py
#endif #endif
Cloning a repo with no requirements doesn't give some obscure error
$ mkdir -p empty-repo/.hg
$ hg clone -q --stream ssh://user@dummy/empty-repo empty-repo2
$ hg --cwd empty-repo2 verify -q