site

(Pierre-Yves David)
2011-09-09: [obsolete] Fix pushkey

[obsolete] Fix pushkey

diff --git a/hgext/obsolete.py b/hgext/obsolete.py
--- a/hgext/obsolete.py
+++ b/hgext/obsolete.py
@@ -99,7 +99,11 @@ def pushobsolete(repo, key, old, raw):
         relations = repo._obsdeserialise(tmp)
         for sub, objs in relations.iteritems():
             for obj in objs:
-                repo.addobsolete(sub, obj)
+                try:
+                    repo.addobsolete(sub, obj)
+                except error.RepoLookupError:
+                    pass
+        return 0
     finally:
         w.release()
 
@@ -245,7 +249,7 @@ def reposetup(ui, repo):
             if 'obsolete' in remote.listkeys('namespaces'):
                 tmp = StringIO()
                 repo._obsserialise(tmp)
-                remote.pushkey('obsolete', 'relations', {}, tmp.getvalue())
+                remote.pushkey('obsolete', 'relations', '', tmp.getvalue())
 
             return result