Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: catch the new Error class in scmutil and chgserver
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 May 2021 21:45:59 -0700
changeset 47293 7a769ac49637
parent 47292 5a75be916316
child 47294 93a0abe098e7
errors: catch the new Error class in scmutil and chgserver Differential Revision: https://phab.mercurial-scm.org/D10739
mercurial/chgserver.py file | annotate | diff | comparison | revisions
mercurial/scmutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/chgserver.py	Tue May 18 21:32:12 2021 -0700
+++ b/mercurial/chgserver.py	Tue May 18 21:45:59 2021 -0700
@@ -515,7 +515,7 @@
             if inst.hint:
                 self.ui.error(_(b"(%s)\n") % inst.hint)
             errorraised = True
-        except error.Abort as inst:
+        except error.Error as inst:
             if inst.detailed_exit_code is not None:
                 detailed_exit_code = inst.detailed_exit_code
             self.ui.error(inst.format())
--- a/mercurial/scmutil.py	Tue May 18 21:32:12 2021 -0700
+++ b/mercurial/scmutil.py	Tue May 18 21:45:59 2021 -0700
@@ -205,7 +205,7 @@
         detailed_exit_code = 50
     except error.WdirUnsupported:
         ui.error(_(b"abort: working directory revision cannot be specified\n"))
-    except error.Abort as inst:
+    except error.Error as inst:
         if inst.detailed_exit_code is not None:
             detailed_exit_code = inst.detailed_exit_code
         if inst.coarse_exit_code is not None:
Mercurial