mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
23e41d98e5
Summary: copytracing extension is going to be simpler than I expected in the beginning. There is no need to separate folder, let's move it to hgext3rd Test Plan: arc unit Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D5146585 Tasks: 18508761 Signature: t1:5146585:1496147733:ad6ad14f663a8b9bf4b687f0767395321f9840b7
69 lines
2.9 KiB
Python
69 lines
2.9 KiB
Python
# Copyright 2017-present Facebook. All Rights Reserved.
|
|
#
|
|
# faster copytrace implementation
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from functools import partial, update_wrapper
|
|
from mercurial import commands, dispatch, extensions, filemerge
|
|
from mercurial.i18n import _
|
|
|
|
_copytracinghint = ("hint: if this message is due to a moved file, you can " +
|
|
"ask mercurial to attempt to automatically resolve this " +
|
|
"change by re-running with the --tracecopies flag, but " +
|
|
"this will significantly slow down the operation, so you " +
|
|
"will need to be patient.\n" +
|
|
"Source control team is working on fixing this problem.\n")
|
|
|
|
def uisetup(ui):
|
|
extensions.wrapfunction(dispatch, "runcommand", _runcommand)
|
|
|
|
def extsetup(ui):
|
|
commands.globalopts.append(
|
|
("", "tracecopies", None,
|
|
_("enable copytracing. Warning: can be very slow!")))
|
|
|
|
# With experimental.disablecopytrace=True there can be cryptic merge errors.
|
|
# Let"s change error message to suggest re-running the command with
|
|
# enabled copytracing
|
|
filemerge._localchangedotherdeletedmsg = _(
|
|
"local%(l)s changed %(fd)s which other%(o)s deleted\n" +
|
|
_copytracinghint +
|
|
"use (c)hanged version, (d)elete, or leave (u)nresolved?"
|
|
"$$ &Changed $$ &Delete $$ &Unresolved")
|
|
|
|
filemerge._otherchangedlocaldeletedmsg = _(
|
|
"other%(o)s changed %(fd)s which local%(l)s deleted\n" +
|
|
_copytracinghint +
|
|
"use (c)hanged version, leave (d)eleted, or leave (u)nresolved?"
|
|
"$$ &Changed $$ &Deleted $$ &Unresolved")
|
|
|
|
origpromptmerge = filemerge.internals[':prompt']
|
|
wrapperpromptmerge = partial(_promptmerge, origpromptmerge)
|
|
update_wrapper(wrapperpromptmerge, origpromptmerge)
|
|
# wrap function everywhere as in filemerge.internaltool
|
|
filemerge.internals[':prompt'] = wrapperpromptmerge
|
|
filemerge.internalsdoc[':prompt'] = wrapperpromptmerge
|
|
filemerge.internals['internal:prompt'] = wrapperpromptmerge
|
|
|
|
def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs):
|
|
if "--tracecopies" in fullargs:
|
|
ui.setconfig("experimental", "disablecopytrace",
|
|
False, "--tracecopies")
|
|
return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs)
|
|
|
|
def _promptmerge(origfunc, repo, mynode, orig, fcd, fco, *args, **kwargs):
|
|
ui = repo.ui
|
|
phases = sorted([_getctxfromfctx(fco).phase(),
|
|
_getctxfromfctx(fcd).phase()])
|
|
if fco.isabsent() or fcd.isabsent():
|
|
ui.log("promptmerge", "", mergechangeddeleted=('%s' % phases))
|
|
return origfunc(repo, mynode, orig, fcd, fco, *args, **kwargs)
|
|
|
|
def _getctxfromfctx(fctx):
|
|
if fctx.isabsent():
|
|
return fctx._ctx
|
|
else:
|
|
return fctx._changectx
|