comparison mercurial/commands.py @ 38154:decdb587ea12

graft: reuse --user and --date values in `hg graft --continue` (BC)

Reading the user and date information from graftstate during `hg graft
--continue` will help us in preserving the user and date arguments passed when
`hg graft` was called. This patch reads that information and reuses that while
running `hg graft --continue`. So after this patch, --user and --date values are
preserved even if conflicts occur and user don't need to pass them again.

The test changes demonstrate the fix.

This is a backward incompatible change but I think of this more as a bug fix.
Also thinking about removing the line from `hg help graft` which says --continue
does not reapply other flags but need to check what are the other flags which
needs to be preserved.

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

38153:108ebd8eff5c

        cont = True
        if revs:
            raise error.Abort(_("can't specify --continue and revisions"))
        # read in unfinished revisions
        if graftstate.exists():
            nodes = _readgraftstate(repo, graftstate)['nodes']
            revs = [repo[node].rev() for node in nodes]
        else:
            cmdutil.wrongtooltocontinue(repo, _('graft'))
    else:
        if not revs:

38154:decdb587ea12

        cont = True
        if revs:
            raise error.Abort(_("can't specify --continue and revisions"))
        # read in unfinished revisions
        if graftstate.exists():
            statedata = _readgraftstate(repo, graftstate)
            if statedata.get('date'):
                opts['date'] = statedata['date']
            if statedata.get('user'):
                opts['user'] = statedata['user']
            nodes = statedata['nodes']
            revs = [repo[node].rev() for node in nodes]
        else:
            cmdutil.wrongtooltocontinue(repo, _('graft'))
    else:
        if not revs: