facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

hggit: adapt pull wrapper function for recent hg

Browse Source 
We can just accept-and-forward kwargs, which should be nicely
futureproof for a while.
This commit is contained in:
Augie Fackler 2015-06-18 16:42:13 -04:00
parent 81bb3feb82
commit d7b4c70b92
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hggit/__init__.py
View File

@ -241,7 +241,8 @@ def peer(orig, uiorrepo, *args, **opts):
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 @@ def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()):
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)