Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 24916:658bd4dc7a73 | 24917:71a738a6a1c1 |
|---|---|
| 1750 """Return util.hooks consists of "(repo, remote, outgoing)" | 1750 """Return util.hooks consists of "(repo, remote, outgoing)" |
| 1751 functions, which are called before pushing changesets. | 1751 functions, which are called before pushing changesets. |
| 1752 """ | 1752 """ |
| 1753 return util.hooks() | 1753 return util.hooks() |
| 1754 | 1754 |
| 1755 def stream_in(self, remote, requirements): | 1755 def stream_in(self, remote, remotereqs): |
| 1756 lock = self.lock() | 1756 lock = self.lock() |
| 1757 try: | 1757 try: |
| 1758 # Save remote branchmap. We will use it later | 1758 # Save remote branchmap. We will use it later |
| 1759 # to speed up branchcache creation | 1759 # to speed up branchcache creation |
| 1760 rbranchmap = None | 1760 rbranchmap = None |
| 1823 self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | 1823 self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % |
| 1824 (util.bytecount(total_bytes), elapsed, | 1824 (util.bytecount(total_bytes), elapsed, |
| 1825 util.bytecount(total_bytes / elapsed))) | 1825 util.bytecount(total_bytes / elapsed))) |
| 1826 | 1826 |
| 1827 # new requirements = old non-format requirements + | 1827 # new requirements = old non-format requirements + |
| 1828 # new format-related | 1828 # new format-related remote requirements |
| 1829 # requirements from the streamed-in repository | 1829 # requirements from the streamed-in repository |
| 1830 self.requirements = requirements | ( | 1830 self.requirements = remotereqs | ( |
| 1831 self.requirements - self.supportedformats) | 1831 self.requirements - self.supportedformats) |
| 1832 self._applyopenerreqs() | 1832 self._applyopenerreqs() |
| 1833 self._writerequirements() | 1833 self._writerequirements() |
| 1834 | 1834 |
| 1835 if rbranchmap: | 1835 if rbranchmap: |