mercurial/wireproto.py
changeset 35979 ae79cf6f9c82
parent 35860 d9e71cce3b2f
child 35980 b4976912a6ef
equal deleted inserted replaced
35978:59e4a7781a36 35979:ae79cf6f9c82
   912 
   912 
   913     if util.safehasattr(proto, 'restore'):
   913     if util.safehasattr(proto, 'restore'):
   914 
   914 
   915         proto.redirect()
   915         proto.redirect()
   916 
   916 
   917         try:
   917         r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
   918             r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
   918                          encoding.tolocal(old), new) or False
   919                              encoding.tolocal(old), new) or False
       
   920         except error.Abort:
       
   921             r = False
       
   922 
   919 
   923         output = proto.restore()
   920         output = proto.restore()
   924 
   921 
   925         return '%s\n%s' % (int(r), output)
   922         return '%s\n%s' % (int(r), output)
   926 
   923