mercurial/destutil.py

28136:5853878bbc2a

    return rev, movemark, activemark

msgdestmerge = {
    # too many matching divergent bookmark
    'toomanybookmarks':
        (_("multiple matching bookmarks to merge -"
           " please merge with an explicit rev or bookmark"),
         _("run 'hg heads' to see all heads")),
    # no other matching divergent bookmark
    'nootherbookmarks':
        (_("no matching bookmark to merge - "
           "please merge with an explicit rev or bookmark"),
         _("run 'hg heads' to see all heads")),
    # branch have too many unbookmarked heads, no obvious destination
    'toomanyheads':
        (_("branch '%s' has %d heads - please merge with an explicit rev"),
         _("run 'hg heads .' to see heads")),
    # branch have no other unbookmarked heads
    'bookmarkedheads':
        (_("heads are bookmarked - please merge with an explicit rev"),
         _("run 'hg heads' to see all heads")),
    # branch have just a single heads, but there is other branches
    'nootherbranchheads':
        (_("branch '%s' has one head - please merge with an explicit rev"),
         _("run 'hg heads' to see all heads")),
    # repository have a single head
    'nootherheads':
        (_('nothing to merge'),
         None),
    # repository have a single head and we are not on it
    'nootherheadsbehind':
        (_('nothing to merge'),
         _("use 'hg update' instead")),
    # We are not on a head
    'notatheads':
        (_('working directory not at a head revision'),
         _("use 'hg update' or merge with an explicit revision"))
        }

def _destmergebook(repo):
    """find merge destination in the active bookmark case"""
    node = None
    bmheads = repo.bookmarkheads(repo._activebookmark)
    curhead = repo[repo._activebookmark].node()
    if len(bmheads) == 2:
        if curhead == bmheads[0]:
            node = bmheads[1]
        else:
            node = bmheads[0]
    elif len(bmheads) > 2:
        msg, hint = msgdestmerge['toomanybookmarks']
        raise error.Abort(msg, hint=hint)
    elif len(bmheads) <= 1:
        msg, hint = msgdestmerge['nootherbookmarks']
        raise error.Abort(msg, hint=hint)
    assert node is not None
    return node

def _destmergebranch(repo):
    """find merge destination based on branch heads"""
    node = None
    parent = repo.dirstate.p1()
    branch = repo.dirstate.branch()
    bheads = repo.branchheads(branch)

    if parent not in bheads:
        # Case A: working copy if not on a head.
        #
        # This is probably a user mistake We bailout pointing at 'hg update'
        if len(repo.heads()) <= 1:
            msg, hint = msgdestmerge['nootherheadsbehind']
        else:
            msg, hint = msgdestmerge['notatheads']
        raise error.Abort(msg, hint=hint)
    elif len(nbhs) > 2:
        # Case B: There is more than 2 anonymous heads
        #
        # This means that there will be more than 1 candidate. This is
        # ambiguous. We abort asking the user to pick as explicit destination
        # instead.
        msg, hint = msgdestmerge['toomanyheads']
        msg %= (branch, len(bheads))
        raise error.Abort(msg, hint=hint)
    elif len(nbhs) <= 1:
        # Case B: There is no other anonymous head that the one we are one
        #
        # This means that there is no natural candidate to merge with.
        # We abort, with various messages for various cases.
        if len(bheads) > 1:
            msg, hint = msgdestmerge['bookmarkedheads']
        elif len(repo.heads()) > 1:
            msg, hint = msgdestmerge['nootherbranchheads']
            msg %= branch
        else:
            msg, hint = msgdestmerge['nootherheads']
        raise error.Abort(msg, hint=hint)
    elif parent == nbhs[0]:
        node = nbhs[-1]
    else:
        node = nbhs[0]
    assert node is not None
    return node

def destmerge(repo):
    if repo._activebookmark:
        node = _destmergebook(repo)
    else:
        node = _destmergebranch(repo)
    return repo[node].rev()

histeditdefaultrevset = 'reverse(only(.) and not public() and not ::merge())'

def desthistedit(ui, repo):

28137:b54c0246295b

    return rev, movemark, activemark

