mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
27 lines
808 B
Python
27 lines
808 B
Python
# errors.py - errors used by pushrebase
|
|
#
|
|
# Copyright 2018 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import error
|
|
from edenscm.mercurial.i18n import _
|
|
|
|
|
|
class ConflictsError(error.Abort):
|
|
def __init__(self, conflicts):
|
|
self.conflicts = conflicts
|
|
msg = (
|
|
_("conflicting changes in:\n%s\n")
|
|
% "".join(" %s\n" % f for f in sorted(conflicts))
|
|
).strip()
|
|
hint = _("pull and rebase your changes locally, then try again")
|
|
super(ConflictsError, self).__init__(msg, hint=hint)
|
|
|
|
|
|
class StackPushUnsupportedError(error.Abort):
|
|
"""The push cannot be done via stackpush"""
|