##// END OF EJS Templates
merge: disallow merge abort in case of an unfinished operation (issue6160)...
merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

File last commit:

r30406:cff0f592 default
r42780:b8d54f46 default
Show More
perf.py
26 lines | 649 B | text/x-python | PythonLexer
# perf.py - asv benchmarks using contrib/perf.py extension
#
# Copyright 2016 Logilab SA <contact@logilab.fr>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from . import perfbench
@perfbench()
def track_tags(perf):
return perf("perftags")
@perfbench()
def track_status(perf):
return perf("perfstatus", unknown=False)
@perfbench(params=[('rev', ['1000', '10000', 'tip'])])
def track_manifest(perf, rev):
return perf("perfmanifest", rev)
@perfbench()
def track_heads(perf):
return perf("perfheads")