Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 17252:16fad7323e56 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: do not try to push remote obsolete if local has none
author Patrick Mezard <patrick@mezard.eu>
date Tue, 24 Jul 2012 21:20:56 +0200
parents 6ffb35b2284c
children d3f84ccc5495
comparison
equal deleted inserted replaced
17251:98166640b356 17252:16fad7323e56
1949 str(phases.draft), 1949 str(phases.draft),
1950 str(phases.public)) 1950 str(phases.public))
1951 if not r: 1951 if not r:
1952 self.ui.warn(_('updating %s to public failed!\n') 1952 self.ui.warn(_('updating %s to public failed!\n')
1953 % newremotehead) 1953 % newremotehead)
1954 if ('obsolete' in remote.listkeys('namespaces') 1954 if (self.obsstore and
1955 and self.obsstore): 1955 'obsolete' in remote.listkeys('namespaces')):
1956 data = self.listkeys('obsolete')['dump'] 1956 data = self.listkeys('obsolete')['dump']
1957 r = remote.pushkey('obsolete', 'dump', '', data) 1957 r = remote.pushkey('obsolete', 'dump', '', data)
1958 if not r: 1958 if not r:
1959 self.ui.warn(_('failed to push obsolete markers!\n')) 1959 self.ui.warn(_('failed to push obsolete markers!\n'))
1960 finally: 1960 finally: