# HG changeset patch # User Augie Fackler # Date 1444854856 14400 # Node ID 72d5a2449bf51cf8b05c9ce283413cd1da8062e3 # Parent d28bfd2c6e32095787d7849310aef5f2b475fe9e wrappers: forward extra kwargs to exchange.pull A recent hg change ended up requiring this. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -523,7 +523,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): + opargs=None, **kwargs): capable = getattr(remote, 'capable', lambda x: False) if capable('subversion'): # transaction manager is present in Mercurial >= 3.3 @@ -547,7 +547,8 @@ def exchangepull(orig, repo, remote, hea if opargs is not None: # hg 3.5 return orig( - repo, remote, heads, force, bookmarks=bookmarks, opargs=opargs) + repo, remote, heads, force, bookmarks=bookmarks, + opargs=opargs, **kwargs) else: # hg 3.4 return orig(repo, remote, heads, force, bookmarks=bookmarks)