comparison mercurial/commands.py @ 8796:2bcef677a6c3

localrepo: remove 'closed' argument to heads(...) function

- repository heads are not associated with the closed attribute, so
remove it making the code in line with the concept.
- Fix functions that were calling heads with the parameter.
- Adjust webcommands.branches to include the concept of inactive
as well as open and closed branches
- Fix code and docstrings in commands to make the correct use of
closed branches & branch heads clearer
- Improve grammar of 'hg heads' help text (2nd submission)

this does not alter the cli for hg branches, that work is
still to be done

8795:51c29aec0b75

    Use the command 'hg update' to switch to an existing branch.
    """
    hexfunc = ui.debugflag and hex or short
    activebranches = [encoding.tolocal(repo[n].branch())
                            for n in repo.heads(closed=False)]
    branches = sorted([(tag in activebranches, repo.changelog.rev(node), tag)
                          for tag, node in repo.branchtags().items()],
                      reverse=True)

    for isactive, node, tag in branches:
        if (not active) or isactive:

def heads(ui, repo, *branchrevs, **opts):
    """show current repository heads or show branch heads

    With no arguments, show all repository head changesets.

    If branch names or revisions are given this will show the heads of
    the specified branches or the branches those revisions are tagged
    with.

    Repository "heads" are changesets that don't have child
    changesets. They are where development generally takes place and
    are the usual targets for update and merge operations.

    Branch heads are changesets that have a given branch tag, but have
    no child changesets with that tag. They are usually where
    development on a given branch takes place.
    """
    if opts.get('rev'):
        start = repo.lookup(opts['rev'])
    else:
        start = None
    closed = opts.get('closed')
    hideinactive, _heads = opts.get('active'), None
    if not branchrevs:
        # Assume we're looking repo-wide heads if no revs were specified.
        heads = repo.heads(start, closed=closed)
    else:
        if hideinactive:
            _heads = repo.heads(start, closed=closed)
        heads = []
        visitedset = set()
        for branchrev in branchrevs:
            branch = repo[branchrev].branch()
            if branch in visitedset:
                continue
            visitedset.add(branch)
            bheads = repo.branchheads(branch, start, closed=closed)
            if not bheads:
                if branch != branchrev:
                    ui.warn(_("no changes on branch %s containing %s are "
                              "reachable from %s\n")
                            % (branch, branchrev, opts.get('rev')))
                else:
                    ui.warn(_("no changes on branch %s are reachable from %s\n")

          ('a', 'active', False,
           _('show only the active heads from open branches')),
          ('c', 'closed', False,
           _('show normal and closed heads')),
         ] + templateopts,
         _('[-r REV] [REV]...')),
    "help": (help_, [], _('[TOPIC]')),
    "identify|id":
        (identify,
         [('r', 'rev', '', _('identify the specified revision')),
          ('n', 'num', None, _('show local revision number')),

8796:2bcef677a6c3

    Use the command 'hg update' to switch to an existing branch.
    """
    hexfunc = ui.debugflag and hex or short
    activebranches = [encoding.tolocal(repo[n].branch())
                            for n in repo.heads()]
    def testactive(tag, node):
        realhead = tag in activebranches
        open = node in repo.branchheads(tag, closed=False)
        return realhead and open
    branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
                          for tag, node in repo.branchtags().items()],
                      reverse=True)

    for isactive, node, tag in branches:
        if (not active) or isactive:

def heads(ui, repo, *branchrevs, **opts):
    """show current repository heads or show branch heads

    With no arguments, show all repository head changesets.

    Repository "heads" are changesets that don't have child
    changesets. They are where development generally takes place and
    are the usual targets for update and merge operations.

    If one or more REV is given, the "branch heads" will be shown for
    the named branch associated with that revision. The name of the
    branch is called the revision's branch tag.

    Branch heads are revisions on a given named branch that do not have
    any children on the same branch. A branch head could be a true head
    or it could be the last changeset on a branch before a new branch
    was created. If none of the branch heads are true heads, the branch
    is considered inactive.

    If STARTREV is specified only those heads (or branch heads) that
    are descendants of STARTREV will be displayed.
    """
    if opts.get('rev'):
        start = repo.lookup(opts['rev'])
    else:
        start = None
    closed = opts.get('closed')
    hideinactive, _heads = opts.get('active'), None
    if not branchrevs:
        # Assume we're looking repo-wide heads if no revs were specified.
        heads = repo.heads(start)
    else:
        if hideinactive:
            _heads = repo.heads(start)
        heads = []
        visitedset = set()
        for branchrev in branchrevs:
            branch = repo[branchrev].branch()
            if branch in visitedset:
                continue
            visitedset.add(branch)
            bheads = repo.branchheads(branch, start, closed=closed)
            if not bheads:
                if not opts.get('rev'):
                    ui.warn(_("no open branch heads on branch %s\n") % branch)
                elif branch != branchrev:
                    ui.warn(_("no changes on branch %s containing %s are "
                              "reachable from %s\n")
                            % (branch, branchrev, opts.get('rev')))
                else:
                    ui.warn(_("no changes on branch %s are reachable from %s\n")

          ('a', 'active', False,
           _('show only the active heads from open branches')),
          ('c', 'closed', False,
           _('show normal and closed heads')),
         ] + templateopts,
         _('[-r STARTREV] [REV]...')),
    "help": (help_, [], _('[TOPIC]')),
    "identify|id":
        (identify,
         [('r', 'rev', '', _('identify the specified revision')),
          ('n', 'num', None, _('show local revision number')),