Mercurial > public > mercurial-scm > hg
comparison mercurial/bundle2.py @ 47082:1680c94741f8
bundle2: remove restriction around sidedata
We are now capable of generating the missing sidedata on-the-fly.
Differential Revision: https://phab.mercurial-scm.org/D10345
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Thu, 08 Apr 2021 16:30:10 +0200 |
| parents | d55b71393907 |
| children | bea4717415c0 |
comparison
equal
deleted
inserted
replaced
| 47078:223b47235d1c | 47082:1680c94741f8 |
|---|---|
| 2011 op.repo.svfs.options = localrepo.resolvestorevfsoptions( | 2011 op.repo.svfs.options = localrepo.resolvestorevfsoptions( |
| 2012 op.repo.ui, op.repo.requirements, op.repo.features | 2012 op.repo.ui, op.repo.requirements, op.repo.features |
| 2013 ) | 2013 ) |
| 2014 scmutil.writereporequirements(op.repo) | 2014 scmutil.writereporequirements(op.repo) |
| 2015 | 2015 |
| 2016 bundlesidedata = bool(b'exp-sidedata' in inpart.params) | |
| 2017 reposidedata = bool(b'exp-sidedata-flag' in op.repo.requirements) | |
| 2018 if reposidedata and not bundlesidedata: | |
| 2019 msg = b"repository is using sidedata but the bundle source do not" | |
| 2020 hint = b'this is currently unsupported' | |
| 2021 raise error.Abort(msg, hint=hint) | |
| 2022 | |
| 2023 extrakwargs = {} | 2016 extrakwargs = {} |
| 2024 targetphase = inpart.params.get(b'targetphase') | 2017 targetphase = inpart.params.get(b'targetphase') |
| 2025 if targetphase is not None: | 2018 if targetphase is not None: |
| 2026 extrakwargs['targetphase'] = int(targetphase) | 2019 extrakwargs['targetphase'] = int(targetphase) |
| 2027 | 2020 |