Mercurial > hg
changeset 15219:9d58569a8b92
rebase: add --edit switch
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 10 Oct 2011 23:01:25 -0500 |
| parents | c81dce8a7bb6 |
| children | f7db54b832af |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Oct 10 17:57:40 2011 -0500 +++ b/hgext/rebase.py Mon Oct 10 23:01:25 2011 -0500 @@ -39,6 +39,7 @@ ('', 'collapse', False, _('collapse the rebased changesets')), ('m', 'message', '', _('use text as collapse commit message'), _('TEXT')), + ('e', 'edit', False, _('invoke editor on commit messages')), ('l', 'logfile', '', _('read collapse commit message from file'), _('FILE')), ('', 'keep', False, _('keep original changesets')), @@ -105,6 +106,10 @@ skipped = set() targetancestors = set() + editor = None + if opts.get('edit'): + editor = cmdutil.commitforceeditor + lock = wlock = None try: lock = repo.lock() @@ -217,7 +222,8 @@ ui.setconfig('ui', 'forcemerge', '') cmdutil.duplicatecopies(repo, rev, target, p2) if not collapsef: - newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn) + newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, + editor=editor) else: # Skip commit if we are collapsing repo.dirstate.setparents(repo[p1].node()) @@ -247,7 +253,7 @@ commitmsg += '\n* %s' % repo[rebased].description() commitmsg = ui.edit(commitmsg, repo.ui.username()) newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, - extrafn=extrafn) + extrafn=extrafn, editor=editor) if 'qtip' in repo.tags(): updatemq(repo, state, skipped, **opts) @@ -301,7 +307,7 @@ external = p.rev() return external -def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None): +def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None): 'Commit the changes and store useful information in extra' try: repo.dirstate.setparents(repo[p1].node(), repo[p2].node()) @@ -313,7 +319,7 @@ extrafn(ctx, extra) # Commit might fail if unresolved files exist newrev = repo.commit(text=commitmsg, user=ctx.user(), - date=ctx.date(), extra=extra) + date=ctx.date(), extra=extra, editor=editor) repo.dirstate.setbranch(repo[newrev].branch()) return newrev except util.Abort: