##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r34534:163fa0ae default
r38817:bb54db4a @96 default
Show More
hgperf
97 lines | 2.8 KiB | text/plain | TextLexer
FUJIWARA Katsunori
contrib: add "hgperf" command to measure performance of commands easily...
r20839 #!/usr/bin/env python
#
# hgperf - measure performance of Mercurial commands
#
# Copyright 2014 Matt Mackall <mpm@selenic.com>
#
# 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):
libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
libdir)
libdir = os.path.abspath(libdir)
sys.path.insert(0, libdir)
# enable importing on demand to reduce startup time
try:
from mercurial import demandimport; demandimport.enable()
except ImportError:
import sys
sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
' '.join(sys.path))
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
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
results.append((cstop - cstart, b[0] - a[0], b[1]-a[1]))
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)
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))
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
def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
ui.pushbuffer()
lui.pushbuffer()
timer(lambda : orgruncommand(lui, repo, cmd, fullargs, ui,
options, d, cmdpats, cmdoptions))
ui.popbuffer()
lui.popbuffer()
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()