| Alphare |
| hg-reviewers |
The supportedformat requirements is missing some important requirements and it
seems better to filter out with all requirements we know, not just an
"arbitrary" subset.
This is especially relevant as we about to phase out the supportedformat class
attribute.
(a backport of this change to stable should be sent soon).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/streamclone.py (4 lines) | |||
| M | tests/test-http-bundle1.t (6 lines) | |||
| M | tests/test-http.t (6 lines) |
| b'warning: stream clone requested but server has them ' | b'warning: stream clone requested but server has them ' | ||||
| b'disabled\n' | b'disabled\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| return False, None | return False, None | ||||
| streamreqs = set(streamreqs.split(b',')) | streamreqs = set(streamreqs.split(b',')) | ||||
| # Server requires something we don't support. Bail. | # Server requires something we don't support. Bail. | ||||
| missingreqs = streamreqs - repo.supportedformats | missingreqs = streamreqs - repo.supported | ||||
| if missingreqs: | if missingreqs: | ||||
| pullop.repo.ui.warn( | pullop.repo.ui.warn( | ||||
| _( | _( | ||||
| b'warning: stream clone requested but client is missing ' | b'warning: stream clone requested but client is missing ' | ||||
| b'requirements: %s\n' | b'requirements: %s\n' | ||||
| ) | ) | ||||
| % b', '.join(sorted(missingreqs)) | % b', '.join(sorted(missingreqs)) | ||||
| ) | ) | ||||
| is at the 2 byte compression identifier. | is at the 2 byte compression identifier. | ||||
| """ | """ | ||||
| if len(repo): | if len(repo): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'cannot apply stream clone bundle on non-empty repo') | _(b'cannot apply stream clone bundle on non-empty repo') | ||||
| ) | ) | ||||
| filecount, bytecount, requirements = readbundle1header(fp) | filecount, bytecount, requirements = readbundle1header(fp) | ||||
| missingreqs = requirements - repo.supportedformats | missingreqs = requirements - repo.supported | ||||
| if missingreqs: | if missingreqs: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'unable to apply stream clone: unsupported format: %s') | _(b'unable to apply stream clone: unsupported format: %s') | ||||
| % b', '.join(sorted(missingreqs)) | % b', '.join(sorted(missingreqs)) | ||||
| ) | ) | ||||
| consumev1(repo, fp, filecount, bytecount) | consumev1(repo, fp, filecount, bytecount) | ||||
| new changesets 8b6053c928fe | new changesets 8b6053c928fe | ||||
| updating to branch default | updating to branch default | ||||
| 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| try to clone via stream but missing requirements, so should use pull instead | try to clone via stream but missing requirements, so should use pull instead | ||||
| $ cat > $TESTTMP/removesupportedformat.py << EOF | $ cat > $TESTTMP/removesupportedformat.py << EOF | ||||
| > from mercurial import localrepo | > from mercurial import localrepo | ||||
| > def extsetup(ui): | > def reposetup(ui, repo): | ||||
| > localrepo.localrepository.supportedformats.remove(b'generaldelta') | > local = repo.local() | ||||
| > if local is not None: | |||||
| > local.supported.remove(b'generaldelta') | |||||
| > EOF | > EOF | ||||
| $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 | $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 | ||||
| warning: stream clone requested but client is missing requirements: generaldelta | warning: stream clone requested but client is missing requirements: generaldelta | ||||
| (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) | (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) | ||||
| requesting all changes | requesting all changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| new changesets 8b6053c928fe | new changesets 8b6053c928fe | ||||
| updating to branch default | updating to branch default | ||||
| 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| try to clone via stream but missing requirements, so should use pull instead | try to clone via stream but missing requirements, so should use pull instead | ||||
| $ cat > $TESTTMP/removesupportedformat.py << EOF | $ cat > $TESTTMP/removesupportedformat.py << EOF | ||||
| > from mercurial import localrepo | > from mercurial import localrepo | ||||
| > def extsetup(ui): | > def reposetup(ui, repo): | ||||
| > localrepo.localrepository.supportedformats.remove(b'generaldelta') | > local = repo.local() | ||||
| > if local is not None: | |||||
| > local.supported.remove(b'generaldelta') | |||||
| > EOF | > EOF | ||||
| $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 | $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 | ||||
| warning: stream clone requested but client is missing requirements: generaldelta | warning: stream clone requested but client is missing requirements: generaldelta | ||||
| (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) | (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) | ||||
| requesting all changes | requesting all changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||