Skip to content
Snippets Groups Projects
Commit b1b03873 authored by Augie Fackler's avatar Augie Fackler
Browse files

hggit: adapt pull wrapper function for recent hg

We can just accept-and-forward kwargs, which should be nicely
futureproof for a while.
parent 5cc9594c
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment