hgext/obsolete.py
changeset 58 2ba7355f6e11
parent 56 27f9c0d0a996
child 69 aee53d546849
equal deleted inserted replaced
57:62f2fe22bd42 58:2ba7355f6e11
    97         tmp.write(raw)
    97         tmp.write(raw)
    98         tmp.seek(0)
    98         tmp.seek(0)
    99         relations = repo._obsdeserialise(tmp)
    99         relations = repo._obsdeserialise(tmp)
   100         for sub, objs in relations.iteritems():
   100         for sub, objs in relations.iteritems():
   101             for obj in objs:
   101             for obj in objs:
   102                 repo.addobsolete(sub, obj)
   102                 try:
       
   103                     repo.addobsolete(sub, obj)
       
   104                 except error.RepoLookupError:
       
   105                     pass
       
   106         return 0
   103     finally:
   107     finally:
   104         w.release()
   108         w.release()
   105 
   109 
   106 def listobsolete(repo):
   110 def listobsolete(repo):
   107     tmp = StringIO()
   111     tmp = StringIO()
   243         def push(self, remote, *args, **opts):
   247         def push(self, remote, *args, **opts):
   244             result = opush(remote, *args, **opts)
   248             result = opush(remote, *args, **opts)
   245             if 'obsolete' in remote.listkeys('namespaces'):
   249             if 'obsolete' in remote.listkeys('namespaces'):
   246                 tmp = StringIO()
   250                 tmp = StringIO()
   247                 repo._obsserialise(tmp)
   251                 repo._obsserialise(tmp)
   248                 remote.pushkey('obsolete', 'relations', {}, tmp.getvalue())
   252                 remote.pushkey('obsolete', 'relations', '', tmp.getvalue())
   249 
   253 
   250             return result
   254             return result
   251 
   255 
   252 
   256 
   253 
   257