changeset 1359:72d5a2449bf5

wrappers: forward extra kwargs to exchange.pull A recent hg change ended up requiring this.
author Augie Fackler <raf@durin42.com>
date Wed, 14 Oct 2015 16:34:16 -0400
parents d28bfd2c6e32
children a279eb7185d4
files hgsubversion/wrappers.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)