##// END OF EJS Templates
copies: handle a case when both merging csets are not descendant of merge base...
copies: handle a case when both merging csets are not descendant of merge base This patch fix the behaviour of fullcopytracing algorithm in the case when both the merging csets are not the descendant of merge base. Although it seems to be the rare case when both the csets are not descendant of merge base. But it can be seen in most of cases of content-divergence in evolve extension, where merge base is the common predecessor. Previous patch added a test where this algorithm can fail to continue because of an assumption that only one of the two csets can be dirty. This patch fix that error. For refrence I suggest you to look into the previous discussion held on a patch sent by Pulkit: https://phab.mercurial-scm.org/D3896 Differential Revision: https://phab.mercurial-scm.org/D5963

File last commit:

r37513:b1fb341d default
r42098:7694b685 default
Show More
common.py
151 lines | 4.4 KiB | text/x-python | PythonLexer
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 import imp
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 import inspect
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 import io
Gregory Szorc
zstd: vendor python-zstandard 0.8.0...
r31796 import os
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 import types
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 try:
import hypothesis
except ImportError:
hypothesis = None
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895
def make_cffi(cls):
"""Decorator to add CFFI versions of each test method."""
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 # The module containing this class definition should
# `import zstandard as zstd`. Otherwise things may blow up.
mod = inspect.getmodule(cls)
if not hasattr(mod, 'zstd'):
raise Exception('test module does not contain "zstd" symbol')
if not hasattr(mod.zstd, 'backend'):
raise Exception('zstd symbol does not have "backend" attribute; did '
'you `import zstandard as zstd`?')
# If `import zstandard` already chose the cffi backend, there is nothing
# for us to do: we only add the cffi variation if the default backend
# is the C extension.
if mod.zstd.backend == 'cffi':
return cls
old_env = dict(os.environ)
os.environ['PYTHON_ZSTANDARD_IMPORT_POLICY'] = 'cffi'
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 try:
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 try:
mod_info = imp.find_module('zstandard')
mod = imp.load_module('zstandard_cffi', *mod_info)
except ImportError:
return cls
finally:
os.environ.clear()
os.environ.update(old_env)
if mod.backend != 'cffi':
raise Exception('got the zstandard %s backend instead of cffi' % mod.backend)
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895
# If CFFI version is available, dynamically construct test methods
# that use it.
for attr in dir(cls):
fn = getattr(cls, attr)
if not inspect.ismethod(fn) and not inspect.isfunction(fn):
continue
if not fn.__name__.startswith('test_'):
continue
name = '%s_cffi' % fn.__name__
# Replace the "zstd" symbol with the CFFI module instance. Then copy
# the function object and install it in a new attribute.
if isinstance(fn, types.FunctionType):
globs = dict(fn.__globals__)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 globs['zstd'] = mod
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 new_fn = types.FunctionType(fn.__code__, globs, name,
fn.__defaults__, fn.__closure__)
new_method = new_fn
else:
globs = dict(fn.__func__.func_globals)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 globs['zstd'] = mod
Gregory Szorc
zstd: vendor python-zstandard 0.7.0...
r30895 new_fn = types.FunctionType(fn.__func__.func_code, globs, name,
fn.__func__.func_defaults,
fn.__func__.func_closure)
new_method = types.UnboundMethodType(new_fn, fn.im_self,
fn.im_class)
setattr(cls, name, new_method)
return cls
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435
class OpCountingBytesIO(io.BytesIO):
def __init__(self, *args, **kwargs):
self._read_count = 0
self._write_count = 0
return super(OpCountingBytesIO, self).__init__(*args, **kwargs)
def read(self, *args):
self._read_count += 1
return super(OpCountingBytesIO, self).read(*args)
def write(self, data):
self._write_count += 1
return super(OpCountingBytesIO, self).write(data)
Gregory Szorc
zstd: vendor python-zstandard 0.8.0...
r31796
_source_files = []
def random_input_data():
"""Obtain the raw content of source files.
This is used for generating "random" data to feed into fuzzing, since it is
faster than random content generation.
"""
if _source_files:
return _source_files
for root, dirs, files in os.walk(os.path.dirname(__file__)):
dirs[:] = list(sorted(dirs))
for f in sorted(files):
try:
with open(os.path.join(root, f), 'rb') as fh:
data = fh.read()
if data:
_source_files.append(data)
except OSError:
pass
return _source_files
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
def generate_samples():
inputs = [
b'foo',
b'bar',
b'abcdef',
b'sometext',
b'baz',
]
samples = []
for i in range(128):
samples.append(inputs[i % 5])
samples.append(inputs[i % 5] * (i + 3))
samples.append(inputs[-(i % 5)] * (i + 2))
return samples
if hypothesis:
default_settings = hypothesis.settings()
hypothesis.settings.register_profile('default', default_settings)
ci_settings = hypothesis.settings(max_examples=2500,
max_iterations=2500)
hypothesis.settings.register_profile('ci', ci_settings)
hypothesis.settings.load_profile(
os.environ.get('HYPOTHESIS_PROFILE', 'default'))