Mercurial > hg-stable
changeset 25466:007a1d53f7c3
scmutil: use the optional badfn argument when building a matcher
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 05 Jun 2015 19:07:54 -0400 |
parents | f472228a9e5e |
children | f64dbe06f3d0 |
files | mercurial/scmutil.py |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Jun 05 19:01:04 2015 -0400 +++ b/mercurial/scmutil.py Fri Jun 05 19:07:54 2015 -0400 @@ -798,11 +798,12 @@ if not globbed and default == 'relpath': pats = expandpats(pats or []) - m = ctx.match(pats, opts.get('include'), opts.get('exclude'), - default, listsubrepos=opts.get('subrepos')) def badfn(f, msg): ctx.repo().ui.warn("%s: %s\n" % (m.rel(f), msg)) - m.bad = badfn + + m = ctx.match(pats, opts.get('include'), opts.get('exclude'), + default, listsubrepos=opts.get('subrepos'), badfn=badfn) + if m.always(): pats = [] return m, pats