Patchwork [2,of,2] extensions: catch uisetup and extsetup failures and don't let them break hg

login
register
mail settings
Submitter Augie Fackler
Date June 6, 2017, 2:15 p.m.
Message ID <9681ff165ea757e99bbb.1496758505@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/21218/
State Superseded
Headers show

Comments

Augie Fackler - June 6, 2017, 2:15 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1496758188 14400
#      Tue Jun 06 10:09:48 2017 -0400
# Node ID 9681ff165ea757e99bbb355412708f8d45f922c1
# Parent  656e5d8cab2048029eb16b7096bd44f9abe5bf7b
extensions: catch uisetup and extsetup failures and don't let them break hg

Otherwise users of the patience diff extension will be unable to run
anything at all in hg 4.3 until they figure out what's broken.

Patch

diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -167,17 +167,25 @@  def load(ui, name, path):
 def _runuisetup(name, ui):
     uisetup = getattr(_extensions[name], 'uisetup', None)
     if uisetup:
-        uisetup(ui)
+        try:
+            uisetup(ui)
+        except Exception as inst:
+            msg = _forbytes(inst)
+            ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg))
 
 def _runextsetup(name, ui):
     extsetup = getattr(_extensions[name], 'extsetup', None)
     if extsetup:
         try:
-            extsetup(ui)
-        except TypeError:
-            if inspect.getargspec(extsetup).args:
-                raise
-            extsetup() # old extsetup with no ui argument
+            try:
+                extsetup(ui)
+            except TypeError:
+                if inspect.getargspec(extsetup).args:
+                    raise
+                extsetup() # old extsetup with no ui argument
+        except Exception as inst:
+            msg = _forbytes(inst)
+            ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg))
 
 def loadall(ui, whitelist=None):
     result = ui.configitems("extensions")
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1628,6 +1628,10 @@  Make sure a broken uisetup doesn't globa
 Broken: an extension that triggers the import of bdiff during uisetup
 can't be easily debugged:
   $ hg version
-  abort: No module named bdiff!
-  (did you forget to compile extensions?)
-  [255]
+  *** failed to set up extension baduisetup: No module named bdiff
+  Mercurial Distributed SCM (version *) (glob)
+  (see https://mercurial-scm.org for more information)
+  
+  Copyright (C) 2005-2017 Matt Mackall and others
+  This is free software; see the source for copying conditions. There is NO
+  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/tests/test-flagprocessor.t b/tests/test-flagprocessor.t
--- a/tests/test-flagprocessor.t
+++ b/tests/test-flagprocessor.t
@@ -161,7 +161,8 @@ 
   > EOF
   $ echo 'this should fail' > file
   $ hg commit -Aqm 'add file'
-  abort: cannot register multiple processors on flag '0x8'.
+  *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
+  abort: missing processor for flag '0x1'!
   [255]
 
   $ cd ..