mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
rebase: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-rebase-scenario-global.t", because "hg rebase" hasn't been explicitly tested around editor invocation and "--edit" option. In the other hand, this patch doesn't enhance tests in "hg rebase --collapse" case, because it is already tested in "test-rebase-collapse.t".
This commit is contained in:
parent
876753dee7
commit
d59fc43c65
@ -138,9 +138,7 @@ def rebase(ui, repo, **opts):
|
||||
skipped = set()
|
||||
targetancestors = set()
|
||||
|
||||
editor = None
|
||||
if opts.get('edit'):
|
||||
editor = cmdutil.commitforceeditor
|
||||
editor = cmdutil.getcommiteditor(**opts)
|
||||
|
||||
lock = wlock = None
|
||||
try:
|
||||
@ -376,7 +374,7 @@ def rebase(ui, repo, **opts):
|
||||
for rebased in state:
|
||||
if rebased not in skipped and state[rebased] > nullmerge:
|
||||
commitmsg += '\n* %s' % repo[rebased].description()
|
||||
editor = cmdutil.commitforceeditor
|
||||
editor = cmdutil.getcommiteditor(edit=True)
|
||||
newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
|
||||
extrafn=extrafn, editor=editor)
|
||||
for oldrev in state.iterkeys():
|
||||
|
@ -25,6 +25,7 @@
|
||||
|
||||
Rebasing
|
||||
D onto H - simple rebase:
|
||||
(this also tests that editor is invoked if '--edit' is specified)
|
||||
|
||||
$ hg clone -q -u . a a1
|
||||
$ cd a1
|
||||
@ -47,7 +48,18 @@ D onto H - simple rebase:
|
||||
o 0: 'A'
|
||||
|
||||
|
||||
$ hg rebase -s 3 -d 7
|
||||
$ hg status --rev "3^1" --rev 3
|
||||
A D
|
||||
$ HGEDITOR=cat hg rebase -s 3 -d 7 --edit
|
||||
D
|
||||
|
||||
|
||||
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
||||
HG: Leave message empty to abort commit.
|
||||
HG: --
|
||||
HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
|
||||
HG: branch 'default'
|
||||
HG: changed D
|
||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
|
||||
|
||||
$ hg tglog
|
||||
@ -71,11 +83,12 @@ D onto H - simple rebase:
|
||||
|
||||
|
||||
D onto F - intermediate point:
|
||||
(this also tests that editor is not invoked if '--edit' is not specified)
|
||||
|
||||
$ hg clone -q -u . a a2
|
||||
$ cd a2
|
||||
|
||||
$ hg rebase -s 3 -d 5
|
||||
$ HGEDITOR=cat hg rebase -s 3 -d 5
|
||||
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
|
||||
|
||||
$ hg tglog
|
||||
|
Loading…
Reference in New Issue
Block a user