upstream/mercurial-mirror Files · mercurial/thirdparty/concurrent/futures/__init__.py

context: don't count deleted files as candidates for path conflicts in IMM...

context: don't count deleted files as candidates for path conflicts in IMM This patch makes sure we don't consider the deleted files in our IMM wctx as potential conflicts while calculating paths conflicts. This fixes the bug demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D4543

Gregory Szorc - - Load All Authors

File last commit:

r37644:0a9c0d34 default


                r39612:fa4d16da

default

Download file

             __init__.py
        
                    27 lines
            
             | 608 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / concurrent / futures / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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