Mercurial > hg
changeset 24917:71a738a6a1c1
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.
| author | Drew Gottlieb <drgott@google.com> |
|---|---|
| date | Wed, 22 Apr 2015 12:16:19 -0700 |
| parents | 658bd4dc7a73 |
| children | 2eac3ae0d088 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Wed Apr 22 12:59:12 2015 -0700 +++ b/mercurial/localrepo.py Wed Apr 22 12:16:19 2015 -0700 @@ -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()