This is an archive of the discontinued Mercurial Phabricator instance.

Differential D662

copytrace: handle modification of config from disablecopytrace to copytrace
ClosedPublic

Authored by singhsrb on Sep 8 2017, 8:22 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
pulkit
durham
Group Reviewers
Restricted Project
Commits
rFBHGX0ef0c255a73b: copytrace: handle modification of config from disablecopytrace to copytrace
Summary

In mercurial core, the config for disabling copytrace was changed from
disablecopytrace (boolean) to copytrace which can be on or off. As a result of
this change, there were some breaks which need to be modified to work with the
new config. This commit acheives the same.

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Sep 8 2017, 8:22 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 8 2017, 8:22 PM
singhsrb retitled this revision from copytrace: fix tests after modification of disablecopytrace to copytrace to copytrace: handle modification of config from disablecopytrace to copytrace.Sep 8 2017, 8:26 PM
quark accepted this revision.Sep 8 2017, 9:42 PM
quark added a subscriber: quark.

Thanks!

This revision is now accepted and ready to land.Sep 8 2017, 9:42 PM
pulkit accepted this revision.Sep 9 2017, 1:06 PM
durham accepted this revision.Sep 11 2017, 12:01 PM
Closed by commit rFBHGX0ef0c255a73b: copytrace: handle modification of config from disablecopytrace to copytrace (authored by singhsrb). · Explain WhySep 12 2017, 11:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1685

hgext3rd/copytrace.py

def extsetup(ui): def extsetup(ui):
commands.globalopts.append( commands.globalopts.append(
("", "tracecopies", None, ("", "tracecopies", None,
_("enable copytracing. Warning: can be very slow!"))) _("enable copytracing. Warning: can be very slow!")))
commands.globalopts.append( commands.globalopts.append(
("", "drafttrace", None, ("", "drafttrace", None,
_("enable copytracing for draft branches."))) _("enable copytracing for draft branches.")))
# With experimental.disablecopytrace=True there can be cryptic merge errors. # With experimental.copytrace=off there can be cryptic merge errors.
# Let"s change error message to suggest re-running the command with # Let"s change error message to suggest re-running the command with
# enabled copytracing # enabled copytracing
filemerge._localchangedotherdeletedmsg = _( filemerge._localchangedotherdeletedmsg = _(
"local%(l)s changed %(fd)s which other%(o)s deleted\n" + "local%(l)s changed %(fd)s which other%(o)s deleted\n" +
_copytracinghint + _copytracinghint +
"use (c)hanged version, (d)elete, or leave (u)nresolved?" "use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved") "$$ &Changed $$ &Delete $$ &Unresolved")
# copytracing worked if files to merge have different file names # copytracing worked if files to merge have different file names
# and filelog contents are different (fco.cmp(fcd) returns True if # and filelog contents are different (fco.cmp(fcd) returns True if
# they are different). If filelog contents are the same then the file # they are different). If filelog contents are the same then the file
# was moved in the rebase/graft/merge source, but wasn't changed in the # was moved in the rebase/graft/merge source, but wasn't changed in the
# rebase/graft/merge destination. This case mercurial would've handled # rebase/graft/merge destination. This case mercurial would've handled
# even with disabled copytracing, so we don't want to log it. # even with disabled copytracing, so we don't want to log it.
if orig != fco.path() and fco.cmp(fcd): if orig != fco.path() and fco.cmp(fcd):
# copytracing was in action, let's record it # copytracing was in action, let's record it
if not repo.ui.configbool("experimental", "disablecopytrace"): if repo.ui.config('experimental', 'copytrace') == 'on':
msg = "success" msg = 'success (fastcopytracing)'
else: else:
msg = "success (fastcopytracing)" msg = 'success'
try: try:
destctx = _getctxfromfctx(fcd) destctx = _getctxfromfctx(fcd)
srcctx = _getctxfromfctx(fco) srcctx = _getctxfromfctx(fco)
hexes = '%s, %s' % (_gethex(destctx), _gethex(srcctx)) hexes = '%s, %s' % (_gethex(destctx), _gethex(srcctx))
paths = '%s, %s' % (orig, fco.path()) paths = '%s, %s' % (orig, fco.path())
msg = "%s (%s; %s)" % (msg, hexes, paths) msg = "%s (%s; %s)" % (msg, hexes, paths)
except Exception as e: except Exception as e:
# we don't expect any exceptions to happen, but to be 100% # we don't expect any exceptions to happen, but to be 100%
# sure we don't break hg let's catch everything and log it # sure we don't break hg let's catch everything and log it
msg = 'failed to log: %s' % (e,) msg = 'failed to log: %s' % (e,)
repo.ui.log("copytrace", msg=msg, repo.ui.log("copytrace", msg=msg,
reponame=_getreponame(repo, repo.ui)) reponame=_getreponame(repo, repo.ui))
return origfunc(premerge, repo, mynode, orig, fcd, fco, fca, labels, return origfunc(premerge, repo, mynode, orig, fcd, fco, fca, labels,
*args, **kwargs) *args, **kwargs)
def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs): def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs):
if "--tracecopies" in fullargs: if "--tracecopies" in fullargs:
ui.setconfig("experimental", "disablecopytrace", ui.setconfig('experimental', 'copytrace', 'on', '--tracecopies')
False, "--tracecopies")
return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs) return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs)
def _amend(orig, ui, repo, old, extra, pats, opts): def _amend(orig, ui, repo, old, extra, pats, opts):
"""Wraps amend to collect copytrace data on amend """Wraps amend to collect copytrace data on amend
If a file is created in one commit, modified in a subsequent commit, and If a file is created in one commit, modified in a subsequent commit, and
then renamed or copied by amending the original commit, restacking the then renamed or copied by amending the original commit, restacking the
commits that modify the file will fail: commits that modify the file will fail:
On the time of writing this extension it was used only to print warning. On the time of writing this extension it was used only to print warning.
"dirmove" is a mapping of detected source dir -> destination dir renames. "dirmove" is a mapping of detected source dir -> destination dir renames.
This is needed for handling changes to new files previously grafted into This is needed for handling changes to new files previously grafted into
renamed directories. renamed directories.
""" """
if not repo.ui.configbool("experimental", "disablecopytrace"): if repo.ui.config('experimental', 'copytrace') == 'on':
# user explicitly enabled copytracing - use it # user explicitly enabled copytracing - use it
return orig(repo, cdst, csrc, base) return orig(repo, cdst, csrc, base)
if not _fastcopytraceenabled(repo.ui): if not _fastcopytraceenabled(repo.ui):
return orig(repo, cdst, csrc, base) return orig(repo, cdst, csrc, base)
# If base, source and destination are all draft branches, let's use full # If base, source and destination are all draft branches, let's use full
# copytrace for increased capabilities since it will work fast enough # copytrace for increased capabilities since it will work fast enough
if _isfullcopytraceable(repo.ui, cdst, base): if _isfullcopytraceable(repo.ui, cdst, base):
configoverrides = {('experimental', 'disablecopytrace'): False} configoverrides = {('experimental', 'copytrace'): 'on'}
with repo.ui.configoverride(configoverrides, 'mergecopies'): with repo.ui.configoverride(configoverrides, 'mergecopies'):
result = orig(repo, cdst, csrc, base) result = orig(repo, cdst, csrc, base)
if repo.ui.configbool("copytrace", "enableamendcopytrace", True): if repo.ui.configbool("copytrace", "enableamendcopytrace", True):
# Look for additional amend-copies # Look for additional amend-copies
amend_copies = _getamendcopies(repo, cdst, base.p1()) amend_copies = _getamendcopies(repo, cdst, base.p1())
# update result[0] dict w/ amend_copies # update result[0] dict w/ amend_copies
result[0].update(amend_copies) result[0].update(amend_copies)

