Mercurial > evolve
changeset 1877:69077c65919d
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.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Thu, 31 Dec 2015 11:23:19 -0500 |
| parents | 594ca2f3d1de |
| children | c44f161575ba |
| files | src/topic/__init__.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 = ''