Patchwork [5,of,6] localrepo: rename requirements parameter in stream_in()

login
register
mail settings
Submitter Drew Gottlieb
Date May 1, 2015, 11:19 p.m.
Message ID <e18209d2abdc45ba974d.1430522351@waste.org>
Download mbox | patch
Permalink /patch/8836/
State Accepted
Commit 71a738a6a1c1409f3e777ce8e36a987ab5c23eaf
Headers show

Comments

Drew Gottlieb - May 1, 2015, 11:19 p.m.
# HG changeset patch
# User Drew Gottlieb <drgott@google.com>
# Date 1429730179 25200
#      Wed Apr 22 12:16:19 2015 -0700
# Node ID e18209d2abdc45ba974d6c780c57428ca271d1f6
# Parent  74730f9658d383f45cc5fb2089530df4c981f03e
localrepo: rename requirements parameter in stream_in()

To avoid confusion from overloading of the variable name "requirements", the
requirements is renamed to remotereqs for localrepo's stream_in() function.

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1752,7 +1752,7 @@ 
         """
         return util.hooks()
 
-    def stream_in(self, remote, requirements):
+    def stream_in(self, remote, remotereqs):
         lock = self.lock()
         try:
             # Save remote branchmap. We will use it later
@@ -1825,9 +1825,9 @@ 
                             util.bytecount(total_bytes / elapsed)))
 
             # new requirements = old non-format requirements +
-            #                    new format-related
+            #                    new format-related remote requirements
             # requirements from the streamed-in repository
-            self.requirements = requirements | (
+            self.requirements = remotereqs | (
                     self.requirements - self.supportedformats)
             self._applyopenerreqs()
             self._writerequirements()