equal
deleted
inserted
replaced
1785 else: |
1785 else: |
1786 # Remote is old or publishing all common changesets |
1786 # Remote is old or publishing all common changesets |
1787 # should be seen as public |
1787 # should be seen as public |
1788 phases.advanceboundary(self, phases.public, subset) |
1788 phases.advanceboundary(self, phases.public, subset) |
1789 |
1789 |
1790 self.ui.debug('fetching remote obsolete markers') |
1790 if obsolete._enabled: |
1791 remoteobs = remote.listkeys('obsolete') |
1791 self.ui.debug('fetching remote obsolete markers') |
1792 if 'dump0' in remoteobs: |
1792 remoteobs = remote.listkeys('obsolete') |
1793 if tr is None: |
1793 if 'dump0' in remoteobs: |
1794 tr = self.transaction(trname) |
1794 if tr is None: |
1795 for key in sorted(remoteobs, reverse=True): |
1795 tr = self.transaction(trname) |
1796 if key.startswith('dump'): |
1796 for key in sorted(remoteobs, reverse=True): |
1797 data = base85.b85decode(remoteobs[key]) |
1797 if key.startswith('dump'): |
1798 self.obsstore.mergemarkers(tr, data) |
1798 data = base85.b85decode(remoteobs[key]) |
|
1799 self.obsstore.mergemarkers(tr, data) |
1799 if tr is not None: |
1800 if tr is not None: |
1800 tr.close() |
1801 tr.close() |
1801 finally: |
1802 finally: |
1802 if tr is not None: |
1803 if tr is not None: |
1803 tr.release() |
1804 tr.release() |
1957 str(phases.public)) |
1958 str(phases.public)) |
1958 if not r: |
1959 if not r: |
1959 self.ui.warn(_('updating %s to public failed!\n') |
1960 self.ui.warn(_('updating %s to public failed!\n') |
1960 % newremotehead) |
1961 % newremotehead) |
1961 self.ui.debug('try to push obsolete markers to remote\n') |
1962 self.ui.debug('try to push obsolete markers to remote\n') |
1962 if (self.obsstore and |
1963 if (obsolete._enabled and self.obsstore and |
1963 'obsolete' in remote.listkeys('namespaces')): |
1964 'obsolete' in remote.listkeys('namespaces')): |
1964 rslts = [] |
1965 rslts = [] |
1965 remotedata = self.listkeys('obsolete') |
1966 remotedata = self.listkeys('obsolete') |
1966 for key in sorted(remotedata, reverse=True): |
1967 for key in sorted(remotedata, reverse=True): |
1967 # reverse sort to ensure we end with dump0 |
1968 # reverse sort to ensure we end with dump0 |