mercurial/commands.py

38237:66fc2ef8dbff

            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:

            date = opts['date']
            statedata['date'] = date
        message = ctx.description()
        if opts.get('log'):
            message += '\n(grafted from %s)' % ctx.hex()

        # we don't merge the first commit when continuing
        if not cont:
            # perform the graft merge with p1(rev) as 'ancestor'
            try:

                # write out state for --continue
                nodes = [repo[rev].hex() for rev in revs[pos:]]
                statedata['nodes'] = nodes
                stateversion = 1
                graftstate.save(stateversion, statedata)
                extra = ''
                if opts.get('log'):
                    extra += ' --log'
                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),
                    hint=hint)
        else:
            cont = False

38238:2b8c8b8d1a06

            statedata = _readgraftstate(repo, graftstate)
            if statedata.get('date'):
                opts['date'] = statedata['date']
            if statedata.get('user'):
                opts['user'] = statedata['user']
            if statedata.get('log'):
                opts['log'] = True
            nodes = statedata['nodes']
            revs = [repo[node].rev() for node in nodes]
        else:
            cmdutil.wrongtooltocontinue(repo, _('graft'))
    else:

            date = opts['date']
            statedata['date'] = date
        message = ctx.description()
        if opts.get('log'):
            message += '\n(grafted from %s)' % ctx.hex()
            statedata['log'] = True

        # we don't merge the first commit when continuing
        if not cont:
            # perform the graft merge with p1(rev) as 'ancestor'
            try:

                # write out state for --continue
                nodes = [repo[rev].hex() for rev in revs[pos:]]
                statedata['nodes'] = nodes
                stateversion = 1
                graftstate.save(stateversion, statedata)
                hint = _("use 'hg resolve' and 'hg graft --continue'")
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),
                    hint=hint)
        else:
            cont = False