This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9991

upgrade: write nodemap for manifests too
ClosedPublic

Authored by pulkit on Feb 15 2021, 5:28 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG636853347e14: upgrade: write nodemap for manifests too
Summary

In 98e39f04d60e I assumed that writing nodemap for manifests was not desirable
and stopped writing it during upgrade. However in recent discussion with
Pierre-Yves, I learnt that that's not true.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 15 2021, 5:28 AM
pulkit added a comment.Feb 22 2021, 5:23 AM

Ping for review.

Alphare accepted this revision.Feb 23 2021, 4:02 AM
pulkit added a commit: rHG636853347e14: upgrade: write nodemap for manifests too.Feb 24 2021, 10:54 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG636853347e14: upgrade: write nodemap for manifests too (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25811

mercurial/upgrade_utils/engine.py

): ):
ui.status( ui.status(
_(b'upgrading repository to use persistent nodemap feature\n') _(b'upgrading repository to use persistent nodemap feature\n')
) )
with srcrepo.transaction(b'upgrade') as tr: with srcrepo.transaction(b'upgrade') as tr:
unfi = srcrepo.unfiltered() unfi = srcrepo.unfiltered()
cl = unfi.changelog cl = unfi.changelog
nodemap.persist_nodemap(tr, cl, force=True) nodemap.persist_nodemap(tr, cl, force=True)
# we want to directly operate on the underlying revlog to force
# create a nodemap file. This is fine since this is upgrade code
# and it heavily relies on repository being revlog based
# hence accessing private attributes can be justified
nodemap.persist_nodemap(
tr, unfi.manifestlog._rootstore._revlog, force=True
)
scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements) scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)
else: else:
with dstrepo.transaction(b'upgrade') as tr: with dstrepo.transaction(b'upgrade') as tr:
_clonerevlogs( _clonerevlogs(
ui, ui,
srcrepo, srcrepo,
dstrepo, dstrepo,
tr, tr,

tests/test-persistent-nodemap.t

repository locked and read-only repository locked and read-only
creating temporary repository to stage upgraded data: $TESTTMP/test-repo/.hg/upgrade.* (glob) creating temporary repository to stage upgraded data: $TESTTMP/test-repo/.hg/upgrade.* (glob)
(it is safe to interrupt this process any time before data migration completes) (it is safe to interrupt this process any time before data migration completes)
upgrading repository to use persistent nodemap feature upgrading repository to use persistent nodemap feature
removing temporary repository $TESTTMP/test-repo/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/test-repo/.hg/upgrade.* (glob)
$ ls -1 .hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' $ ls -1 .hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
00changelog-*.nd (glob) 00changelog-*.nd (glob)
00changelog.n 00changelog.n
00manifest-*.nd (glob)
00manifest.n
$ hg debugnodemap --metadata $ hg debugnodemap --metadata
uid: * (glob) uid: * (glob)
tip-rev: 5005 tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121088 data-length: 121088
data-unused: 0 data-unused: 0
data-unused: 0.000% data-unused: 0.000%