Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 17183:4253cfee08ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: fix bug in detection of remote obsolete support Current code check obsolete availability in local repo.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 12 Jul 2012 03:03:19 +0200
parents 12fdaa30063a
children 1ac628cd7113
comparison
equal deleted inserted replaced
17182:cdf1532d89c6 17183:4253cfee08ef
1837 str(phases.draft), 1837 str(phases.draft),
1838 str(phases.public)) 1838 str(phases.public))
1839 if not r: 1839 if not r:
1840 self.ui.warn(_('updating %s to public failed!\n') 1840 self.ui.warn(_('updating %s to public failed!\n')
1841 % newremotehead) 1841 % newremotehead)
1842 if 'obsolete' in self.listkeys('namespaces') and self.obsstore: 1842 if ('obsolete' in remote.listkeys('namespaces')
1843 and self.obsstore):
1843 data = self.listkeys('obsolete')['dump'] 1844 data = self.listkeys('obsolete')['dump']
1844 r = remote.pushkey('obsolete', 'dump', '', data) 1845 r = remote.pushkey('obsolete', 'dump', '', data)
1845 if not r: 1846 if not r:
1846 self.ui.warn(_('failed to push obsolete markers!\n')) 1847 self.ui.warn(_('failed to push obsolete markers!\n'))
1847 finally: 1848 finally: