hgext3rd/topic/__init__.py
changeset 1966 e67c526c0a25
parent 1963 7b7f073ed05e
child 1969 a604423c1500
--- a/hgext3rd/topic/__init__.py	Mon Apr 25 20:00:19 2016 -0700
+++ b/hgext3rd/topic/__init__.py	Mon Apr 25 21:24:20 2016 -0700
@@ -290,7 +290,8 @@
     return ret
 
 def mergeupdatewrap(orig, repo, node, branchmerge, force, *args, **kwargs):
-    partial = bool(len(args)) or 'matcher' in kwargs
+    matcher = kwargs.get('matcher')
+    partial = not (matcher is None or matcher.always())
     wlock = repo.wlock()
     try:
         ret = orig(repo, node, branchmerge, force, *args, **kwargs)