This is an archive of the discontinued Mercurial Phabricator instance.

Differential D621

copytrace: replace experimental.disablecopytrace config with copytrace (BC)
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG26531db4647a: copytrace: replace experimental.disablecopytrace config with copytrace (BC)
Summary

This patch replaces experimental.disablecopytrace with experimental.copytrace.
Since the words does not means the same, the default value is also changed. Now
experimental.copytrace defaults to 'off'. The new value is not boolean value as
we will be now having two different algorithms (current one and heuristics one
to be imported from fbext) so we need this to be have more options than
booleans.

The old config option is not kept is completely replaced as that was under
experimental and we don't gurantee BC to experimental things.

.. bc::

The config option for copytrace `experimental.disablecopytrace` is now
replaced with `experimental.copytrace` which defaults to `on`. If you need to
turn off copytracing, add `[experimental] copytrace = off` to your config.

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.Sep 4 2017, 6:56 PM
pulkit added a project: Restricted Project.Sep 5 2017, 11:01 AM
pulkit removed a project: Restricted Project.
yuja accepted this revision.Sep 6 2017, 9:53 AM
yuja added a subscriber: yuja.

experimental.copytrace defaults to 'off'. The new value is not boolean value as

s/off/on/ and queued, thanks.

mercurial/copies.py
366

This could be kept as configbool so any falsy value could be
specified, but I don't have strong preference.

731–732

Updated to use !=.

