This is an archive of the discontinued Mercurial Phabricator instance.

Differential D763

copytrace: add a a new config to limit the number of drafts in heuristics
ClosedPublic

Authored by pulkit on Sep 21 2017, 8:19 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG1826d695ad58: copytrace: add a a new config to limit the number of drafts in heuristics
Summary

The heuristics options tries to the default full copytracing algorithm if both
the source and destination branches contains of non-public changesets only. But
this can be slow in cases when we have a lot of drafts.

This patch adds a new config option experimental.copytrace.sourcecommitlimit
which defaults to 100. This value will be the limit of number of drafts from c1
to base. Incase there are more changesets even though they are draft, the
heuristics algorithm will be used.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 21 2017, 8:19 AM
pulkit updated this revision to Diff 1967.Sep 21 2017, 12:37 PM
yuja requested changes to this revision.Sep 25 2017, 9:48 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/copies.py
397

Can you make it use the new config registrar?

400

Perhaps this loop needs sanity check we've added for
_heuristicscopytracing().

BTW, can't we use revset to count the number of commits?

This revision now requires changes to proceed.Sep 25 2017, 9:48 AM
pulkit updated this revision to Diff 2084.Sep 26 2017, 8:49 AM
yuja requested changes to this revision.Sep 26 2017, 9:19 AM
yuja added inline comments.
mercurial/copies.py
396

Oops. repo isn't passed to this function.

Write tests?

This revision now requires changes to proceed.Sep 26 2017, 9:19 AM
pulkit planned changes to this revision.Sep 26 2017, 9:47 AM
pulkit added inline comments.
mercurial/copies.py
396

Ah, my bad. Thanks for catching. Yeah will include tests in the next version.

pulkit updated this revision to Diff 2089.Sep 26 2017, 11:05 AM
Closed by commit rHG1826d695ad58: copytrace: add a a new config to limit the number of drafts in heuristics (authored by pulkit). · Explain WhySep 27 2017, 3:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (13 lines)

Diff 1961

mercurial/copies.py

# because the logic above is required for a simple copy to be kept across a # because the logic above is required for a simple copy to be kept across a
# rebase. # rebase.
if copytracing == 'off': if copytracing == 'off':
return {}, {}, {}, {}, {} return {}, {}, {}, {}, {}
elif copytracing == 'heuristics': elif copytracing == 'heuristics':
# Do full copytracing if only drafts are involved as that will be fast # Do full copytracing if only drafts are involved as that will be fast
# enough and will also cover the copies which can be missed by # enough and will also cover the copies which can be missed by
# heuristics # heuristics
if _isfullcopytraceable(c1, base): if _isfullcopytraceable(ui, c1, base):
return _fullcopytracing(repo, c1, c2, base) return _fullcopytracing(repo, c1, c2, base)
return _heuristicscopytracing(repo, c1, c2, base) return _heuristicscopytracing(repo, c1, c2, base)
else: else:
return _fullcopytracing(repo, c1, c2, base) return _fullcopytracing(repo, c1, c2, base)
def _isfullcopytraceable(c1, base): def _isfullcopytraceable(ui, c1, base):
""" Checks that if base, source and destination are all draft branches, if """ Checks that if base, source and destination are all draft branches, if
yes let's use the full copytrace algorithm for increased capabilities since yes let's use the full copytrace algorithm for increased capabilities since
it will be fast enough. it will be fast enough.
""" """
nonpublicphases = set([phases.draft, phases.secret]) nonpublicphases = set([phases.draft, phases.secret])
if (c1.phase() in nonpublicphases) and (base.phase() in nonpublicphases): if (c1.phase() in nonpublicphases) and (base.phase() in nonpublicphases):
return True ctx = c1
commits = 0
sourcecommitlimit = ui.configint('experimental',
yujaUnsubmitted
Not Done

Oops. repo isn't passed to this function.

Write tests?

yuja: Oops. `repo` isn't passed to this function. Write tests?
pulkitAuthorUnsubmitted
Not Done

Ah, my bad. Thanks for catching. Yeah will include tests in the next version.

pulkit: Ah, my bad. Thanks for catching. Yeah will include tests in the next version.
'copytrace.sourcecommitlimit', 100)
yujaUnsubmitted
Not Done

Can you make it use the new config registrar?

yuja: Can you make it use the new config registrar?
while ctx != base and commits != sourcecommitlimit:
ctx = ctx.p1()
commits += 1
yujaUnsubmitted
Not Done

Perhaps this loop needs sanity check we've added for
_heuristicscopytracing().

BTW, can't we use revset to count the number of commits?

yuja: Perhaps this loop needs sanity check we've added for _heuristicscopytracing(). BTW, can't we…
return commits < sourcecommitlimit
return False return False
def _fullcopytracing(repo, c1, c2, base): def _fullcopytracing(repo, c1, c2, base):
""" The full copytracing algorithm which finds all the new files that were """ The full copytracing algorithm which finds all the new files that were
added from merge base up to the top commit and for each file it checks if added from merge base up to the top commit and for each file it checks if
this file was copied from another file. this file was copied from another file.
This is pretty slow when a lot of changesets are involved but will track all This is pretty slow when a lot of changesets are involved but will track all