##// END OF EJS Templates
tests: demonstrate how conflict markers end up $local *and* $output...
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378

File last commit:

r49730:6000f5b2 default
r49822:b10a944c stable
Show More
perf.py
30 lines | 653 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")