comparison mercurial/localrepo.py @ 48681:e845537f6adb

branching: merge stable into default
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 02 Feb 2022 17:24:05 +0100
parents fc80752dbb24 8e5effbf52d0
children 568f63b5a30f
comparison
equal deleted inserted replaced
48673:576040155dba 48681:e845537f6adb
1188 msg = _( 1188 msg = _(
1189 b"accessing `dirstate-v2` repository without associated " 1189 b"accessing `dirstate-v2` repository without associated "
1190 b"fast implementation." 1190 b"fast implementation."
1191 ) 1191 )
1192 hint = _( 1192 hint = _(
1193 b"check `hg help config.format.exp-rc-dirstate-v2` " b"for details" 1193 b"check `hg help config.format.use-dirstate-v2` " b"for details"
1194 ) 1194 )
1195 if not dirstate.HAS_FAST_DIRSTATE_V2: 1195 if not dirstate.HAS_FAST_DIRSTATE_V2:
1196 if slow_path == b'warn': 1196 if slow_path == b'warn':
1197 msg = b"warning: " + msg + b'\n' 1197 msg = b"warning: " + msg + b'\n'
1198 ui.warn(msg) 1198 ui.warn(msg)
2822 if tr is None or tr.changes[b'origrepolen'] < len(self): 2822 if tr is None or tr.changes[b'origrepolen'] < len(self):
2823 # accessing the 'served' branchmap should refresh all the others, 2823 # accessing the 'served' branchmap should refresh all the others,
2824 self.ui.debug(b'updating the branch cache\n') 2824 self.ui.debug(b'updating the branch cache\n')
2825 self.filtered(b'served').branchmap() 2825 self.filtered(b'served').branchmap()
2826 self.filtered(b'served.hidden').branchmap() 2826 self.filtered(b'served.hidden').branchmap()
2827 # flush all possibly delayed write.
2828 self._branchcaches.write_delayed(self)
2827 2829
2828 if repository.CACHE_CHANGELOG_CACHE in caches: 2830 if repository.CACHE_CHANGELOG_CACHE in caches:
2829 self.changelog.update_caches(transaction=tr) 2831 self.changelog.update_caches(transaction=tr)
2830 2832
2831 if repository.CACHE_MANIFESTLOG_CACHE in caches: 2833 if repository.CACHE_MANIFESTLOG_CACHE in caches:
3616 if scmutil.gdinitconfig(ui): 3618 if scmutil.gdinitconfig(ui):
3617 requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) 3619 requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
3618 if ui.configbool(b'format', b'sparse-revlog'): 3620 if ui.configbool(b'format', b'sparse-revlog'):
3619 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) 3621 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3620 3622
3621 # experimental config: format.exp-rc-dirstate-v2 3623 # experimental config: format.use-dirstate-v2
3622 # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py` 3624 # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py`
3623 if ui.configbool(b'format', b'exp-rc-dirstate-v2'): 3625 if ui.configbool(b'format', b'use-dirstate-v2'):
3624 requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT) 3626 requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)
3625 3627
3626 # experimental config: format.exp-use-copies-side-data-changeset 3628 # experimental config: format.exp-use-copies-side-data-changeset
3627 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): 3629 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3628 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) 3630 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)