Show More
@@ -1791,10 +1791,6 b' coreconfigitem(' | |||||
1791 | ) |
|
1791 | ) | |
1792 | # experimental as long as format.use-persistent-nodemap is. |
|
1792 | # experimental as long as format.use-persistent-nodemap is. | |
1793 | coreconfigitem( |
|
1793 | coreconfigitem( | |
1794 | b'storage', b'revlog.nodemap.mode', default=b'compat', experimental=True |
|
|||
1795 | ) |
|
|||
1796 | # experimental as long as format.use-persistent-nodemap is. |
|
|||
1797 | coreconfigitem( |
|
|||
1798 | b'storage', |
|
1794 | b'storage', | |
1799 | b'revlog.persistent-nodemap.slow-path', |
|
1795 | b'revlog.persistent-nodemap.slow-path', | |
1800 | default=b"abort", |
|
1796 | default=b"abort", |
@@ -1081,8 +1081,6 b' def resolverevlogstorevfsoptions(ui, req' | |||||
1081 | options[b'persistent-nodemap'] = True |
|
1081 | options[b'persistent-nodemap'] = True | |
1082 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): |
|
1082 | if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): | |
1083 | options[b'persistent-nodemap.mmap'] = True |
|
1083 | options[b'persistent-nodemap.mmap'] = True | |
1084 | epnm = ui.config(b'storage', b'revlog.nodemap.mode') |
|
|||
1085 | options[b'persistent-nodemap.mode'] = epnm |
|
|||
1086 | if ui.configbool(b'devel', b'persistent-nodemap'): |
|
1084 | if ui.configbool(b'devel', b'persistent-nodemap'): | |
1087 | options[b'devel-force-nodemap'] = True |
|
1085 | options[b'devel-force-nodemap'] = True | |
1088 |
|
1086 |
@@ -13,7 +13,6 b' import os' | |||||
13 | import re |
|
13 | import re | |
14 | import struct |
|
14 | import struct | |
15 |
|
15 | |||
16 | from ..i18n import _ |
|
|||
17 | from ..node import hex |
|
16 | from ..node import hex | |
18 |
|
17 | |||
19 | from .. import ( |
|
18 | from .. import ( | |
@@ -143,13 +142,6 b' def _persist_nodemap(tr, revlog, pending' | |||||
143 | ondisk_docket = revlog._nodemap_docket |
|
142 | ondisk_docket = revlog._nodemap_docket | |
144 | feed_data = util.safehasattr(revlog.index, "update_nodemap_data") |
|
143 | feed_data = util.safehasattr(revlog.index, "update_nodemap_data") | |
145 | use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") |
|
144 | use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") | |
146 | mode = revlog.opener.options.get(b"persistent-nodemap.mode") |
|
|||
147 | if not can_incremental: |
|
|||
148 | msg = _(b"persistent nodemap in strict mode without efficient method") |
|
|||
149 | if mode == b'warn': |
|
|||
150 | tr._report(b"%s\n" % msg) |
|
|||
151 | elif mode == b'strict': |
|
|||
152 | raise error.Abort(msg) |
|
|||
153 |
|
145 | |||
154 | data = None |
|
146 | data = None | |
155 | # first attemp an incremental update of the data |
|
147 | # first attemp an incremental update of the data |
General Comments 0
You need to be logged in to leave comments.
Login now