# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1451578999 18000
# Node ID 69077c65919d2a620f2b3711d8587b6a57edea92
# Parent  594ca2f3d1de274a512c131e87d4fac4f1f15876
topic: handle merge.update function signature change

I think this is backwards compatible with how it used to be called,
but I didn't worry about it too much either.

diff -r 594ca2f3d1de -r 69077c65919d src/topic/__init__.py
--- a/src/topic/__init__.py	Fri Dec 11 13:12:23 2015 -0500
+++ b/src/topic/__init__.py	Thu Dec 31 11:23:19 2015 -0500
@@ -198,12 +198,11 @@
                           "\nHG: topic '%s'\nHG: branch" % t)
     return ret
 
-def mergeupdatewrap(orig, repo, node, branchmerge, force, partial,
-                    ancestor=None, mergeancestor=False, labels=None):
+def mergeupdatewrap(orig, repo, node, branchmerge, force, *args, **kwargs):
+    partial = bool(len(args)) or 'matcher' in kwargs
     wlock = repo.wlock()
     try:
-        ret = orig(repo, node, branchmerge, force, partial, ancestor=ancestor,
-                   mergeancestor=mergeancestor, labels=labels)
+        ret = orig(repo, node, branchmerge, force, *args, **kwargs)
         if not partial and not branchmerge:
             ot = repo.currenttopic
             t = ''