##// END OF EJS Templates
merge: remove no longer required ACTION_GET_OTHER_AND_STORE...
merge: remove no longer required ACTION_GET_OTHER_AND_STORE In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass info from manifestmerge() to applyupdates() and store info in mergestate. In previous patches, we introduced a separate return value from manifestmerge() and calculateupdates() and an argument to applyupdates() which achieved the same thing. Let's remove this no longer required messy code. Differential Revision: https://phab.mercurial-scm.org/D8744

File last commit:

r37644:0a9c0d34 default
r45834:c515c54f 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