Mercurial > hg
changeset 35804:2d3e486d09d0 stable
streamclone: move requirement update into consumev2
This change was suggested by Gregory Szorc.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 26 Jan 2018 15:51:07 +0100 |
| parents | 3ad3aaeb1134 |
| children | 784ac51f8bab |
| files | mercurial/bundle2.py mercurial/streamclone.py |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Wed Jan 24 21:44:31 2018 +0100 +++ b/mercurial/bundle2.py Fri Jan 26 15:51:07 2018 +0100 @@ -2155,11 +2155,3 @@ repo.ui.debug('applying stream bundle\n') streamclone.applybundlev2(repo, part, filecount, bytecount, requirements) - - # 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) - repo._applyopenerreqs() - repo._writerequirements()
--- a/mercurial/streamclone.py Wed Jan 24 21:44:31 2018 +0100 +++ b/mercurial/streamclone.py Fri Jan 26 15:51:07 2018 +0100 @@ -632,3 +632,11 @@ ', '.join(sorted(missingreqs))) consumev2(repo, fp, filecount, filesize) + + # 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) + repo._applyopenerreqs() + repo._writerequirements()