Mercurial > hg
view mercurial/thirdparty/concurrent/futures/__init__.py @ 47886:86a60679cf61 stable 5.9.1
fix: again allow formatting the working copy while merging
I forgot about unfinished merges (I think I was thinking only about
unfinished merge conflicts) when I wrote
https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor
dploch) reported to me, this led to `hg fix --working-dir` failing
when you have an uncommitted merge. The fix is trivial: just move the
assertion to just before the call to `scmutil.movedirstate()` where it
actually matters.
Differential Revision: https://phab.mercurial-scm.org/D11376
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 27 Aug 2021 13:51:44 -0700 |
parents | 0a9c0d3480b2 |
children |
line wrap: on
line source
# Copyright 2009 Brian Quinlan. All Rights Reserved. # Licensed to PSF under a Contributor Agreement. """Execute computations asynchronously using threads or processes.""" from __future__ import absolute_import __author__ = 'Brian Quinlan (brian@sweetapp.com)' from ._base import ( FIRST_COMPLETED, FIRST_EXCEPTION, ALL_COMPLETED, CancelledError, TimeoutError, Future, Executor, wait, as_completed, ) from .thread import ThreadPoolExecutor try: from .process import ProcessPoolExecutor except ImportError: # some platforms don't have multiprocessing pass