# HG changeset patch # User Matt Mackall # Date 1243810458 18000 # Node ID b6511055d37b084dd1fef5fe433bbe1fb8701d7d # Parent 32537b12e09135f3f96296dad4414917233e17dc match: ignore return of match.bad All users returned false, return can now be dropped diff -r 32537b12e091 -r b6511055d37b mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sun May 31 17:54:18 2009 -0500 +++ b/mercurial/cmdutil.py Sun May 31 17:54:18 2009 -0500 @@ -256,7 +256,6 @@ opts.get('include'), opts.get('exclude'), default) def badfn(f, msg): repo.ui.warn("%s: %s\n" % (m.rel(f), msg)) - return False m.bad = badfn return m diff -r 32537b12e091 -r b6511055d37b mercurial/dirstate.py --- a/mercurial/dirstate.py Sun May 31 17:54:18 2009 -0500 +++ b/mercurial/dirstate.py Sun May 31 17:54:18 2009 -0500 @@ -515,8 +515,7 @@ dostep3 = True break else: - if badfn(ff, inst.strerror) and not ignore(nf): - results[nf] = None + badfn(ff, inst.strerror) # step 2: visit subdirectories while work: diff -r 32537b12e091 -r b6511055d37b mercurial/localrepo.py --- a/mercurial/localrepo.py Sun May 31 17:54:18 2009 -0500 +++ b/mercurial/localrepo.py Sun May 31 17:54:18 2009 -0500 @@ -948,7 +948,6 @@ def bad(f, msg): if f not in ctx1: self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) - return False match.bad = bad if working: # we need to scan the working dir diff -r 32537b12e091 -r b6511055d37b mercurial/match.py --- a/mercurial/match.py Sun May 31 17:54:18 2009 -0500 +++ b/mercurial/match.py Sun May 31 17:54:18 2009 -0500 @@ -83,12 +83,8 @@ def bad(self, f, msg): '''callback for each explicit file that can't be found/accessed, with an error message - - return True to keep file in results, False to discard - - default behavior is to silently keep ''' - return True + pass def dir(self, f): pass def missing(self, f):