equal
deleted
inserted
replaced
1796 raise error.Abort(_( |
1796 raise error.Abort(_( |
1797 "bundle contains tree manifests, but local repo is " |
1797 "bundle contains tree manifests, but local repo is " |
1798 "non-empty and does not use tree manifests")) |
1798 "non-empty and does not use tree manifests")) |
1799 op.repo.requirements.add('treemanifest') |
1799 op.repo.requirements.add('treemanifest') |
1800 op.repo.svfs.options = localrepo.resolvestorevfsoptions( |
1800 op.repo.svfs.options = localrepo.resolvestorevfsoptions( |
1801 op.repo.ui, op.repo.requirements) |
1801 op.repo.ui, op.repo.requirements, op.repo.features) |
1802 op.repo._writerequirements() |
1802 op.repo._writerequirements() |
1803 extrakwargs = {} |
1803 extrakwargs = {} |
1804 targetphase = inpart.params.get('targetphase') |
1804 targetphase = inpart.params.get('targetphase') |
1805 if targetphase is not None: |
1805 if targetphase is not None: |
1806 extrakwargs[r'targetphase'] = int(targetphase) |
1806 extrakwargs[r'targetphase'] = int(targetphase) |