From patchwork Sat Jun 24 15:38:29 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [01,of,10] bundle: remove 'op' argument from applybundle()
From: via Mercurial-devel <mercurial-devel@mercurial-scm.org>
X-Patchwork-Id: 21665
Message-Id: <dff383987b37065f8dc3.1498318709@martinvonz.svl.corp.google.com>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 24 Jun 2017 08:38:29 -0700

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1498081324 25200
#      Wed Jun 21 14:42:04 2017 -0700
# Node ID dff383987b37065f8dc35ee0e26d79dae842c362
# Parent  8e3021fd1a44e48a4720bb6fa4538fba399ad213
bundle: remove 'op' argument from applybundle()

No callers pass in an operation.

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -310,14 +310,14 @@
     to be created"""
     raise TransactionUnavailable()
 
-def applybundle(repo, unbundler, tr, source=None, url=None, op=None):
+def applybundle(repo, unbundler, tr, source=None, url=None):
     # transform me into unbundler.apply() as soon as the freeze is lifted
     tr.hookargs['bundle2'] = '1'
     if source is not None and 'source' not in tr.hookargs:
         tr.hookargs['source'] = source
     if url is not None and 'url' not in tr.hookargs:
         tr.hookargs['url'] = url
-    return processbundle(repo, unbundler, lambda: tr, op=op)
+    return processbundle(repo, unbundler, lambda: tr)
 
 def processbundle(repo, unbundler, transactiongetter=None, op=None):
     """This function process a bundle, apply effect to/from a repo