comparison hgext/histedit.py @ 19847:45c3086880c7 stable

histedit: suggest "histedit --abort" for inconsistent histedit state

Mercurial earlier than 2.7 allows users to do anything other than
starting new histedit, even though current histedit is not finished or
aborted yet. So, unfinished (and maybe inconsistent now) histedit
states may be left and forgotten in repositories.

Before this patch, histedit extension shows the message below, when it
detects such inconsistent state:

   abort: REV is not an ancestor of working directory
   (update to REV or descendant and run "hg histedit --continue" again)

But this message is incorrect, unless old Mercurial is re-installed,
because Mercurial 2.7 or later disallows users to update the working
directory to another revision.

This patch changes the hint message to suggest "hg histedit --abort".

19846:9789670992d6

    if parentctx.node() != node.nullid:
        if not newchildren:
            # `parentctxnode` should match but no result. This means that
            # currentnode is not a descendant from parentctxnode.
            msg = _('%s is not an ancestor of working directory')
            hint = _('update to %s or descendant and run "hg histedit '
                     '--continue" again') % parentctx
            raise util.Abort(msg % parentctx, hint=hint)
        newchildren.pop(0)  # remove parentctxnode
    # Commit dirty working directory if necessary
    new = None
    m, a, r, d = repo.status()[:4]

19847:45c3086880c7

    if parentctx.node() != node.nullid:
        if not newchildren:
            # `parentctxnode` should match but no result. This means that
            # currentnode is not a descendant from parentctxnode.
            msg = _('%s is not an ancestor of working directory')
            hint = _('use "histedit --abort" to clear broken state')
            raise util.Abort(msg % parentctx, hint=hint)
        newchildren.pop(0)  # remove parentctxnode
    # Commit dirty working directory if necessary
    new = None
    m, a, r, d = repo.status()[:4]