Mercurial > hg
view contrib/hgperf @ 44394:5e3402a0b868
mergestate: determine if active without looking for state files on disk
I couldn't think of a reason that we need to check state files on disk
to determine if a merge is active. I could imagine them being for
there for detecting broken state files that would then be cleaned up
by some later command, but we always delete the entire `.hg/merge/`
tree, so that doesn't seem to be it.
The checks were added in 4e932dc5c113 (resolve: abort when not
applicable (BC), 2014-04-18). Perhaps there were needed for that and
then made obsolete by 6062593d8b06 (resolve: don't abort resolve -l
even when no merge is in progress, 2014-05-23).
The reason I want to delete the checks is that I think `ms =
mergestate.read(repo); ms.active() and ms.local` should be a valid
pattern, but it crashes when the merge state file is an empty file if
we consider mere presence of the file as "active".
Differential Revision: https://phab.mercurial-scm.org/D8118
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 13 Feb 2020 17:15:08 -0800 |
parents | 99e231afc29c |
children | c102b704edb5 |
line wrap: on
line source
#!/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) from mercurial import ( dispatch, util, ) def timer(func, title=None): results = [] begin = util.timer() count = 0 while True: ostart = os.times() cstart = util.timer() r = func() cstop = util.timer() 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) ) orgruncommand = dispatch.runcommand 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() dispatch.runcommand = runcommand dispatch.run()