equal
deleted
inserted
replaced
166 # new format-related remote requirements |
166 # new format-related remote requirements |
167 # requirements from the streamed-in repository |
167 # requirements from the streamed-in repository |
168 repo.requirements = requirements | ( |
168 repo.requirements = requirements | ( |
169 repo.requirements - repo.supportedformats) |
169 repo.requirements - repo.supportedformats) |
170 repo.svfs.options = localrepo.resolvestorevfsoptions( |
170 repo.svfs.options = localrepo.resolvestorevfsoptions( |
171 repo.ui, repo.requirements) |
171 repo.ui, repo.requirements, repo.features) |
172 repo._writerequirements() |
172 repo._writerequirements() |
173 |
173 |
174 if rbranchmap: |
174 if rbranchmap: |
175 branchmap.replacecache(repo, rbranchmap) |
175 branchmap.replacecache(repo, rbranchmap) |
176 |
176 |
641 # new format-related remote requirements |
641 # new format-related remote requirements |
642 # requirements from the streamed-in repository |
642 # requirements from the streamed-in repository |
643 repo.requirements = set(requirements) | ( |
643 repo.requirements = set(requirements) | ( |
644 repo.requirements - repo.supportedformats) |
644 repo.requirements - repo.supportedformats) |
645 repo.svfs.options = localrepo.resolvestorevfsoptions( |
645 repo.svfs.options = localrepo.resolvestorevfsoptions( |
646 repo.ui, repo.requirements) |
646 repo.ui, repo.requirements, repo.features) |
647 repo._writerequirements() |
647 repo._writerequirements() |