##// END OF EJS Templates
filemerge: add support for partial conflict resolution by external tool...
filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

File last commit:

r47575:d4ba4d51 default
r49838:f3aafd78 default
Show More
hgperf
112 lines | 2.8 KiB | text/plain | TextLexer
Gregory Szorc
global: use python3 in shebangs...
r46434 #!/usr/bin/env python3
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 #
# hgperf - measure performance of Mercurial commands
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2014 Olivia Mackall <olivia@selenic.com>
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 #
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
'''measure performance of Mercurial commands
Using ``hgperf`` instead of ``hg`` measures performance of the target
Mercurial command. For example, the execution below measures
performance of :hg:`heads --topo`::
$ hgperf heads --topo
All command output via ``ui`` is suppressed, and just measurement
result is displayed: see also "perf" extension in "contrib".
Costs of processing before dispatching to the command function like
below are not measured::
- parsing command line (e.g. option validity check)
- reading configuration files in
But ``pre-`` and ``post-`` hook invocation for the target command is
measured, even though these are invoked before or after dispatching to
the command function, because these may be required to repeat
execution of the target command correctly.
'''
import os
import sys
libdir = '@LIBDIR@'
if libdir != '@' 'LIBDIR' '@':
if not os.path.isabs(libdir):
Gregory Szorc
black: blacken scripts...
r44058 libdir = os.path.join(
os.path.dirname(os.path.realpath(__file__)), libdir
)
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 libdir = os.path.abspath(libdir)
sys.path.insert(0, libdir)
# enable importing on demand to reduce startup time
try:
Gregory Szorc
black: blacken scripts...
r44058 from mercurial import demandimport
demandimport.enable()
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 except ImportError:
import sys
Gregory Szorc
black: blacken scripts...
r44058
sys.stderr.write(
"abort: couldn't find mercurial libraries in [%s]\n"
% ' '.join(sys.path)
)
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1)
Augie Fackler
hgperf: update to conform with import style checks
r33893 from mercurial import (
dispatch,
util,
)
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839
Gregory Szorc
black: blacken scripts...
r44058
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 def timer(func, title=None):
results = []
Augie Fackler
hgperf: update to conform with import style checks
r33893 begin = util.timer()
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 count = 0
while True:
ostart = os.times()
Augie Fackler
hgperf: update to conform with import style checks
r33893 cstart = util.timer()
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 r = func()
Augie Fackler
hgperf: update to conform with import style checks
r33893 cstop = util.timer()
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 ostop = os.times()
count += 1
a, b = ostart, ostop
Gregory Szorc
black: blacken scripts...
r44058 results.append((cstop - cstart, b[0] - a[0], b[1] - a[1]))
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 if cstop - begin > 3 and count >= 100:
break
if cstop - begin > 10 and count >= 3:
break
if title:
sys.stderr.write("! %s\n" % title)
if r:
sys.stderr.write("! result: %s\n" % r)
m = min(results)
Gregory Szorc
black: blacken scripts...
r44058 sys.stderr.write(
"! wall %f comb %f user %f sys %f (best of %d)\n"
% (m[0], m[1] + m[2], m[1], m[2], count)
)
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839
Augie Fackler
hgperf: update to conform with import style checks
r33893 orgruncommand = dispatch.runcommand
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839
Gregory Szorc
black: blacken scripts...
r44058
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
ui.pushbuffer()
lui.pushbuffer()
Gregory Szorc
black: blacken scripts...
r44058 timer(
lambda: orgruncommand(
lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions
)
)
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 ui.popbuffer()
lui.popbuffer()
Gregory Szorc
black: blacken scripts...
r44058
Augie Fackler
hgperf: update to conform with import style checks
r33893 dispatch.runcommand = runcommand
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839
Augie Fackler
hgperf: update to conform with import style checks
r33893 dispatch.run()