This is an archive of the discontinued Mercurial Phabricator instance.

Differential D624

copytrace: move the full copytracing algorithm under 'full' option
AbandonedPublic

Authored by pulkit on Sep 4 2017, 6:56 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Summary

This patch adds a possible value for experimental.copytrace which is full,
using which the user can use fullcopytracing algorithm.

But, this patch does not removes experimental.copytrace=on which also defaults
to the full copytracing algorithm. So after this patch, we have two config
values which does the same thing but on is there as a lot of users will try to
use it since it's opposite of 'off'.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 4 2017, 6:56 PM
yuja requested changes to this revision.Sep 6 2017, 10:22 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/copies.py
376

This should either abort or fall back to the default copy tracing.
Returning None doesn't make sense.

This revision now requires changes to proceed.Sep 6 2017, 10:22 AM
pulkit abandoned this revision.Sep 7 2017, 7:46 AM
pulkit added inline comments.
mercurial/copies.py
376

Falling back to default copytracing make sense. I am dropping this revision as that's already the case in this series without this patch.

Revision Contents
Changeset List

Diff 1604

mercurial/copies.py

# Copy trace disabling is explicitly below the node == p1 logic above # Copy trace disabling is explicitly below the node == p1 logic above
# 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':
return _heuristicscopytracing(repo, c1, c2, base) return _heuristicscopytracing(repo, c1, c2, base)
else: elif copytracing in ['full', 'on']:
return _fullcopytracing(repo, c1, c2, base) return _fullcopytracing(repo, c1, c2, base)
else:
repo.ui.debug('unable to parse the copytracing mode %s' % copytracing)
yujaUnsubmitted
Not Done

This should either abort or fall back to the default copy tracing.
Returning None doesn't make sense.

yuja: This should either abort or fall back to the default copy tracing. Returning None doesn't make…
pulkitAuthorUnsubmitted
Not Done

Falling back to default copytracing make sense. I am dropping this revision as that's already the case in this series without this patch.

pulkit: Falling back to default copytracing make sense. I am dropping this revision as that's already…
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
the copies. the copies. Can be used by setting the following configuration:
[experimental]
copytrace = full
Also if you have set `experimental.copytrace=on`, this is the algorithm
which will be used.
""" """
# In certain scenarios (e.g. graft, update or rebase), base can be # In certain scenarios (e.g. graft, update or rebase), base can be
# overridden We still need to know a real common ancestor in this case We # overridden We still need to know a real common ancestor in this case We
# can't just compute _c1.ancestor(_c2) and compare it to ca, because there # can't just compute _c1.ancestor(_c2) and compare it to ca, because there
# can be multiple common ancestors, e.g. in case of bidmerge. Because our # can be multiple common ancestors, e.g. in case of bidmerge. Because our
# caller may not know if the revision passed in lieu of the CA is a genuine # caller may not know if the revision passed in lieu of the CA is a genuine
# common ancestor or not without explicitly checking it, it's better to # common ancestor or not without explicitly checking it, it's better to
# determine that here. # determine that here.