##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r30406:cff0f592 default
r38701:b3d0c97a @81 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")