# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1228674806 -3600
# Node ID 9b64589b1112cceabda67722eef23d69b9770ec2
# Parent  63446383dfb7747398503ca8511516c07c234c07# Parent  e80a734ba1fc3fad399dcb7d336a0870f39ba835
Merge backout

diff -r 63446383dfb7 -r 9b64589b1112 hgext/bookmarks.py
--- a/hgext/bookmarks.py	Sun Dec 07 19:28:09 2008 +0100
+++ b/hgext/bookmarks.py	Sun Dec 07 19:33:26 2008 +0100
@@ -292,19 +292,6 @@
 
     repo.__class__ = bookmark_repo
 
-def pushnonbookmarked(orig, ui, repo, *args, **opts):
-    'Call push with only the heads that are not bookmarked'
-    if opts.get('non_bookmarked'):
-        if opts.get('rev'):
-            heads = [repo.lookup(r) for r in opts.get('rev')]
-        else:
-            heads = repo.heads()
-
-        markheads = parse(repo).values()
-        opts['rev'] = [head for head in heads if not(head in markheads)]
-
-    orig(ui, repo, *args, **opts)
-
 def updatecurbookmark(orig, ui, repo, *args, **opts):
     '''Set the current bookmark
 
@@ -320,8 +307,6 @@
 
 def uisetup(ui):
     'Replace push with a decorator to provide --non-bookmarked option'
-    entry = extensions.wrapcommand(commands.table, 'push', pushnonbookmarked)
-    entry[1].append(('', 'non-bookmarked', None, _("push all heads that are not bookmarked")))
     if ui.configbool('bookmarks', 'track.current'):
         extensions.wrapcommand(commands.table, 'update', updatecurbookmark)