view mercurial/mergeutil.py @ 38882:ff42ec7845e4

fileset: narrow status computation by left-hand-side of 'and' node

Timing with warm disk cache:

  $ hg status --cwd mozilla-central 'set:path:build/ and unknown()' --time
  (orig) time: real 1.970 secs (user 1.560+0.000 sys 0.410+0.000)
  (new)  time: real 0.330 secs (user 0.310+0.000 sys 0.020+0.000)

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