Mercurial > hgsubversion

diff hgsubversion/wrappers.py @ 1336:f97b8c333c9e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 43a365f5d13c
children 356460fb01fa 129f4ad088c2
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