rebase: also include commit of collapsed commits in single transaction

Authored by martinvonz on Thu, Mar 8, 5:07 PM.



When rebase.singletransaction is set, we still used to create a second
transaction when committing with --collapse. It's simpler to create a
single transaction.

Note that in the affected .t file, the test that uses --collapse still
appears to create two transactions (it prints "rebase status stored"
twice). However, only a single transaction is actually created and the
second printout comes from cmdutil.commitforceeditor() that explicitly
calls tr.writepending().

Also note the that we now roll back any commits if the user closes the
commit message editor with an error code (or leaves the message
empty). That might be unfortunate, but it's consistent with how we
behave in the --no-collapse case (if the user passed --edit). If we
want to change that, I think it should be done consistently in a
separate patch.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.
martinvonz created this revision.Thu, Mar 8, 5:07 PM
quark accepted this revision.Thu, Mar 8, 5:15 PM
martinvonz planned changes to this revision.Fri, Mar 9, 12:51 AM

Please don't queue yet. I'm going to add tests.

martinvonz updated this revision to Diff 6768.Fri, Mar 9, 1:36 PM
martinvonz edited the summary of this revision. (Show Details)

This is now ready for review again

yuja accepted this revision.Tue, Mar 13, 10:48 AM
This revision is now accepted and ready to land.Tue, Mar 13, 10:48 AM
This revision was automatically updated to reflect the committed changes.