Mercurial > hg
view mercurial/mergeutil.py @ 41766:cd7059d17cb2
context: use includematcher when checking dir/file conflicts
This is for performance; patternmatcher can't easily interpret its results to
make visitchildrenset be the "optimal" set of paths to inspect, but
includematcher can. Since there aren't any special patterns being used here, I
believe that the two matchers are equivalent.
Differential Revision: https://phab.mercurial-scm.org/D5999
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 21 Feb 2019 19:11:35 -0800 |
parents | c1149533676b |
children | 2372284d9457 |
line wrap: on
line source
# 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'))