changeset 914:b1b03873c9ad

hggit: adapt pull wrapper function for recent hg We can just accept-and-forward kwargs, which should be nicely futureproof for a while.
author Augie Fackler <augie@google.com>
date Thu, 18 Jun 2015 16:42:13 -0400
parents 5cc9594cc811
children e4006703a287
files hggit/__init__.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/__init__.py
+++ b/hggit/__init__.py
@@ -241,7 +241,8 @@
 extensions.wrapfunction(hg, 'peer', peer)
 
 @util.transform_notgit
-def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()):
+def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(),
+                 **kwargs):
     if isinstance(remote, gitrepo.gitrepo):
         # transaction manager is present in Mercurial >= 3.3
         try:
@@ -269,7 +270,7 @@
             lock.release()
             wlock.release()
     else:
-        return orig(repo, remote, heads, force, bookmarks=bookmarks)
+        return orig(repo, remote, heads, force, bookmarks=bookmarks, **kwargs)
 if not hgutil.safehasattr(localrepo.localrepository, 'pull'):
     # Mercurial >= 3.2
     extensions.wrapfunction(exchange, 'pull', exchangepull)