##// END OF EJS Templates
filemerge: add internal merge tool to dump files forcibly...
filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

File last commit:

r28728:8699c89f default
r32255:7e35d31b default
Show More
hypothesishelpers.py
71 lines | 2.1 KiB | text/x-python | PythonLexer
/ tests / hypothesishelpers.py
# Helper module to use the Hypothesis tool in tests
#
# Copyright 2015 David R. MacIver
#
# For details see http://hypothesis.readthedocs.org
from __future__ import absolute_import, print_function
import os
import sys
import traceback
try:
# hypothesis 2.x
from hypothesis.configuration import set_hypothesis_home_dir
from hypothesis import settings
except ImportError:
# hypothesis 1.x
from hypothesis.settings import set_hypothesis_home_dir
from hypothesis import Settings as settings
import hypothesis.strategies as st
from hypothesis import given
# hypothesis store data regarding generate example and code
set_hypothesis_home_dir(os.path.join(
os.getenv('TESTTMP'), ".hypothesis"
))
def check(*args, **kwargs):
"""decorator to make a function a hypothesis test
Decorated function are run immediately (to be used doctest style)"""
def accept(f):
# Workaround for https://github.com/DRMacIver/hypothesis/issues/206
# Fixed in version 1.13 (released 2015 october 29th)
f.__module__ = '__anon__'
try:
with settings(max_examples=2000):
given(*args, **kwargs)(f)()
except Exception:
traceback.print_exc(file=sys.stdout)
sys.exit(1)
return accept
def roundtrips(data, decode, encode):
"""helper to tests function that must do proper encode/decode roundtripping
"""
@given(data)
def testroundtrips(value):
encoded = encode(value)
decoded = decode(encoded)
if decoded != value:
raise ValueError(
"Round trip failed: %s(%r) -> %s(%r) -> %r" % (
encode.__name__, value, decode.__name__, encoded,
decoded
))
try:
testroundtrips()
except Exception:
# heredoc swallow traceback, we work around it
traceback.print_exc(file=sys.stdout)
raise
print("Round trip OK")
# strategy for generating bytestring that might be an issue for Mercurial
bytestrings = (
st.builds(lambda s, e: s.encode(e), st.text(), st.sampled_from([
'utf-8', 'utf-16',
]))) | st.binary()