Mercurial > public > mercurial-scm > hg-stable

diff mercurial/ui.py @ 41079:8ecb17b7f432

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
procutil: correct spelling of uninterruptable -> uninterruptible Differential Revision: https://phab.mercurial-scm.org/D5488
author Kyle Lippincott <spectral@google.com>
date Fri, 28 Dec 2018 12:51:47 -0800
parents 6603de284b0a
children 8cf92ca92bfe
line wrap: on
line diff
--- a/mercurial/ui.py	Fri Dec 28 18:14:10 2018 -0500
+++ b/mercurial/ui.py	Fri Dec 28 12:51:47 2018 -0800
@@ -348,7 +348,7 @@
                 (util.timer() - starttime) * 1000
 
     @contextlib.contextmanager
-    def uninterruptable(self):
+    def uninterruptible(self):
         """Mark an operation as unsafe.
 
         Most operations on a repository are safe to interrupt, but a
@@ -362,7 +362,7 @@
             enabled = self.interactive()
         if self._uninterruptible or not enabled:
             # if nointerrupt support is turned off, the process isn't
-            # interactive, or we're already in an uninterruptable
+            # interactive, or we're already in an uninterruptible
             # block, do nothing.
             yield
             return
@@ -371,7 +371,7 @@
             self.warn(
                 _("press ^C again to terminate immediately (dangerous)\n"))
             return True
-        with procutil.uninterruptable(warn):
+        with procutil.uninterruptible(warn):
             try:
                 self._uninterruptible = True
                 yield