comparison mercurial/commands.py @ 38280:2ec44160165d

graft: add a new `--stop` flag to stop interrupted graft

This patch adds a new flag `--stop` to `hg graft` command which stops the
interrupted graft.

The `--stop` flag takes back you to the last successful step i.e. it will keep
your grafted commits, it will just clear the mergestate and interrupted graft
state.

The `--stop` is different from `--abort` flag as the latter also undoes all the
work done till now which is sometimes not what the user wants.

Suppose you grafted a lot of changesets, you encountered conflicts, you resolved
them, did `hg graft --continue`, again encountered conflicts, continue, again
encountered conflicts. Now you are tired of solving merge conflicts and want to
resume this sometimes later. If you use the `--abort` functionality, it will
strip your already grafted changesets, making you loose the work you have done
resolving merge conflicts.

A general goal related to this flag is to add this flag to `rebase` and
`histedit` too. The evolve command already has this --stop flag.

Tests are added for the new flag.

.. feature::

   `hg graft` now has a `--stop` flag to stop interrupted graft.

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

38279:a8e7ea176437

@command(
    'graft',
    [('r', 'rev', [], _('revisions to graft'), _('REV')),
     ('c', 'continue', False, _('resume interrupted graft')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ('', 'log', None, _('append graft info to log message')),
     ('f', 'force', False, _('force graft')),
     ('D', 'currentdate', False,
      _('record the current date as commit date')),

    editor = cmdutil.getcommiteditor(editform='graft',
                                     **pycompat.strkwargs(opts))

    cont = False
    graftstate = statemod.cmdstate(repo, 'graftstate')
    if opts.get('continue'):
        cont = True
        if revs:
            raise error.Abort(_("can't specify --continue and revisions"))
        # read in unfinished revisions

    try:
        return graftstate.read()
    except error.CorruptedState:
        nodes = repo.vfs.read('graftstate').splitlines()
        return {'nodes': nodes}

@command('grep',
    [('0', 'print0', None, _('end fields with NUL')),
    ('', 'all', None, _('print all revisions that match')),
    ('a', 'text', None, _('treat all files as text')),

38280:2ec44160165d

@command(
    'graft',
    [('r', 'rev', [], _('revisions to graft'), _('REV')),
     ('c', 'continue', False, _('resume interrupted graft')),
     ('', 'stop', False, _('stop interrupted graft')),
     ('e', 'edit', False, _('invoke editor on commit messages')),
     ('', 'log', None, _('append graft info to log message')),
     ('f', 'force', False, _('force graft')),
     ('D', 'currentdate', False,
      _('record the current date as commit date')),

    editor = cmdutil.getcommiteditor(editform='graft',
                                     **pycompat.strkwargs(opts))

    cont = False
    graftstate = statemod.cmdstate(repo, 'graftstate')
    if opts.get('stop'):
        if opts.get('continue'):
            raise error.Abort(_("cannot use '--continue' and "
                                "'--stop' together"))
        if any((opts.get('edit'), opts.get('log'), opts.get('user'),
                opts.get('date'), opts.get('currentdate'),
                opts.get('currentuser'), opts.get('rev'))):
            raise error.Abort(_("cannot specify any other flag with '--stop'"))
        return _stopgraft(ui, repo, graftstate)
    if opts.get('continue'):
        cont = True
        if revs:
            raise error.Abort(_("can't specify --continue and revisions"))
        # read in unfinished revisions

    try:
        return graftstate.read()
    except error.CorruptedState:
        nodes = repo.vfs.read('graftstate').splitlines()
        return {'nodes': nodes}

def _stopgraft(ui, repo, graftstate):
    """stop the interrupted graft"""
    if not graftstate.exists():
        raise error.Abort(_("no interrupted graft found"))
    pctx = repo['.']
    hg.updaterepo(repo, pctx.node(), True)
    graftstate.delete()
    ui.status(_("stopped the interrupted graft\n"))
    ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
    return 0

@command('grep',
    [('0', 'print0', None, _('end fields with NUL')),
    ('', 'all', None, _('print all revisions that match')),
    ('a', 'text', None, _('treat all files as text')),