--- a/mercurial/streamclone.py Wed Sep 12 15:17:47 2018 -0700
+++ b/mercurial/streamclone.py Wed Sep 12 15:59:26 2018 -0700
@@ -114,6 +114,8 @@
A legacy stream clone will not be performed if a bundle2 stream clone is
supported.
"""
+ from . import localrepo
+
supported, requirements = canperformstreamclone(pullop)
if not supported:
@@ -166,7 +168,8 @@
# requirements from the streamed-in repository
repo.requirements = requirements | (
repo.requirements - repo.supportedformats)
- repo._applyopenerreqs()
+ repo.svfs.options = localrepo.resolvestorevfsoptions(
+ repo.ui, repo.requirements)
repo._writerequirements()
if rbranchmap:
@@ -624,6 +627,8 @@
progress.complete()
def applybundlev2(repo, fp, filecount, filesize, requirements):
+ from . import localrepo
+
missingreqs = [r for r in requirements if r not in repo.supported]
if missingreqs:
raise error.Abort(_('unable to apply stream clone: '
@@ -637,5 +642,6 @@
# requirements from the streamed-in repository
repo.requirements = set(requirements) | (
repo.requirements - repo.supportedformats)
- repo._applyopenerreqs()
+ repo.svfs.options = localrepo.resolvestorevfsoptions(
+ repo.ui, repo.requirements)
repo._writerequirements()