Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 17294:d2217df3a7cf stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: add debug output regarding obsolete marker exchange.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 26 Jul 2012 16:41:42 +0200
parents d3f84ccc5495
children 1f08ecc7febb
comparison
equal deleted inserted replaced
17293:d3f84ccc5495 17294:d2217df3a7cf
1781 else: 1781 else:
1782 # Remote is old or publishing all common changesets 1782 # Remote is old or publishing all common changesets
1783 # should be seen as public 1783 # should be seen as public
1784 phases.advanceboundary(self, phases.public, subset) 1784 phases.advanceboundary(self, phases.public, subset)
1785 1785
1786 self.ui.debug('fetching remote obsolete markers')
1786 remoteobs = remote.listkeys('obsolete') 1787 remoteobs = remote.listkeys('obsolete')
1787 if 'dump' in remoteobs: 1788 if 'dump' in remoteobs:
1788 if tr is None: 1789 if tr is None:
1789 tr = self.transaction(trname) 1790 tr = self.transaction(trname)
1790 data = base85.b85decode(remoteobs['dump']) 1791 data = base85.b85decode(remoteobs['dump'])
1949 str(phases.draft), 1950 str(phases.draft),
1950 str(phases.public)) 1951 str(phases.public))
1951 if not r: 1952 if not r:
1952 self.ui.warn(_('updating %s to public failed!\n') 1953 self.ui.warn(_('updating %s to public failed!\n')
1953 % newremotehead) 1954 % newremotehead)
1955 self.ui.debug('try to push obsolete markers to remote\n')
1954 if (self.obsstore and 1956 if (self.obsstore and
1955 'obsolete' in remote.listkeys('namespaces')): 1957 'obsolete' in remote.listkeys('namespaces')):
1956 data = self.listkeys('obsolete')['dump'] 1958 data = self.listkeys('obsolete')['dump']
1957 r = remote.pushkey('obsolete', 'dump', '', data) 1959 r = remote.pushkey('obsolete', 'dump', '', data)
1958 if not r: 1960 if not r: