Patchwork D1718: worker: handle interrupt on windows

login
register
mail settings
Submitter phabricator
Date Dec. 19, 2017, 4:22 a.m.
Message ID <1ef3a0c833122f53da67988b7711fa8e@localhost.localdomain>
Download mbox | patch
Permalink /patch/26346/
State Not Applicable
Headers show

Comments

phabricator - Dec. 19, 2017, 4:22 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG44fd4cfc6c0a: worker: handle interrupt on windows (authored by wlis, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1718?vs=4533&id=4540

REVISION DETAIL
  https://phab.mercurial-scm.org/D1718

AFFECTED FILES
  mercurial/worker.py

CHANGE DETAILS




To: wlis, #hg-reviewers, krbullock
Cc: krbullock, mercurial-devel

Patch

diff --git a/mercurial/worker.py b/mercurial/worker.py
--- a/mercurial/worker.py
+++ b/mercurial/worker.py
@@ -282,7 +282,7 @@ 
                 if t.exception is not None:
                     raise t.exception
                 threads.remove(t)
-    except Exception: # re-raises
+    except (Exception, KeyboardInterrupt): # re-raises
         trykillworkers()
         raise
     while not resultqueue.empty():