This is an archive of the discontinued Mercurial Phabricator instance.

Differential D585

perftweaks: fix rebase size tracking
ClosedPublic

Authored by durham on Aug 31 2017, 3:54 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX8ea298d565f2: perftweaks: fix rebase size tracking
Summary

Upstream change the rebase signature, so let's change our wrapper.

Test Plan

Ran the tests

Diff Detail

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

Event Timeline

durham created this revision.Aug 31 2017, 3:54 PM
quark accepted this revision.Aug 31 2017, 4:16 PM
quark added inline comments.
hgext3rd/perftweaks.py
290

Maybe "not destmap" is better. It might be an empty dict.

297–298

Maybe max(destmap.values()) as an attempt to get approximately the longest path.

This revision is now accepted and ready to land.Aug 31 2017, 4:16 PM
Closed by commit rFBHGX8ea298d565f2: perftweaks: fix rebase size tracking (authored by durham). · Explain WhySep 1 2017, 12:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/perftweaks.py (9 lines)

Diff 1538

hgext3rd/perftweaks.py

if not branchmerge: if not branchmerge:
distance = len(repo.revs('(%s %% .) + (. %% %s)', node, node)) distance = len(repo.revs('(%s %% .) + (. %% %s)', node, node))
repo.ui.log('update_size', '', update_distance=distance) repo.ui.log('update_size', '', update_distance=distance)
stats = orig(repo, node, branchmerge, *args, **kwargs) stats = orig(repo, node, branchmerge, *args, **kwargs)
repo.ui.log('update_size', '', update_filecount=sum(stats)) repo.ui.log('update_size', '', update_filecount=sum(stats))
return stats return stats
def _trackrebasesize(orig, self, dest, rebaseset): def _trackrebasesize(orig, self, destmap):
result = orig(self, dest, rebaseset) result = orig(self, destmap)
if dest is None: if not destmap:
quarkUnsubmitted
Not Done

Maybe "not destmap" is better. It might be an empty dict.

quark: Maybe "not destmap" is better. It might be an empty dict.
return result return result
# The code assumes the rebase source is roughly a linear stack within a # The code assumes the rebase source is roughly a linear stack within a
# single feature branch, and there is only one destination. If that is not # single feature branch, and there is only one destination. If that is not
# the case, the distance might be not accurate. # the case, the distance might be not accurate.
repo = self.repo repo = self.repo
destrev = dest.rev() destrev = max(destmap.values())
rebaseset = destmap.keys()
quarkUnsubmitted
Not Done

Maybe max(destmap.values()) as an attempt to get approximately the longest path.

quark: Maybe `max(destmap.values())` as an attempt to get approximately the longest path.
commitcount = len(rebaseset) commitcount = len(rebaseset)
distance = len(repo.revs('(%ld %% %d) + (%d %% %ld)', distance = len(repo.revs('(%ld %% %d) + (%d %% %ld)',
rebaseset, destrev, destrev, rebaseset)) rebaseset, destrev, destrev, rebaseset))
# 'distance' includes the commits being rebased, so subtract them to get the # 'distance' includes the commits being rebased, so subtract them to get the
# actual distance being traveled. Even though we log update_distance above, # actual distance being traveled. Even though we log update_distance above,
# a rebase may run multiple updates, so that value might be not be accurate. # a rebase may run multiple updates, so that value might be not be accurate.
repo.ui.log('rebase_size', '', rebase_commitcount=commitcount, repo.ui.log('rebase_size', '', rebase_commitcount=commitcount,
rebase_distance=distance - commitcount) rebase_distance=distance - commitcount)
return result return result