--- a/mercurial/bundle2.py Thu Sep 03 11:07:47 2020 -0400
+++ b/mercurial/bundle2.py Tue Sep 01 18:08:24 2020 +0530
@@ -1964,10 +1964,7 @@
nbchangesets = None
if b'nbchanges' in inpart.params:
nbchangesets = int(inpart.params.get(b'nbchanges'))
- if (
- b'treemanifest' in inpart.params
- and requirements.TREEMANIFEST_REQUIREMENT not in op.repo.requirements
- ):
+ if b'treemanifest' in inpart.params and not scmutil.istreemanifest(op.repo):
if len(op.repo.changelog) != 0:
raise error.Abort(
_(
@@ -2577,7 +2574,7 @@
part = bundler.newpart(b'changegroup', data=cgdata)
part.addparam(b'version', cgversion)
- if requirements.TREEMANIFEST_REQUIREMENT in repo.requirements:
+ if scmutil.istreemanifest(repo):
part.addparam(b'treemanifest', b'1')
if b'exp-sidedata-flag' in repo.requirements:
part.addparam(b'exp-sidedata', b'1')