mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
c12e300bb8
Summary: Move top-level Python packages `mercurial`, `hgext` and `hgdemandimport` to a new top-level package `edenscm`. This allows the Python packages provided by the upstream Mercurial to be installed side-by-side. To maintain compatibility, `edenscm/` gets added to `sys.path` in `mercurial/__init__.py`. Reviewed By: phillco, ikostia Differential Revision: D13853115 fbshipit-source-id: b296b0673dc54c61ef6a591ebc687057ff53b22e
22 lines
673 B
Python
22 lines
673 B
Python
# mergeutil.py - help for merge processing in mercurial
|
|
#
|
|
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
|
#
|
|
# 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 . import error
|
|
from .i18n import _
|
|
|
|
|
|
def checkunresolved(ms):
|
|
if list(ms.unresolved()):
|
|
raise error.Abort(_("unresolved merge conflicts " "(see 'hg help resolve')"))
|
|
if ms.mdstate() != "s" or list(ms.driverresolved()):
|
|
raise error.Abort(
|
|
_("driver-resolved merge conflicts"),
|
|
hint=_('run "hg resolve --all" to resolve'),
|
|
)
|