view mercurial/mergeutil.py @ 39244:73cf21b2e8a6

manifest: add getstorage() to manifestlog and use it globally

It is a common pattern to obtain a directory manifest storage instance
(a manifestrevlog) by going through manifestlog._revlog.dirlog().

Why access to storage and caching of other manifests is done through
manifestrevlog instead of manifestlog, I don't know.

This commit establishes a getstorage(tree) API on manifestlog and
imanifestlog that provides a public API for accessing manifest storage.

All consumers previously using private attributes have been updated
to use this new method.

.. api:: manifestlog now has a getstorage(tree) method

   It should be used for obtaining an object representing the
   manifest's storage implementation. Accessing
   manifestlog._revlog should be avoided.

Differential Revision: https://phab.mercurial-scm.org/D4277

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# 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'))