Remove patches from_upstream__accept_and_forward_kwargs_including_opargs.patch and from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patc h as they are now included upstream

4 files changed, 4 insertions, 62 deletions

diff --git a/debian/changelog b/debian/changelog
index cc129dc..317b768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ hgsubversion (1.8.5-1) UNRELEASED; urgency=medium
   * New upstream release
   * Bump standards-version to 3.9.7 (no change needed)
   * Use https for Homepage and Vcs-Browser
+  * Remove patches
+    from_upstream__accept_and_forward_kwargs_including_opargs.patch and
+    from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patc
+    h as they are now included upstream
 
  -- Javi Merino <vicho@debian.org>  Thu, 10 Mar 2016 05:16:10 +0000
 
diff --git a/debian/patches/from_upstream__accept_and_forward_kwargs_including_opargs.patch b/debian/patches/from_upstream__accept_and_forward_kwargs_including_opargs.patch
deleted file mode 100644
index 2e45f90..0000000
--- a/debian/patches/from_upstream__accept_and_forward_kwargs_including_opargs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Sean Farley <sean@farley.io>
-Origin: upstream, https://bitbucket.org/durin42/hgsubversion/commits/129f4ad088c252052c795e7017c90d6adbfdcdfb
-Subject: wrappers: accept-and-forward kwargs including opargs
-
-We didn't really need opargs, so let's remove the conditional and just forward
-it.
-
-diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
---- a/hgsubversion/wrappers.py
-+++ b/hgsubversion/wrappers.py
-@@ -516,7 +516,7 @@ def pull(repo, source, heads=[], force=F
-         ui.status("pulled %d revisions\n" % revisions)
- 
- def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(),
--                 opargs=None):
-+                 **kwargs):
-     capable = getattr(remote, 'capable', lambda x: False)
-     if capable('subversion'):
-         # transaction manager is present in Mercurial >= 3.3
-@@ -537,13 +537,7 @@ def exchangepull(orig, repo, remote, hea
-             else:
-                 pullop.releasetransaction()
-     else:
--        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)
-+        return orig(repo, remote, heads, force, bookmarks=bookmarks, **kwargs)
- 
- def rebase(orig, ui, repo, **opts):
-     """rebase current unpushed revisions onto the Subversion head
diff --git a/debian/patches/from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patch b/debian/patches/from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patch
deleted file mode 100644
index 1a25d42..0000000
--- a/debian/patches/from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Sean Farley <sean@farley.io>
-Origin: upstream, https://bitbucket.org/durin42/hgsubversion/commits/d227cf8d08602573a60cb0f1606970db91a808ec
-Subject: exchangepush: accept kwargs and just forward them
-
-diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
---- a/hgsubversion/wrappers.py
-+++ b/hgsubversion/wrappers.py
-@@ -369,7 +369,7 @@ def push(repo, dest, force, revs):
-     return 1 # so we get a sane exit status, see hg's commands.push
- 
- def exchangepush(orig, repo, remote, force=False, revs=None, newbranch=False,
--                 bookmarks=()):
-+                 bookmarks=(), **kwargs):
-     capable = getattr(remote, 'capable', lambda x: False)
-     if capable('subversion'):
-         pushop = exchange.pushoperation(repo, remote, force, revs, newbranch,
-@@ -377,7 +377,8 @@ def exchangepush(orig, repo, remote, for
-         pushop.cgresult = push(repo, remote, force, revs)
-         return pushop
-     else:
--        return orig(repo, remote, force, revs, newbranch, bookmarks=bookmarks)
-+        return orig(repo, remote, force, revs, newbranch, bookmarks=bookmarks,
-+                    **kwargs)
- 
- def pull(repo, source, heads=[], force=False, meta=None):
-     """pull new revisions from Subversion"""
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6a48e3f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-from_upstream__accept_and_forward_kwargs_including_opargs.patch
-from_upstream__exchangepush_accept_kwargs_and_just_forward_them.patch