mercurial/commands.py

39768:2d478b05fb14

    [('f', 'force', False, _('force')),
    ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
    ('d', 'delete', False, _('delete a given bookmark')),
    ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
    ('i', 'inactive', False, _('mark a bookmark inactive')),
    ('', 'active', False, _('display the active bookmark')),
    ] + formatteropts,
    _('hg bookmarks [OPTIONS]... [NAME]...'))
def bookmark(ui, repo, *names, **opts):
    '''create a new bookmark or list existing bookmarks

    Bookmarks can be pushed and pulled between repositories (see
    :hg:`help push` and :hg:`help pull`). If a shared bookmark has
    diverged, a new 'divergent bookmark' of the form 'name@path' will
    be created. Using :hg:`merge` will resolve the divergence.

    Specifying bookmark as '.' to -m or -d options is equivalent to specifying
    the active bookmark's name.

    A bookmark named '@' has the special property that :hg:`clone` will
    check it out by default if it exists.

    opts = pycompat.byteskwargs(opts)
    force = opts.get('force')
    rev = opts.get('rev')
    inactive = opts.get('inactive')  # meaning add/rename to inactive bookmark

    selactions = [k for k in ['delete', 'rename', 'active'] if opts.get(k)]
    if len(selactions) > 1:
        raise error.Abort(_('--%s and --%s are incompatible')
                          % tuple(selactions[:2]))
    if selactions:
        action = selactions[0]
    elif names or rev:
        action = 'add'
    elif inactive:
        action = 'inactive'  # meaning deactivate
    else:
        action = None

    if rev and action in {'delete', 'rename', 'active'}:
        raise error.Abort(_("--rev is incompatible with --%s") % action)
    if names and action == 'active':
        raise error.Abort(_("NAMES is incompatible with --active"))
    if inactive and action in {'delete', 'active'}:
        raise error.Abort(_("--inactive is incompatible with --%s") % action)
    if not names and action in {'add', 'delete'}:
        raise error.Abort(_("bookmark name required"))

    if action in {'add', 'delete', 'rename', 'inactive'}:

    elif action == 'active':
        book = repo._activebookmark
        if book is None:
            return 1
        ui.write("%s\n" % book, label=bookmarks.activebookmarklabel)
    else: # show bookmarks
        with ui.formatter('bookmarks', opts) as fm:
            bookmarks.printbookmarks(ui, repo, fm)

@command('branch',
    [('f', 'force', None,
     _('set branch name even if it shadows an existing branch')),
     ('C', 'clean', None, _('reset branch name to parent branch name')),

39769:b05b4b91de3d

    [('f', 'force', False, _('force')),
    ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
    ('d', 'delete', False, _('delete a given bookmark')),
    ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
    ('i', 'inactive', False, _('mark a bookmark inactive')),
    ('l', 'list', False, _('list existing bookmarks')),
    ('', 'active', False, _('display the active bookmark')),
    ] + formatteropts,
    _('hg bookmarks [OPTIONS]... [NAME]...'))
def bookmark(ui, repo, *names, **opts):
    '''create a new bookmark or list existing bookmarks

    Bookmarks can be pushed and pulled between repositories (see
    :hg:`help push` and :hg:`help pull`). If a shared bookmark has
    diverged, a new 'divergent bookmark' of the form 'name@path' will
    be created. Using :hg:`merge` will resolve the divergence.

    Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
    the active bookmark's name.

    A bookmark named '@' has the special property that :hg:`clone` will
    check it out by default if it exists.

    opts = pycompat.byteskwargs(opts)
    force = opts.get('force')
    rev = opts.get('rev')
    inactive = opts.get('inactive')  # meaning add/rename to inactive bookmark

    selactions = [k for k in ['delete', 'rename', 'active', 'list']
                  if opts.get(k)]
    if len(selactions) > 1:
        raise error.Abort(_('--%s and --%s are incompatible')
                          % tuple(selactions[:2]))
    if selactions:
        action = selactions[0]
    elif names or rev:
        action = 'add'
    elif inactive:
        action = 'inactive'  # meaning deactivate
    else:
        action = 'list'

    if rev and action in {'delete', 'rename', 'active', 'list'}:
        raise error.Abort(_("--rev is incompatible with --%s") % action)
    if names and action == 'active':
        raise error.Abort(_("NAMES is incompatible with --active"))
    if inactive and action in {'delete', 'active', 'list'}:
        raise error.Abort(_("--inactive is incompatible with --%s") % action)
    if not names and action in {'add', 'delete'}:
        raise error.Abort(_("bookmark name required"))

    if action in {'add', 'delete', 'rename', 'inactive'}:

    elif action == 'active':
        book = repo._activebookmark
        if book is None:
            return 1
        ui.write("%s\n" % book, label=bookmarks.activebookmarklabel)
    elif action == 'list':
        names = pycompat.maplist(repo._bookmarks.expandname, names)
        with ui.formatter('bookmarks', opts) as fm:
            bookmarks.printbookmarks(ui, repo, fm, names)
    else:
        raise error.ProgrammingError('invalid action: %s' % action)

@command('branch',
    [('f', 'force', None,
     _('set branch name even if it shadows an existing branch')),
     ('C', 'clean', None, _('reset branch name to parent branch name')),