mercurial/localrepo.py
changeset 19053 f74f2a4e3327
parent 18952 8086b530e2ac
child 19054 d5f968f7716f
equal deleted inserted replaced
19052:63a783d1ac85 19053:f74f2a4e3327
  1910                                            str(phases.public))
  1910                                            str(phases.public))
  1911                         if not r:
  1911                         if not r:
  1912                             self.ui.warn(_('updating %s to public failed!\n')
  1912                             self.ui.warn(_('updating %s to public failed!\n')
  1913                                             % newremotehead)
  1913                                             % newremotehead)
  1914                 self.ui.debug('try to push obsolete markers to remote\n')
  1914                 self.ui.debug('try to push obsolete markers to remote\n')
  1915                 if (obsolete._enabled and self.obsstore and
  1915                 obsolete.syncpush(self, remote)
  1916                     'obsolete' in remote.listkeys('namespaces')):
       
  1917                     rslts = []
       
  1918                     remotedata = self.listkeys('obsolete')
       
  1919                     for key in sorted(remotedata, reverse=True):
       
  1920                         # reverse sort to ensure we end with dump0
       
  1921                         data = remotedata[key]
       
  1922                         rslts.append(remote.pushkey('obsolete', key, '', data))
       
  1923                     if [r for r in rslts if not r]:
       
  1924                         msg = _('failed to push some obsolete markers!\n')
       
  1925                         self.ui.warn(msg)
       
  1926             finally:
  1916             finally:
  1927                 if lock is not None:
  1917                 if lock is not None:
  1928                     lock.release()
  1918                     lock.release()
  1929         finally:
  1919         finally:
  1930             locallock.release()
  1920             locallock.release()