Show More
@@ -2155,11 +2155,3 b' def handlestreamv2bundle(op, part):' | |||||
2155 | repo.ui.debug('applying stream bundle\n') |
|
2155 | repo.ui.debug('applying stream bundle\n') | |
2156 | streamclone.applybundlev2(repo, part, filecount, bytecount, |
|
2156 | streamclone.applybundlev2(repo, part, filecount, bytecount, | |
2157 | requirements) |
|
2157 | requirements) | |
2158 |
|
||||
2159 | # new requirements = old non-format requirements + |
|
|||
2160 | # new format-related remote requirements |
|
|||
2161 | # requirements from the streamed-in repository |
|
|||
2162 | repo.requirements = set(requirements) | ( |
|
|||
2163 | repo.requirements - repo.supportedformats) |
|
|||
2164 | repo._applyopenerreqs() |
|
|||
2165 | repo._writerequirements() |
|
@@ -632,3 +632,11 b' def applybundlev2(repo, fp, filecount, f' | |||||
632 | ', '.join(sorted(missingreqs))) |
|
632 | ', '.join(sorted(missingreqs))) | |
633 |
|
633 | |||
634 | consumev2(repo, fp, filecount, filesize) |
|
634 | consumev2(repo, fp, filecount, filesize) | |
|
635 | ||||
|
636 | # new requirements = old non-format requirements + | |||
|
637 | # new format-related remote requirements | |||
|
638 | # requirements from the streamed-in repository | |||
|
639 | repo.requirements = set(requirements) | ( | |||
|
640 | repo.requirements - repo.supportedformats) | |||
|
641 | repo._applyopenerreqs() | |||
|
642 | repo._writerequirements() |
General Comments 0
You need to be logged in to leave comments.
Login now