Mercurial > hg-stable
changeset 7487:63446383dfb7
Merge backout
author | David Soria Parra <dsp@php.net> |
---|---|
date | Sun, 07 Dec 2008 19:28:09 +0100 |
parents | 167853c7e54a (current diff) d3b6c6179323 (diff) |
children | 9b64589b1112 |
files | hgext/bookmarks.py |
diffstat | 1 files changed, 0 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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":