mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
a8b9b1e400
This will allow localrepo to stop using cmdutil, which should avoid some future import cycles. There's room for an adventurous soul to delve deeper into merge.py and figure out how to disentangle more of it - it appears to be a nexus of cycle problems. Some of it might be able to move into this new mergeutil package.
23 lines
701 B
Python
23 lines
701 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 .i18n import _
|
|
|
|
from . import (
|
|
error,
|
|
)
|
|
|
|
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'))
|