comparison mercurial/discovery.py @ 42238:5997eabc7b85

push: added clear warning message when pushing closed branches(issue6080)

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

42237:8d14d91584f1

    else:
        headssum = _oldheadssummary(repo, remoteheads, outgoing, inc)
    pushop.pushbranchmap = headssum
    newbranches = [branch for branch, heads in headssum.iteritems()
                   if heads[0] is None]
    # 1. Check for new branches on the remote.
    if newbranches and not newbranch:  # new branch requires --new-branch
        branchnames = ', '.join(sorted(newbranches))
        raise error.Abort(_("push creates new remote branches: %s!")
                           % branchnames,
                         hint=_("use 'hg push --new-branch' to create"
                                " new remote branches"))

    # 2. Find heads that we need not warn about
    nowarnheads = _nowarnheads(pushop)

    # 3. Check for new heads.

42238:5997eabc7b85

    else:
        headssum = _oldheadssummary(repo, remoteheads, outgoing, inc)
    pushop.pushbranchmap = headssum
    newbranches = [branch for branch, heads in headssum.iteritems()
                   if heads[0] is None]
    # Makes a set of closed branches
    closedbranches = set()
    for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
        if isclosed:
            closedbranches.add(tag)
    closedbranches = (closedbranches & set(newbranches))
    # 1. Check for new branches on the remote.
    if newbranches and not newbranch:  # new branch requires --new-branch
        branchnames = ', '.join(sorted(newbranches))
        if closedbranches:
            errmsg = (_("push creates new remote branches: %s (%d closed)!")
                        % (branchnames, len(closedbranches)))
        else:
            errmsg = (_("push creates new remote branches: %s!")% branchnames)
        hint=_("use 'hg push --new-branch' to create new remote branches")
        raise error.Abort(errmsg, hint=hint)

    # 2. Find heads that we need not warn about
    nowarnheads = _nowarnheads(pushop)

    # 3. Check for new heads.