Mercurial > hgsubversion
changeset 1336:f97b8c333c9e stable
wrappers: accept-and-forward oparg pull argument
It's possible we should do something with this some day, but for now
this at least keeps hgsubversion from breaking pull when bundle2 is
enabled.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Tue, 16 Jun 2015 11:47:15 -0400 |
| parents | 9a78a6524f9d |
| children | 0f1f88e71138 |
| files | hgsubversion/wrappers.py |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -515,7 +515,8 @@ def pull(repo, source, heads=[], force=F else: ui.status("pulled %d revisions\n" % revisions) -def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()): +def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(), + opargs=None): capable = getattr(remote, 'capable', lambda x: False) if capable('subversion'): # transaction manager is present in Mercurial >= 3.3 @@ -536,7 +537,13 @@ def exchangepull(orig, repo, remote, hea else: pullop.releasetransaction() else: - return orig(repo, remote, heads, force, bookmarks=bookmarks) + if opargs is not None: + # hg 3.5 + return orig( + repo, remote, heads, force, bookmarks=bookmarks, opargs=opargs) + else: + # hg 3.4 + return orig(repo, remote, heads, force, bookmarks=bookmarks) def rebase(orig, ui, repo, **opts): """rebase current unpushed revisions onto the Subversion head