tests/copytrace.sh

function initclient() { function initclient() {
cat >> $1/.hg/hgrc <<EOF cat >> $1/.hg/hgrc <<EOF
[copytrace] [copytrace]
remote = False remote = False
enablefilldb = True enablefilldb = True
fastcopytrace = True fastcopytrace = True
[experimental] [experimental]
disablecopytrace = True copytrace = off
EOF EOF
} }

tests/test-copytrace-amend.t

$ . "$TESTDIR/copytrace.sh" $ . "$TESTDIR/copytrace.sh"
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> copytrace=$TESTDIR/../hgext3rd/copytrace.py > copytrace=$TESTDIR/../hgext3rd/copytrace.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> rebase= > rebase=
> shelve= > shelve=
> [fbamend] > [fbamend]
> userestack=True > userestack=True
> [experimental] > [experimental]
> disablecopytrace=True > copytrace=off
> evolution=createmarkers > evolution=createmarkers
> EOF > EOF
Test amend copytrace Test amend copytrace
$ hg init repo $ hg init repo
$ initclient repo $ initclient repo
$ cd repo $ cd repo
$ echo x > x $ echo x > x

tests/test-copytrace-errormsg.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> rebase= > rebase=
> copytrace=$TESTDIR/../hgext3rd/copytrace.py > copytrace=$TESTDIR/../hgext3rd/copytrace.py
> [experimental] > [experimental]
> disablecopytrace=True > copytrace=off
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo 1 > 1 $ echo 1 > 1
$ hg add 1 $ hg add 1
$ hg ci -m 1 $ hg ci -m 1
$ echo 2 > 1 $ echo 2 > 1

tests/test-copytrace.t

$ . "$TESTDIR/copytrace.sh" $ . "$TESTDIR/copytrace.sh"
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> copytrace=$TESTDIR/../hgext3rd/copytrace.py > copytrace=$TESTDIR/../hgext3rd/copytrace.py
> rebase= > rebase=
> shelve= > shelve=
> [experimental] > [experimental]
> disablecopytrace=True > copytrace=off
> EOF > EOF
Check filename heuristics (same dirname and same basename) Check filename heuristics (same dirname and same basename)
$ hg init server $ hg init server
$ cd server $ cd server
$ echo a > a $ echo a > a
$ mkdir dir $ mkdir dir
$ echo a > dir/file.txt $ echo a > dir/file.txt

tests/test-merge-conflictinfo.t

|/ affected: file |/ affected: file
| deleted: | deleted:
| |
o (0) base o (0) base
affected: file affected: file
deleted: deleted:
$ hg rebase -d 2 -s 1 --config experimental.disablecopytrace=True $ hg rebase -d 2 -s 1 --config experimental.copytrace=off
rebasing 1:ec87889f5f90 "source" rebasing 1:ec87889f5f90 "source"
other [source] changed file which local [dest] deleted other [source] changed file which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
|/ affected: file file_newloc |/ affected: file file_newloc
| deleted: file | deleted: file
| |
o (0) base o (0) base
affected: file affected: file
deleted: deleted:
$ hg rebase -d 2 -s 1 --config experimental.disablecopytrace=True $ hg rebase -d 2 -s 1 --config experimental.copytrace=off
rebasing 1:e6e7483a8950 "source" rebasing 1:e6e7483a8950 "source"
local [dest] changed file which other [source] deleted local [dest] changed file which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {