equal
deleted
inserted
replaced
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: |