Mercurial > hgsubversion
changeset 1360:129f4ad088c2 stable
wrappers: accept-and-forward kwargs including opargs
We didn't really need opargs, so let's remove the conditional and just forward
it.
author | Sean Farley <sean@farley.io> |
---|---|
date | Thu, 15 Oct 2015 14:29:52 -0700 |
parents | 44895e2abff2 |
children | d227cf8d0860 |
files | hgsubversion/wrappers.py |
diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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