Show More
@@ -376,6 +376,8 b' def rebase(ui, repo, **opts):' | |||
|
376 | 376 | if collapsef and not keepopen: |
|
377 | 377 | p1, p2 = defineparents(repo, min(state), target, |
|
378 | 378 | state, targetancestors) |
|
379 | editopt = opts.get('edit') | |
|
380 | editform = 'rebase.collapse' | |
|
379 | 381 | if collapsemsg: |
|
380 | 382 | commitmsg = collapsemsg |
|
381 | 383 | else: |
@@ -383,8 +385,8 b' def rebase(ui, repo, **opts):' | |||
|
383 | 385 | for rebased in state: |
|
384 | 386 | if rebased not in skipped and state[rebased] > nullmerge: |
|
385 | 387 | commitmsg += '\n* %s' % repo[rebased].description() |
|
386 |
edit |
|
|
387 |
|
|
|
388 | editopt = True | |
|
389 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | |
|
388 | 390 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, |
|
389 | 391 | extrafn=extrafn, editor=editor) |
|
390 | 392 | for oldrev in state.iterkeys(): |
@@ -148,7 +148,12 b' Rebasing G onto H with custom message:' | |||
|
148 | 148 | abort: message can only be specified with collapse |
|
149 | 149 | [255] |
|
150 | 150 | |
|
151 | $ hg rebase --source 4 --collapse -m 'custom message' | |
|
151 | $ cat > $TESTTMP/checkeditform.sh <<EOF | |
|
152 | > env | grep HGEDITFORM | |
|
153 | > true | |
|
154 | > EOF | |
|
155 | $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e | |
|
156 | HGEDITFORM=rebase.collapse | |
|
152 | 157 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
|
153 | 158 | |
|
154 | 159 | $ hg tglog |
General Comments 0
You need to be logged in to leave comments.
Login now