mercurial/exchange.py
changeset 20435 46ede894d5a4
parent 20434 e009e59e4566
child 20436 2f2e8d1c4856
equal deleted inserted replaced
20434:e009e59e4566 20435:46ede894d5a4
   244                                               str(phases.draft),
   244                                               str(phases.draft),
   245                                               str(phases.public))
   245                                               str(phases.public))
   246                     if not r:
   246                     if not r:
   247                         pushop.ui.warn(_('updating %s to public failed!\n')
   247                         pushop.ui.warn(_('updating %s to public failed!\n')
   248                                        % newremotehead)
   248                                        % newremotehead)
   249             pushop.ui.debug('try to push obsolete markers to remote\n')
       
   250             _pushobsolete(pushop)
   249             _pushobsolete(pushop)
   251         finally:
   250         finally:
   252             if lock is not None:
   251             if lock is not None:
   253                 lock.release()
   252                 lock.release()
   254     finally:
   253     finally:
   258     _pushbookmark(pushop)
   257     _pushbookmark(pushop)
   259     return ret
   258     return ret
   260 
   259 
   261 def _pushobsolete(pushop):
   260 def _pushobsolete(pushop):
   262     """utility function to push obsolete markers to a remote"""
   261     """utility function to push obsolete markers to a remote"""
       
   262     pushop.ui.debug('try to push obsolete markers to remote\n')
   263     repo = pushop.repo
   263     repo = pushop.repo
   264     remote = pushop.remote
   264     remote = pushop.remote
   265     if (obsolete._enabled and repo.obsstore and
   265     if (obsolete._enabled and repo.obsstore and
   266         'obsolete' in remote.listkeys('namespaces')):
   266         'obsolete' in remote.listkeys('namespaces')):
   267         rslts = []
   267         rslts = []