##// END OF EJS Templates
requirements: also add a store constant...
Raphaël Gomès -
r47382:ab58098b default
parent child Browse files
Show More
@@ -942,7 +942,7 b' def ensurerequirementscompatible(ui, req'
942
942
943 def makestore(requirements, path, vfstype):
943 def makestore(requirements, path, vfstype):
944 """Construct a storage object for a repository."""
944 """Construct a storage object for a repository."""
945 if b'store' in requirements:
945 if requirementsmod.STORE_REQUIREMENT in requirements:
946 if b'fncache' in requirements:
946 if b'fncache' in requirements:
947 dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
947 dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
948 return storemod.fncachestore(path, vfstype, dotencode)
948 return storemod.fncachestore(path, vfstype, dotencode)
@@ -1210,7 +1210,7 b' class localrepository(object):'
1210 requirementsmod.SHARESAFE_REQUIREMENT,
1210 requirementsmod.SHARESAFE_REQUIREMENT,
1211 }
1211 }
1212 _basesupported = supportedformats | {
1212 _basesupported = supportedformats | {
1213 b'store',
1213 requirementsmod.STORE_REQUIREMENT,
1214 b'fncache',
1214 b'fncache',
1215 requirementsmod.SHARED_REQUIREMENT,
1215 requirementsmod.SHARED_REQUIREMENT,
1216 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1216 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
@@ -3411,7 +3411,7 b' def newreporequirements(ui, createopts):'
3411
3411
3412 requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
3412 requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
3413 if ui.configbool(b'format', b'usestore'):
3413 if ui.configbool(b'format', b'usestore'):
3414 requirements.add(b'store')
3414 requirements.add(requirementsmod.STORE_REQUIREMENT)
3415 if ui.configbool(b'format', b'usefncache'):
3415 if ui.configbool(b'format', b'usefncache'):
3416 requirements.add(b'fncache')
3416 requirements.add(b'fncache')
3417 if ui.configbool(b'format', b'dotencode'):
3417 if ui.configbool(b'format', b'dotencode'):
@@ -3493,7 +3493,7 b' def checkrequirementscompat(ui, requirem'
3493
3493
3494 dropped = set()
3494 dropped = set()
3495
3495
3496 if b'store' not in requirements:
3496 if requirementsmod.STORE_REQUIREMENT not in requirements:
3497 if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3497 if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3498 ui.warn(
3498 ui.warn(
3499 _(
3499 _(
@@ -3632,7 +3632,8 b' def createrepository(ui, path, createopt'
3632 hgvfs.mkdir(b'cache')
3632 hgvfs.mkdir(b'cache')
3633 hgvfs.mkdir(b'wcache')
3633 hgvfs.mkdir(b'wcache')
3634
3634
3635 if b'store' in requirements and b'sharedrepo' not in createopts:
3635 has_store = requirementsmod.STORE_REQUIREMENT in requirements
3636 if has_store and b'sharedrepo' not in createopts:
3636 hgvfs.mkdir(b'store')
3637 hgvfs.mkdir(b'store')
3637
3638
3638 # We create an invalid changelog outside the store so very old
3639 # We create an invalid changelog outside the store so very old
@@ -9,6 +9,7 b' from __future__ import absolute_import'
9
9
10 GENERALDELTA_REQUIREMENT = b'generaldelta'
10 GENERALDELTA_REQUIREMENT = b'generaldelta'
11 DOTENCODE_REQUIREMENT = b'dotencode'
11 DOTENCODE_REQUIREMENT = b'dotencode'
12 STORE_REQUIREMENT = b'store'
12
13
13 # When narrowing is finalized and no longer subject to format changes,
14 # When narrowing is finalized and no longer subject to format changes,
14 # we should move this to just "narrow" or similar.
15 # we should move this to just "narrow" or similar.
@@ -859,7 +859,7 b' def requiredsourcerequirements(repo):'
859 # Introduced in Mercurial 0.9.2.
859 # Introduced in Mercurial 0.9.2.
860 requirements.REVLOGV1_REQUIREMENT,
860 requirements.REVLOGV1_REQUIREMENT,
861 # Introduced in Mercurial 0.9.2.
861 # Introduced in Mercurial 0.9.2.
862 b'store',
862 requirements.STORE_REQUIREMENT,
863 }
863 }
864
864
865
865
@@ -938,7 +938,7 b' def supporteddestrequirements(repo):'
938 b'fncache',
938 b'fncache',
939 requirements.GENERALDELTA_REQUIREMENT,
939 requirements.GENERALDELTA_REQUIREMENT,
940 requirements.REVLOGV1_REQUIREMENT,
940 requirements.REVLOGV1_REQUIREMENT,
941 b'store',
941 requirements.STORE_REQUIREMENT,
942 requirements.SPARSEREVLOG_REQUIREMENT,
942 requirements.SPARSEREVLOG_REQUIREMENT,
943 requirements.SIDEDATA_REQUIREMENT,
943 requirements.SIDEDATA_REQUIREMENT,
944 requirements.COPIESSDC_REQUIREMENT,
944 requirements.COPIESSDC_REQUIREMENT,
General Comments 0
You need to be logged in to leave comments. Login now