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.
addremove: replace match.bad() monkey patching with match.badmatch()
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 04 Jun 2015 21:25:07 -0400
changeset 25434 5984dd42e140
parent 25433 419ac63fe29c
child 25435 a592a6a6f4fe
addremove: replace match.bad() monkey patching with match.badmatch() No known issues with the previous code since it restored the original method, but this is cleaner.
mercurial/scmutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/scmutil.py	Thu Jun 04 21:19:22 2015 -0400
+++ b/mercurial/scmutil.py	Thu Jun 04 21:25:07 2015 -0400
@@ -850,15 +850,14 @@
                                  % join(subpath))
 
     rejected = []
-    origbad = m.bad
     def badfn(f, msg):
         if f in m.files():
-            origbad(f, msg)
+            m.bad(f, msg)
         rejected.append(f)
 
-    m.bad = badfn
-    added, unknown, deleted, removed, forgotten = _interestingfiles(repo, m)
-    m.bad = origbad
+    badmatch = matchmod.badmatch(m, badfn)
+    added, unknown, deleted, removed, forgotten = _interestingfiles(repo,
+                                                                    badmatch)
 
     unknownset = set(unknown + forgotten)
     toprint = unknownset.copy()
mercurial