# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1516978267 -3600
# Node ID 2d3e486d09d02b81f4fe094a8078e678b581bdc0
# Parent  3ad3aaeb11340cb03f213f6c17e86102bd24fa3e
streamclone: move requirement update into consumev2

This change was suggested by Gregory Szorc.

diff -r 3ad3aaeb1134 -r 2d3e486d09d0 mercurial/bundle2.py
--- 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()
diff -r 3ad3aaeb1134 -r 2d3e486d09d0 mercurial/streamclone.py
--- 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()