This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9669

engine: prevent multiple checking of re-delta-multibase
ClosedPublic

Authored by pulkit on Dec 30 2020, 6:53 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG3f92a9bb80f0: engine: prevent multiple checking of re-delta-multibase
Summary

The _perform_clone function is called for each revlog cloned, hence we should
prevent this function call overhead.

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.Dec 30 2020, 6:53 AM
marmoute accepted this revision.Jan 7 2021, 8:45 PM
mharbison72 accepted this revision.Jan 12 2021, 6:45 PM
This revision is now accepted and ready to land.Jan 12 2021, 6:45 PM
pulkit added a commit: rHG3f92a9bb80f0: engine: prevent multiple checking of re-delta-multibase.Jan 12 2021, 6:54 PM
Closed by commit rHG3f92a9bb80f0: engine: prevent multiple checking of re-delta-multibase (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24762

mercurial/upgrade_utils/actions.py

self.delta_reuse_mode = revlog.revlog.DELTAREUSENEVER self.delta_reuse_mode = revlog.revlog.DELTAREUSENEVER
elif b're-delta-parent' in self._upgrade_actions_names: elif b're-delta-parent' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-multibase' in self._upgrade_actions_names: elif b're-delta-multibase' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-fulladd' in self._upgrade_actions_names: elif b're-delta-fulladd' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD
# should this operation force re-delta of both parents
self.force_re_delta_both_parents = (
b're-delta-multibase' in self._upgrade_actions_names
)
def _write_labeled(self, l, label): def _write_labeled(self, l, label):
""" """
Utility function to aid writing of a list under one label Utility function to aid writing of a list under one label
""" """
first = True first = True
for r in sorted(l): for r in sorted(l):
if not first: if not first:
self.ui.write(b', ') self.ui.write(b', ')

mercurial/upgrade_utils/engine.py

_(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded) _(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded)
) )
newrl = _revlogfrompath(dstrepo, unencoded) newrl = _revlogfrompath(dstrepo, unencoded)
old_revlog.clone( old_revlog.clone(
tr, tr,
newrl, newrl,
addrevisioncb=oncopiedrevision, addrevisioncb=oncopiedrevision,
deltareuse=upgrade_op.delta_reuse_mode, deltareuse=upgrade_op.delta_reuse_mode,
forcedeltabothparents=upgrade_op.has_upgrade_action( forcedeltabothparents=upgrade_op.force_re_delta_both_parents,
b're-delta-multibase'
),
sidedatacompanion=sidedatacompanion, sidedatacompanion=sidedatacompanion,
) )
else: else:
msg = _(b'blindly copying %s containing %i revisions\n') msg = _(b'blindly copying %s containing %i revisions\n')
ui.note(msg % (unencoded, len(old_revlog))) ui.note(msg % (unencoded, len(old_revlog)))
_copyrevlog(tr, dstrepo, old_revlog, unencoded) _copyrevlog(tr, dstrepo, old_revlog, unencoded)
newrl = _revlogfrompath(dstrepo, unencoded) newrl = _revlogfrompath(dstrepo, unencoded)