Mercurial > hg
view mercurial/mergeutil.py @ 32132:6dea1701f170
match: make subinclude construction lazy
The matcher subinclude functionality allows us to have .hgignore files that
include subdirectory hgignore files. Today it parses the entire repo at once,
even if we only need to test a file in one subdirectory. This patch makes the
subinclude tree creation lazy, which speeds up matcher creation significantly in
large repos with very large trees of ignore patterns.
author | Durham Goode <durham@fb.com> |
---|---|
date | Wed, 03 May 2017 10:30:57 -0700 |
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'))