##// END OF EJS Templates
nodemap: drop the 'exp-' prefix for internal opener option...
marmoute -
r45296:5e3c7186 default
parent child Browse files
Show More
@@ -385,9 +385,7 b' class changelog(revlog.revlog):'
385 datafile=datafile,
385 datafile=datafile,
386 checkambig=True,
386 checkambig=True,
387 mmaplargeindex=True,
387 mmaplargeindex=True,
388 persistentnodemap=opener.options.get(
388 persistentnodemap=opener.options.get(b'persistent-nodemap', False),
389 b'exp-persistent-nodemap', False
390 ),
391 )
389 )
392
390
393 if self._initempty and (self.version & 0xFFFF == revlog.REVLOGV1):
391 if self._initempty and (self.version & 0xFFFF == revlog.REVLOGV1):
@@ -937,11 +937,11 b' def resolverevlogstorevfsoptions(ui, req'
937 if ui.configbool(b'experimental', b'rust.index'):
937 if ui.configbool(b'experimental', b'rust.index'):
938 options[b'rust.index'] = True
938 options[b'rust.index'] = True
939 if NODEMAP_REQUIREMENT in requirements:
939 if NODEMAP_REQUIREMENT in requirements:
940 options[b'exp-persistent-nodemap'] = True
940 options[b'persistent-nodemap'] = True
941 if ui.configbool(b'experimental', b'exp-persistent-nodemap.mmap'):
941 if ui.configbool(b'experimental', b'exp-persistent-nodemap.mmap'):
942 options[b'exp-persistent-nodemap.mmap'] = True
942 options[b'persistent-nodemap.mmap'] = True
943 epnm = ui.config(b'experimental', b'exp-persistent-nodemap.mode')
943 epnm = ui.config(b'experimental', b'exp-persistent-nodemap.mode')
944 options[b'exp-persistent-nodemap.mode'] = epnm
944 options[b'persistent-nodemap.mode'] = epnm
945 if ui.configbool(b'devel', b'persistent-nodemap'):
945 if ui.configbool(b'devel', b'persistent-nodemap'):
946 options[b'devel-force-nodemap'] = True
946 options[b'devel-force-nodemap'] = True
947
947
@@ -1588,9 +1588,7 b' class manifestrevlog(object):'
1588 checkambig=not bool(tree),
1588 checkambig=not bool(tree),
1589 mmaplargeindex=True,
1589 mmaplargeindex=True,
1590 upperboundcomp=MAXCOMPRESSION,
1590 upperboundcomp=MAXCOMPRESSION,
1591 persistentnodemap=opener.options.get(
1591 persistentnodemap=opener.options.get(b'persistent-nodemap', False),
1592 b'exp-persistent-nodemap', False
1593 ),
1594 )
1592 )
1595
1593
1596 self.index = self._revlog.index
1594 self.index = self._revlog.index
@@ -50,7 +50,7 b' def persisted_data(revlog):'
50 docket.data_unused = data_unused
50 docket.data_unused = data_unused
51
51
52 filename = _rawdata_filepath(revlog, docket)
52 filename = _rawdata_filepath(revlog, docket)
53 use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
53 use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap")
54 try:
54 try:
55 with revlog.opener(filename) as fd:
55 with revlog.opener(filename) as fd:
56 if use_mmap:
56 if use_mmap:
@@ -142,8 +142,8 b' def _persist_nodemap(tr, revlog, pending'
142 can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental")
142 can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental")
143 ondisk_docket = revlog._nodemap_docket
143 ondisk_docket = revlog._nodemap_docket
144 feed_data = util.safehasattr(revlog.index, "update_nodemap_data")
144 feed_data = util.safehasattr(revlog.index, "update_nodemap_data")
145 use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
145 use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap")
146 mode = revlog.opener.options.get(b"exp-persistent-nodemap.mode")
146 mode = revlog.opener.options.get(b"persistent-nodemap.mode")
147 if not can_incremental:
147 if not can_incremental:
148 msg = _(b"persistent nodemap in strict mode without efficient method")
148 msg = _(b"persistent nodemap in strict mode without efficient method")
149 if mode == b'warn':
149 if mode == b'warn':
General Comments 0
You need to be logged in to leave comments. Login now