Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add: replace match.bad() monkey patching with match.badmatch()
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 04 Jun 2015 21:49:50 -0400
changeset 25436 9724cbe2d546
parent 25435 a592a6a6f4fe
child 25437 9c1bcd95b3ff
add: replace match.bad() monkey patching with match.badmatch() The previous code didn't restore the original method, but it looks like the worst that would happen is junk added to a list that had already been processed by previous subrepo invocation(s).
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Thu Jun 04 21:37:59 2015 -0400
+++ b/mercurial/cmdutil.py	Thu Jun 04 21:49:50 2015 -0400
@@ -2213,15 +2213,16 @@
 def add(ui, repo, match, prefix, explicitonly, **opts):
     join = lambda f: os.path.join(prefix, f)
     bad = []
-    oldbad = match.bad
-    match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
+
+    badfn = lambda x, y: bad.append(x) or match.bad(x, y)
     names = []
     wctx = repo[None]
     cca = None
     abort, warn = scmutil.checkportabilityalert(ui)
     if abort or warn:
         cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
-    for f in wctx.walk(match):
+
+    for f in wctx.walk(matchmod.badmatch(match, badfn)):
         exact = match.exact(f)
         if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
             if cca:
mercurial