msgdestmerge = {
    # too many matching divergent bookmark
    'toomanybookmarks':
        {'merge':
            (_("multiple matching bookmarks to merge -"
               " please merge with an explicit rev or bookmark"),
             _("run 'hg heads' to see all heads")),
        },
    # no other matching divergent bookmark
    'nootherbookmarks':
        {'merge':
            (_("no matching bookmark to merge - "
               "please merge with an explicit rev or bookmark"),
             _("run 'hg heads' to see all heads")),
        },
    # branch have too many unbookmarked heads, no obvious destination
    'toomanyheads':
        {'merge':
            (_("branch '%s' has %d heads - please merge with an explicit rev"),
             _("run 'hg heads .' to see heads")),
        },
    # branch have no other unbookmarked heads
    'bookmarkedheads':
        {'merge':
            (_("heads are bookmarked - please merge with an explicit rev"),
             _("run 'hg heads' to see all heads")),
        },
    # branch have just a single heads, but there is other branches
    'nootherbranchheads':
        {'merge':
            (_("branch '%s' has one head - please merge with an explicit rev"),
             _("run 'hg heads' to see all heads")),
        },
    # repository have a single head
    'nootherheads':
            {'merge':
                (_('nothing to merge'),
         None),
        },
    # repository have a single head and we are not on it
    'nootherheadsbehind':
        {'merge':
            (_('nothing to merge'),
             _("use 'hg update' instead")),
        },
    # We are not on a head
    'notatheads':
        {'merge':
            (_('working directory not at a head revision'),
             _("use 'hg update' or merge with an explicit revision"))
        },
    }

def _destmergebook(repo, action='merge'):
    """find merge destination in the active bookmark case"""
    node = None
    bmheads = repo.bookmarkheads(repo._activebookmark)
    curhead = repo[repo._activebookmark].node()
    if len(bmheads) == 2:
        if curhead == bmheads[0]:
            node = bmheads[1]
        else:
            node = bmheads[0]
    elif len(bmheads) > 2:
        msg, hint = msgdestmerge['toomanybookmarks'][action]
        raise error.Abort(msg, hint=hint)
    elif len(bmheads) <= 1:
        msg, hint = msgdestmerge['nootherbookmarks'][action]
        raise error.Abort(msg, hint=hint)
    assert node is not None
    return node

def _destmergebranch(repo, action='merge'):
    """find merge destination based on branch heads"""
    node = None
    parent = repo.dirstate.p1()
    branch = repo.dirstate.branch()
    bheads = repo.branchheads(branch)

    if parent not in bheads:
        # Case A: working copy if not on a head.
        #
        # This is probably a user mistake We bailout pointing at 'hg update'
        if len(repo.heads()) <= 1:
            msg, hint = msgdestmerge['nootherheadsbehind'][action]
        else:
            msg, hint = msgdestmerge['notatheads'][action]
        raise error.Abort(msg, hint=hint)
    elif len(nbhs) > 2:
        # Case B: There is more than 2 anonymous heads
        #
        # This means that there will be more than 1 candidate. This is
        # ambiguous. We abort asking the user to pick as explicit destination
        # instead.
        msg, hint = msgdestmerge['toomanyheads'][action]
        msg %= (branch, len(bheads))
        raise error.Abort(msg, hint=hint)
    elif len(nbhs) <= 1:
        # Case B: There is no other anonymous head that the one we are one
        #
        # This means that there is no natural candidate to merge with.
        # We abort, with various messages for various cases.
        if len(bheads) > 1:
            msg, hint = msgdestmerge['bookmarkedheads'][action]
        elif len(repo.heads()) > 1:
            msg, hint = msgdestmerge['nootherbranchheads'][action]
            msg %= branch
        else:
            msg, hint = msgdestmerge['nootherheads'][action]
        raise error.Abort(msg, hint=hint)
    elif parent == nbhs[0]:
        node = nbhs[-1]
    else:
        node = nbhs[0]
    assert node is not None
    return node

def destmerge(repo, action='merge'):
    """return the default destination for a merge

    (or raise exception about why it can't pick one)

    :action: the action being performed, controls emitted error message
    """
    if repo._activebookmark:
        node = _destmergebook(repo, action=action)
    else:
        node = _destmergebranch(repo, action=action)
    return repo[node].rev()

histeditdefaultrevset = 'reverse(only(.) and not public() and not ::merge())'

def desthistedit(ui, repo):