comparison mercurial/commands.py @ 16389:79fecd735d26

graft: add --dry-run support (issue3362)

16388:e03d8a40521f

     ('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, *revs, **opts):
    '''copy changes from other branches onto the current branch

    This command uses Mercurial's merge logic to copy individual

    if not revs:
        return -1

    for pos, ctx in enumerate(repo.set("%ld", revs)):
        current = repo['.']
        ui.status(_('grafting revision %s\n') % ctx.rev())

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

            date = opts['date']
        repo.commit(text=ctx.description(), user=user,
                    date=date, extra=extra, editor=editor)

    # remove state when we complete successfully
    if os.path.exists(repo.join('graftstate')):
        util.unlinkpath(repo.join('graftstate'))

    return 0

@command('grep',

16389:79fecd735d26

     ('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  + dryrunopts,
    _('[OPTION]... REVISION...'))
def graft(ui, repo, *revs, **opts):
    '''copy changes from other branches onto the current branch

    This command uses Mercurial's merge logic to copy individual

    if not revs:
        return -1

    for pos, ctx in enumerate(repo.set("%ld", revs)):
        current = repo['.']

        ui.status(_('grafting revision %s\n') % ctx.rev())
        if opts.get('dry_run'):
            continue

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

            date = opts['date']
        repo.commit(text=ctx.description(), user=user,
                    date=date, extra=extra, editor=editor)

    # remove state when we complete successfully
    if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
        util.unlinkpath(repo.join('graftstate'))

    return 0

@command('grep',