##// END OF EJS Templates
diff: add experimental support for "merge diffs"...
diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

File last commit:

r43346:2372284d default
r47177:1a7d12c8 default
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")