# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1228674489 -3600
# Node ID 63446383dfb7747398503ca8511516c07c234c07
# Parent  167853c7e54a162917586d3ea3d80b3a2ed5df35# Parent  d3b6c617932344be00a0014fd68b294b01297226
Merge backout

diff -r 167853c7e54a -r 63446383dfb7 hgext/bookmarks.py
--- a/hgext/bookmarks.py	Sat Dec 06 19:30:20 2008 +0100
+++ b/hgext/bookmarks.py	Sun Dec 07 19:28:09 2008 +0100
@@ -318,27 +318,12 @@
     setcurrent(repo, rev)
     return res
 
-def bookmarkonlylog(orig, ui, repo, *args, **opts):
-    'Show revisions that are ancestors of given bookmark'
-    if opts.get('only_bookmark'):
-        if opts.get('rev'):
-            raise util.Abort(_("you cannot use --rev and --only-bookmark"
-                               " options simultaneously"))
-        mark = opts['only_bookmark']
-        if not mark in parse(repo):
-            raise util.Abort(_("invalid bookmark name"))
-        opts['rev'] = ['%s:null' % mark]
-    orig(ui, repo, *args, **opts)
-
 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)
-    entry = extensions.wrapcommand(commands.table, 'log', bookmarkonlylog)
-    entry[1].append(('B', 'only-bookmark', '',
-                     _("show only ancestors of given bookmark")))
 
 cmdtable = {
     "bookmarks":