# HG changeset patch # User Sean Farley # Date 1444944592 25200 # Node ID 129f4ad088c252052c795e7017c90d6adbfdcdfb # Parent 44895e2abff2fddbc1eb5810a43ff63639093111 wrappers: accept-and-forward kwargs including opargs We didn't really need opargs, so let's remove the conditional and just forward it. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -516,7 +516,7 @@ def pull(repo, source, heads=[], force=F ui.status("pulled %d revisions\n" % revisions) def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(), - opargs=None): + **kwargs): capable = getattr(remote, 'capable', lambda x: False) if capable('subversion'): # transaction manager is present in Mercurial >= 3.3 @@ -537,13 +537,7 @@ def exchangepull(orig, repo, remote, hea else: pullop.releasetransaction() else: - if opargs is not None: - # hg 3.5 - return orig( - repo, remote, heads, force, bookmarks=bookmarks, opargs=opargs) - else: - # hg 3.4 - return orig(repo, remote, heads, force, bookmarks=bookmarks) + return orig(repo, remote, heads, force, bookmarks=bookmarks, **kwargs) def rebase(orig, ui, repo, **opts): """rebase current unpushed revisions onto the Subversion head