--- a/mercurial/exchange.py Sat Aug 08 15:48:17 2020 +0530
+++ b/mercurial/exchange.py Sat Aug 08 16:24:12 2020 +0530
@@ -32,6 +32,7 @@
phases,
pushkey,
pycompat,
+ requirements,
scmutil,
sslutil,
streamclone,
@@ -39,7 +40,6 @@
util,
wireprototypes,
)
-from .interfaces import repository
from .utils import (
hashutil,
stringutil,
@@ -1068,7 +1068,7 @@
cgpart = bundler.newpart(b'changegroup', data=cgstream)
if cgversions:
cgpart.addparam(b'version', version)
- if repository.TREEMANIFEST_REQUIREMENT in pushop.repo.requirements:
+ if requirements.TREEMANIFEST_REQUIREMENT in pushop.repo.requirements:
cgpart.addparam(b'treemanifest', b'1')
if b'exp-sidedata-flag' in pushop.repo.requirements:
cgpart.addparam(b'exp-sidedata', b'1')
@@ -1691,7 +1691,7 @@
old_heads = unficl.heads()
clstart = len(unficl)
_pullbundle2(pullop)
- if repository.NARROW_REQUIREMENT in repo.requirements:
+ if requirements.NARROW_REQUIREMENT in repo.requirements:
# XXX narrow clones filter the heads on the server side during
# XXX getbundle and result in partial replies as well.
# XXX Disable pull bundles in this case as band aid to avoid
@@ -2557,7 +2557,7 @@
part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False)
- if repository.TREEMANIFEST_REQUIREMENT in repo.requirements:
+ if requirements.TREEMANIFEST_REQUIREMENT in repo.requirements:
part.addparam(b'treemanifest', b'1')
if b'exp-sidedata-flag' in repo.requirements: