##// END OF EJS Templates
test-copies: add a test updating file content while merging a pure overwrite...
test-copies: add a test updating file content while merging a pure overwrite As the current test misbehavior show, this confuse various part of the code: - the committed file is different depending of the commit source, - the upgrade code compute the wrong information on this changeset. This will be fixed in upcoming patches. Differential Revision: https://phab.mercurial-scm.org/D10087

File last commit:

r37644:0a9c0d34 default
r47540:6b52cffd default
Show More
__init__.py
27 lines | 608 B | text/x-python | PythonLexer
Gregory Szorc
thirdparty: vendor futures 3.2.0...
r37641 # Copyright 2009 Brian Quinlan. All Rights Reserved.
# Licensed to PSF under a Contributor Agreement.
"""Execute computations asynchronously using threads or processes."""
Gregory Szorc
futures: switch to absolute and relative imports...
r37644 from __future__ import absolute_import
Gregory Szorc
thirdparty: vendor futures 3.2.0...
r37641 __author__ = 'Brian Quinlan (brian@sweetapp.com)'
Gregory Szorc
futures: switch to absolute and relative imports...
r37644 from ._base import (
FIRST_COMPLETED,
FIRST_EXCEPTION,
ALL_COMPLETED,
CancelledError,
TimeoutError,
Future,
Executor,
wait,
as_completed,
)
from .thread import ThreadPoolExecutor
Gregory Szorc
thirdparty: vendor futures 3.2.0...
r37641
try:
Gregory Szorc
futures: switch to absolute and relative imports...
r37644 from .process import ProcessPoolExecutor
Gregory Szorc
thirdparty: vendor futures 3.2.0...
r37641 except ImportError:
# some platforms don't have multiprocessing
pass