comparison hgext/bookmarks.py @ 7487:63446383dfb7

Merge backout

7484:167853c7e54a

    if not rev and len(args) > 0:
        rev = args[0]
    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":
        (bookmark,
         [('f', 'force', False, _('force')),

7487:63446383dfb7

    if not rev and len(args) > 0:
        rev = args[0]
    setcurrent(repo, rev)
    return res

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)

cmdtable = {
    "bookmarks":
        (bookmark,
         [('f', 'force', False, _('force')),