Show More
@@ -37,6 +37,7 b' RECLONES_REQUIREMENTS = {' | |||||
37 | def preservedrequirements(repo): |
|
37 | def preservedrequirements(repo): | |
38 | preserved = { |
|
38 | preserved = { | |
39 | requirements.SHARED_REQUIREMENT, |
|
39 | requirements.SHARED_REQUIREMENT, | |
|
40 | requirements.NARROW_REQUIREMENT, | |||
40 | } |
|
41 | } | |
41 | return preserved & repo.requirements |
|
42 | return preserved & repo.requirements | |
42 |
|
43 | |||
@@ -1004,7 +1005,7 b' def supportremovedrequirements(repo):' | |||||
1004 | def supporteddestrequirements(repo): |
|
1005 | def supporteddestrequirements(repo): | |
1005 | """Obtain requirements that upgrade supports in the destination. |
|
1006 | """Obtain requirements that upgrade supports in the destination. | |
1006 |
|
1007 | |||
1007 |
If the result of the upgrade would |
|
1008 | If the result of the upgrade would have requirements not in this set, | |
1008 | the upgrade is disallowed. |
|
1009 | the upgrade is disallowed. | |
1009 |
|
1010 | |||
1010 | Extensions should monkeypatch this to add their custom requirements. |
|
1011 | Extensions should monkeypatch this to add their custom requirements. | |
@@ -1024,6 +1025,7 b' def supporteddestrequirements(repo):' | |||||
1024 | requirements.SHARESAFE_REQUIREMENT, |
|
1025 | requirements.SHARESAFE_REQUIREMENT, | |
1025 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
1026 | requirements.SPARSEREVLOG_REQUIREMENT, | |
1026 | requirements.STORE_REQUIREMENT, |
|
1027 | requirements.STORE_REQUIREMENT, | |
|
1028 | requirements.NARROW_REQUIREMENT, | |||
1027 | } |
|
1029 | } | |
1028 | for name in compression.compengines: |
|
1030 | for name in compression.compengines: | |
1029 | engine = compression.compengines[name] |
|
1031 | engine = compression.compengines[name] |
@@ -71,6 +71,17 b" Names with '.' in them are OK." | |||||
71 | updating to branch default |
|
71 | updating to branch default | |
72 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
73 |
|
73 | |||
|
74 | The "narrow" repo requirement is ignored by [debugupgraderepo] | |||
|
75 | ||||
|
76 | #if tree | |||
|
77 | $ (cd should-work; hg debugupgraderepo) | |||
|
78 | abort: cannot upgrade repository; unsupported source requirement: treemanifest | |||
|
79 | [255] | |||
|
80 | #else | |||
|
81 | $ (cd should-work; hg debugupgraderepo | grep 'no format upgrades found in existing repository') | |||
|
82 | (no format upgrades found in existing repository) | |||
|
83 | #endif | |||
|
84 | ||||
74 | Test repo with local changes |
|
85 | Test repo with local changes | |
75 | $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 |
|
86 | $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 | |
76 | requesting all changes |
|
87 | requesting all changes |
General Comments 0
You need to be logged in to leave comments.
Login now