# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2015-07-20 20:39:25
# Node ID 6805a4f76cdae23be611781ba4b3039786108045
# Parent  c30b739c322fdafeabee82d0d33e4de5abb8fca5

exchange: fix dead assignment

The assignment of the value from bundle2.processbundle() to 'r' is
unused. It is currently the same as its third argument (if given), and
since that argument may eventually go away (according to the method's
docstring), let's reassign the return value to 'op' instead to better
prepare for that.

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1419,7 +1419,7 @@ def unbundle(repo, cg, heads, source, ur
                 op = bundle2.bundleoperation(repo, lambda: tr,
                                              captureoutput=captureoutput)
                 try:
-                    r = bundle2.processbundle(repo, cg, op=op)
+                    op = bundle2.processbundle(repo, cg, op=op)
                 finally:
                     r = op.reply
                     if captureoutput and r is not None: