mercurial/discovery.py

16834:cafd8a8fb713

    # 5. Check for new heads.
    # If there are more heads after the push than before, a suitable
    # error message, depending on unsynced status, is displayed.
    error = None
    for branch in branches:
        newhs = set(newmap[branch])
        oldhs = set(oldmap[branch])
        if len(newhs) > len(oldhs):
            dhs = list(newhs - oldhs)
            if error is None:
                if branch not in ('default', None):
                    error = _("push creates new remote head %s "
                              "on branch '%s'!") % (short(dhs[0]), branch)
                else:

16835:4267c840c481

    # 5. Check for new heads.
    # If there are more heads after the push than before, a suitable
    # error message, depending on unsynced status, is displayed.
    error = None
    remotebookmarks = remote.listkeys('bookmarks')
    localbookmarks = repo._bookmarks

    for branch in branches:
        newhs = set(newmap[branch])
        oldhs = set(oldmap[branch])
        dhs = None
        if len(newhs) > len(oldhs):
            # strip updates to existing remote heads from the new heads list
            bookmarkedheads = set([repo[bm].node() for bm in localbookmarks
                                   if bm in remotebookmarks and
                                   remote[bm] == repo[bm].ancestor(remote[bm])])
            dhs = list(newhs - bookmarkedheads - oldhs)
        if dhs:
            if error is None:
                if branch not in ('default', None):
                    error = _("push creates new remote head %s "
                              "on branch '%s'!") % (short(dhs[0]), branch)
                else: