comparison mercurial/commands.py @ 15240:bfb93963bb39

graft: add user, date, and tool options

15239:f5d9d0d0f588

            ui.status(_('removing %s\n') % m.rel(f))

    repo[None].forget(forget)
    return errs

@command('graft',
    [('e', 'edit', False, _('invoke editor on commit messages'))],
    _('[OPTION]... REVISION...'))
def graft(ui, repo, rev, *revs, **opts):
    '''copy changes from other branches onto the current branch

    This command uses Mercurial's merge logic to copy individual

    Returns 0 on successful completion.
    '''

    cmdutil.bailifchanged(repo)

    editor = None
    if opts.get('edit'):
        editor = cmdutil.commitforceeditor

    for ctx in repo.set("%ld", revs):
        current = repo['.']
        ui.debug('grafting revision %s', ctx.rev())
        # perform the graft merge with p1(rev) as 'ancestor'
        stats = mergemod.update(repo, ctx.node(), True, True, False,
                             ctx.p1().node())
        # drop the second merge parent
        repo.dirstate.setparents(current.node(), nullid)
        repo.dirstate.write()
        # fix up dirstate for copies and renames
        cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)

        if stats and stats[3] > 0:
            raise util.Abort(_("unresolved conflicts, can't continue"),
                             hint=_('use hg resolve and hg graft --continue'))
        # commit
        extra = {'source': ctx.hex()}
        repo.commit(text=ctx.description(), user=ctx.user(),
                    date=ctx.date(), extra=extra, editor=editor)

    return 0

@command('grep',
    [('0', 'print0', None, _('end fields with NUL')),

15240:bfb93963bb39

            ui.status(_('removing %s\n') % m.rel(f))

    repo[None].forget(forget)
    return errs

@command(
    'graft',
    [('e', 'edit', False, _('invoke editor on commit messages')),
    ('D', 'currentdate', False,
     _('record the current date as commit date')),
    ('U', 'currentuser', False,
     _('record the current user as committer'), _('DATE'))]
    + commitopts2 + mergetoolopts,
    _('[OPTION]... REVISION...'))
def graft(ui, repo, rev, *revs, **opts):
    '''copy changes from other branches onto the current branch

    This command uses Mercurial's merge logic to copy individual

    Returns 0 on successful completion.
    '''

    cmdutil.bailifchanged(repo)

    if not opts.get('user') and opts.get('currentuser'):
        opts['user'] = ui.username()
    if not opts.get('date') and opts.get('currentdate'):
        opts['date'] = "%d %d" % util.makedate()

    editor = None
    if opts.get('edit'):
        editor = cmdutil.commitforceeditor

    for ctx in repo.set("%ld", revs):
        current = repo['.']
        ui.debug('grafting revision %s', ctx.rev())
        # perform the graft merge with p1(rev) as 'ancestor'
        try:
            # ui.forcemerge is an internal variable, do not document
            repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
            stats = mergemod.update(repo, ctx.node(), True, True, False,
                                    ctx.p1().node())
        finally:
            ui.setconfig('ui', 'forcemerge', '')
        # drop the second merge parent
        repo.dirstate.setparents(current.node(), nullid)
        repo.dirstate.write()
        # fix up dirstate for copies and renames
        cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)

        if stats and stats[3] > 0:
            raise util.Abort(_("unresolved conflicts, can't continue"),
                             hint=_('use hg resolve and hg graft --continue'))
        # commit
        extra = {'source': ctx.hex()}
        user = ctx.user()
        if opts.get('user'):
            user = opts['user']
        date = ctx.date()
        if opts.get('date'):
            date = opts['date']
        repo.commit(text=ctx.description(), user=user,
                    date=date, extra=extra, editor=editor)

    return 0

@command('grep',
    [('0', 'print0', None, _('end fields with NUL')),