view mercurial/mergeutil.py @ 37797:43221a57e22f stable

context: translate FilteredIndex/LookupError at repo[changeid] (API)

This partially backs out ecd3f6909184. It seems layering violation for
repo[changeid] to raise storage-level exceptions transparently. Otherwise,
we would have to rewrite callers to catch all of them.

  try:
      repo[rev_or_node]
  except (error.RepoLookupError, error.FilteredIndexError,
          error.FilteredLookupError):
      pass

This would also fix filectx._changectx(), which catches FilteredRepoLookupError
to fall back to the unfiltered path.

# 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'))