This revision is now accepted and ready to land.Sep 6 2017, 9:53 AM
Closed by commit rHG26531db4647a: copytrace: replace experimental.disablecopytrace config with copytrace (BC) (authored by pulkit). · Explain WhySep 6 2017, 10:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1631

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('experimental', 'changegroup3', coreconfigitem('experimental', 'changegroup3',
default=False, default=False,
) )
coreconfigitem('experimental', 'clientcompressionengines', coreconfigitem('experimental', 'clientcompressionengines',
default=list, default=list,
) )
coreconfigitem('experimental', 'copytrace',
default='on',
)
coreconfigitem('experimental', 'crecordtest', coreconfigitem('experimental', 'crecordtest',
default=None, default=None,
) )
coreconfigitem('experimental', 'disablecopytrace',
default=False,
)
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'stabilization', coreconfigitem('experimental', 'stabilization',
default=list, default=list,
alias=[('experimental', 'evolution')], alias=[('experimental', 'evolution')],
) )
coreconfigitem('experimental', 'stabilization.bundle-obsmarker', coreconfigitem('experimental', 'stabilization.bundle-obsmarker',

mercurial/copies.py

# combine copies from dirstate if necessary # combine copies from dirstate if necessary
if w is not None: if w is not None:
cm = _chain(a, w, cm, _dirstatecopies(w)) cm = _chain(a, w, cm, _dirstatecopies(w))
return cm return cm
def _backwardrenames(a, b): def _backwardrenames(a, b):
if a._repo.ui.configbool('experimental', 'disablecopytrace'): if a._repo.ui.config('experimental', 'copytrace') == 'off':
return {} return {}
# Even though we're not taking copies into account, 1:n rename situations # Even though we're not taking copies into account, 1:n rename situations
# can still exist (e.g. hg cp a b; hg mv a c). In those cases we # can still exist (e.g. hg cp a b; hg mv a c). In those cases we
# arbitrarily pick one of the renames. # arbitrarily pick one of the renames.
f = _forwardcopies(b, a) f = _forwardcopies(b, a)
r = {} r = {}
for k, v in sorted(f.iteritems()): for k, v in sorted(f.iteritems()):
# avoid silly behavior for parent -> working dir # avoid silly behavior for parent -> working dir
if c2.node() is None and c1.node() == repo.dirstate.p1(): if c2.node() is None and c1.node() == repo.dirstate.p1():
return repo.dirstate.copies(), {}, {}, {}, {} return repo.dirstate.copies(), {}, {}, {}, {}
# 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 repo.ui.configbool('experimental', 'disablecopytrace'): if repo.ui.config('experimental', 'copytrace') == 'off':
yujaUnsubmitted
Not Done

This could be kept as configbool so any falsy value could be
specified, but I don't have strong preference.

yuja: This could be kept as configbool so any falsy value could be specified, but I don't have strong…
return {}, {}, {}, {}, {} return {}, {}, {}, {}, {}
# 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
If skiprev is specified, it's a revision that should be used to If skiprev is specified, it's a revision that should be used to
filter copy records. Any copies that occur between fromrev and filter copy records. Any copies that occur between fromrev and
skiprev will not be duplicated, even if they appear in the set of skiprev will not be duplicated, even if they appear in the set of
copies between fromrev and rev. copies between fromrev and rev.
''' '''
exclude = {} exclude = {}
if (skiprev is not None and if (skiprev is not None and
not repo.ui.configbool('experimental', 'disablecopytrace')): repo.ui.config('experimental', 'copytrace') != 'off'):
# disablecopytrace skips this line, but not the entire function because # copytrace='off' skips this line, but not the entire function because
yujaUnsubmitted
Not Done

Updated to use !=.

yuja: Updated to use !=.
# the line below is O(size of the repo) during a rebase, while the rest # the line below is O(size of the repo) during a rebase, while the rest
# of the function is much faster (and is required for carrying copy # of the function is much faster (and is required for carrying copy
# metadata across the rebase anyway). # metadata across the rebase anyway).
exclude = pathcopies(repo[fromrev], repo[skiprev]) exclude = pathcopies(repo[fromrev], repo[skiprev])
for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems():
# copies.pathcopies returns backward renames, so dst might not # copies.pathcopies returns backward renames, so dst might not
# actually be in the dirstate # actually be in the dirstate
if dst in exclude: if dst in exclude:
continue continue
if repo.dirstate[dst] in "nma": if repo.dirstate[dst] in "nma":
repo.dirstate.copy(src, dst) repo.dirstate.copy(src, dst)

tests/test-copy-move-merge.t

2 2
- next verify copy metadata is lost when disabled - next verify copy metadata is lost when disabled
$ hg strip -r . --config extensions.strip= $ hg strip -r . --config extensions.strip=
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob)
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:add3f11052fa "other" (tip) rebasing 2:add3f11052fa "other" (tip)
other [source] changed a which local [dest] deleted other [source] changed a which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
$ cat b $ cat b
1 1
@ 3 add z @ 3 add z
| |
| o 2 copy b->x | o 2 copy b->x
|/ |/
o 1 add b, c o 1 add b, c
| |
o 0 add a o 0 add a
$ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.copytrace=off
rebasing 2:6adcf8c12e7d "copy b->x" rebasing 2:6adcf8c12e7d "copy b->x"
saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob)
$ hg up -q 3 $ hg up -q 3
$ hg log -f x -T '{rev} {desc}\n' $ hg log -f x -T '{rev} {desc}\n'
3 copy b->x 3 copy b->x
1 add b, c 1 add b, c
$ cd ../ $ cd ../
@ 3 copy a->b (2) @ 3 copy a->b (2)
| |
| o 2 move b->c | o 2 move b->c
| | | |
| o 1 copy a->b | o 1 copy a->b
|/ |/
o 0 add a o 0 add a
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob)
$ hg log -G -f b $ hg log -G -f b
@ changeset: 3:76024fb4b05b @ changeset: 3:76024fb4b05b
: tag: tip : tag: tip
: user: test : user: test
: date: Thu Jan 01 00:00:00 1970 +0000 : date: Thu Jan 01 00:00:00 1970 +0000
: summary: copy a->b (2) : summary: copy a->b (2)
: :
o changeset: 0:ac82d8b1f7c4 o changeset: 0:ac82d8b1f7c4
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a