[PATCH 2 of 4 STABLE] exchange: fix dead assignment

Martin von Zweigbergk martinvonz at google.com
Mon Aug 3 16:37:43 UTC 2015


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1437424765 25200
#      Mon Jul 20 13:39:25 2015 -0700
# Branch stable
# Node ID c8d4bb838f9a3cc3fb427a1e121c026b68b784ab
# Parent  5f220a708dcd3fc9901c903de81d9acf3203374c
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 @@
                 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:



More information about the Mercurial-devel mailing list