Mercurial > public > mercurial-scm > hg-stable
diff mercurial/upgrade_utils/engine.py @ 48793:6e559391f96e
tracked-key: remove the dual write and rename to tracked-hint
The dual-write approach was mostly useless. As explained in the previous version
of the help, the key had to be read twice before we could cache a value.
However this "read twice" limitation actually also apply to any usage of the
key. If some operation wants to rely of the "same value == same tracked set"
property it would need to read the value before, and after running that
operation (or at least, after, in all cases). So it cannot be sure the operation
it did is "valid" until checking the key after the operation. As a resultat such
operation can only be read-only or rollbackable.
This reduce the utility of the "same value == same tracked set" a lot.
So it seems simpler to drop the double write and to update the documentation to
highlight that this file does not garantee race-free operation. As a result the
"key" is demoted to a "hint".
Documentation is updated accordingly.
Differential Revision: https://phab.mercurial-scm.org/D12201
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 17 Feb 2022 07:34:49 +0100 |
| parents | 5ba24e886cec |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/mercurial/upgrade_utils/engine.py Thu Feb 17 06:41:54 2022 +0100 +++ b/mercurial/upgrade_utils/engine.py Thu Feb 17 07:34:49 2022 +0100 @@ -487,12 +487,12 @@ upgrade_op.removed_actions.remove(upgrade_actions.dirstatev2) if upgrade_actions.dirstatetrackedkey in upgrade_op.upgrade_actions: - ui.status(_(b'create dirstate-tracked-key file\n')) - upgrade_tracked_key(ui, srcrepo, upgrade_op, add=True) + ui.status(_(b'create dirstate-tracked-hint file\n')) + upgrade_tracked_hint(ui, srcrepo, upgrade_op, add=True) upgrade_op.upgrade_actions.remove(upgrade_actions.dirstatetrackedkey) elif upgrade_actions.dirstatetrackedkey in upgrade_op.removed_actions: - ui.status(_(b'remove dirstate-tracked-key file\n')) - upgrade_tracked_key(ui, srcrepo, upgrade_op, add=False) + ui.status(_(b'remove dirstate-tracked-hint file\n')) + upgrade_tracked_hint(ui, srcrepo, upgrade_op, add=False) upgrade_op.removed_actions.remove(upgrade_actions.dirstatetrackedkey) if not (upgrade_op.upgrade_actions or upgrade_op.removed_actions): @@ -671,13 +671,13 @@ scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) -def upgrade_tracked_key(ui, srcrepo, upgrade_op, add): +def upgrade_tracked_hint(ui, srcrepo, upgrade_op, add): if add: - srcrepo.dirstate._use_tracked_key = True + srcrepo.dirstate._use_tracked_hint = True srcrepo.dirstate._dirty = True srcrepo.dirstate._dirty_tracked_set = True srcrepo.dirstate.write(None) if not add: - srcrepo.dirstate.delete_tracked_key() + srcrepo.dirstate.delete_tracked_hint() scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)