comparison hgext/absorb.py @ 42266:b3fc78c028ef

absorb: be more specific when erroring out on merge commit

When you have a merge commit checked out and run `hg absorb`, it would
tell you

  abort: no mutable changeset to change

That makes it sound like the problem is public commits when isn't
really. Let's be more specific in this case.

There was already a test case that test this, so that now prints the
new message. I added a new test case that shows the old message (when
a public commit is checked out).

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

42265:65f3a77223e0

    if stack is None, the current draft stack will be used.
    return fixupstate.
    """
    if stack is None:
        limit = ui.configint('absorb', 'max-stack-size')
        stack = getdraftstack(repo['.'], limit)
        if limit and len(stack) >= limit:
            ui.warn(_('absorb: only the recent %d changesets will '
                      'be analysed\n')
                    % limit)
    if not stack:

42266:b3fc78c028ef

    if stack is None, the current draft stack will be used.
    return fixupstate.
    """
    if stack is None:
        limit = ui.configint('absorb', 'max-stack-size')
        headctx = repo['.']
        if len(headctx.parents()) > 1:
            raise error.Abort(_('cannot absorb into a merge'))
        stack = getdraftstack(headctx, limit)
        if limit and len(stack) >= limit:
            ui.warn(_('absorb: only the recent %d changesets will '
                      'be analysed\n')
                    % limit)
    if not stack: