From 921ced43c48c1d170452a7b251b94cc96ec8dd44 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@baserock.org>
Date: Sat, 1 Oct 2011 20:49:36 +0000
Subject: Imported from
 /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.

---
 mercurial/pushkey.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'mercurial/pushkey.py')

diff --git a/mercurial/pushkey.py b/mercurial/pushkey.py
index 7d692d0..2343319 100644
--- a/mercurial/pushkey.py
+++ b/mercurial/pushkey.py
@@ -5,21 +5,16 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import bookmarks, phases, obsolete
+import bookmarks
 
 def _nslist(repo):
     n = {}
     for k in _namespaces:
         n[k] = ""
-    if not obsolete._enabled:
-        n.pop('obsolete')
     return n
 
 _namespaces = {"namespaces": (lambda *x: False, _nslist),
-               "bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),
-               "phases": (phases.pushphase, phases.listphases),
-               "obsolete": (obsolete.pushmarker, obsolete.listmarkers),
-              }
+               "bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks)}
 
 def register(namespace, pushkey, listkeys):
     _namespaces[namespace] = (pushkey, listkeys)
-- 
cgit v1.2.1