comparison mercurial/commands.py @ 35745:3bd8ab4c80a5

branch: add a --rev flag to change branch name of given revisions

This patch adds a new --rev flag to hg branch which can be used to change branch
of revisions. This is motivated from topic extension where you can change topic
on revisions but this one has few restrictions which are:

1) You cannot change branch name in between the stack
2) You cannot change branch name and set it to an existing name
3) You cannot change branch of non-linear set of commits
4) You cannot change branch of merge commits.

Tests are added for the same.

.. feature::

   An experimental flag `--rev` to `hg branch` which can be used to change
   branch of changesets.

Differential Revision: https://phab.mercurial-scm.org/D1074

35744:8685192a8733

        bookmarks.printbookmarks(ui, repo, **opts)

@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'))],
    _('[-fC] [NAME]'))
def branch(ui, repo, label=None, **opts):
    """set or show the current branch name

    .. note::

    considered closed.

    Returns 0 on success.
    """
    opts = pycompat.byteskwargs(opts)
    if label:
        label = label.strip()

    if not opts.get('clean') and not label:
        ui.write("%s\n" % repo.dirstate.branch())
        return

    with repo.wlock():
        if opts.get('clean'):
            label = repo[None].p1().branch()
            repo.dirstate.setbranch(label)
            ui.status(_('reset working directory to branch %s\n') % label)
        elif label:
            if not opts.get('force') and label in repo.branchmap():
                if label not in [p.branch() for p in repo[None].parents()]:
                    raise error.Abort(_('a branch of the same name already'
                                       ' exists'),
                                     # i18n: "it" refers to an existing branch
                                     hint=_("use 'hg update' to switch to it"))
            scmutil.checknewlabel(repo, label, 'branch')
            repo.dirstate.setbranch(label)
            ui.status(_('marked working directory as branch %s\n') % label)

            # find any open named branches aside from default
            others = [n for n, h, t, c in repo.branchmap().iterbranches()

35745:3bd8ab4c80a5

        bookmarks.printbookmarks(ui, repo, **opts)

@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')),
     ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
    ],
    _('[-fC] [NAME]'))
def branch(ui, repo, label=None, **opts):
    """set or show the current branch name

    .. note::

    considered closed.

    Returns 0 on success.
    """
    opts = pycompat.byteskwargs(opts)
    revs = opts.get('rev')
    if label:
        label = label.strip()

    if not opts.get('clean') and not label:
        if revs:
            raise error.Abort(_("no branch name specified for the revisions"))
        ui.write("%s\n" % repo.dirstate.branch())
        return

    with repo.wlock():
        if opts.get('clean'):
            label = repo[None].p1().branch()
            repo.dirstate.setbranch(label)
            ui.status(_('reset working directory to branch %s\n') % label)
        elif label:

            scmutil.checknewlabel(repo, label, 'branch')
            if revs:
                # XXX: we should allow setting name to existing branch if the
                # branch of root of the revs is same as the new branch name
                if label in repo.branchmap():
                    raise error.Abort(_('a branch of the same'
                                        ' name already exists'))
                return cmdutil.changebranch(ui, repo, revs, label)

            if not opts.get('force') and label in repo.branchmap():
                if label not in [p.branch() for p in repo[None].parents()]:
                    raise error.Abort(_('a branch of the same name already'
                                       ' exists'),
                                     # i18n: "it" refers to an existing branch
                                     hint=_("use 'hg update' to switch to it"))

            repo.dirstate.setbranch(label)
            ui.status(_('marked working directory as branch %s\n') % label)

            # find any open named branches aside from default
            others = [n for n, h, t, c in repo.branchmap().iterbranches()