This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2728

rebase: also include commit of collapsed commits in single transaction
ClosedPublic

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

Details

Reviewers
durham
quark
yuja
Group Reviewers
hg-reviewers
Commits
rHG17a744c5e270: rebase: also include commit of collapsed commits in single transaction
rHG67e18654a9eb: rebase: also include commit of collapsed commits in single transaction
Summary

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

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 8 2018, 5:07 PM
quark accepted this revision.Mar 8 2018, 5:15 PM
martinvonz planned changes to this revision.Mar 9 2018, 12:51 AM

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

martinvonz edited the summary of this revision. (Show Details)Mar 9 2018, 1:36 PM
martinvonz updated this revision to Diff 6768.
martinvonz added a comment.Mar 9 2018, 1:37 PM

This is now ready for review again

yuja accepted this revision.Mar 13 2018, 10:48 AM
This revision is now accepted and ready to land.Mar 13 2018, 10:48 AM
Closed by commit rHG67e18654a9eb: rebase: also include commit of collapsed commits in single transaction (authored by martinvonz). · Explain WhyMar 13 2018, 10:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (19 lines)
Mtests/test-rebase-transaction.t (16 lines)

Diff 6984

hgext/rebase.py

newnode = concludememorynode(repo, revtoreuse, p1, newnode = concludememorynode(repo, revtoreuse, p1,
self.external, self.external,
commitmsg=commitmsg, commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date, wctx=self.wctx) date=self.date, wctx=self.wctx)
else: else:
dsguard = None
if ui.configbool('rebase', 'singletransaction'):
dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with util.acceptintervention(dsguard):
newnode = concludenode(repo, revtoreuse, p1, self.external, newnode = concludenode(repo, revtoreuse, p1, self.external,
commitmsg=commitmsg, commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state: for oldrev in self.state:
self.state[oldrev] = newrev self.state[oldrev] = newrev
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, updatemq(repo, self.state, self.skipped,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
with util.acceptintervention(tr): with util.acceptintervention(tr):
# Same logic for the dirstate guard, except we don't create one when # Same logic for the dirstate guard, except we don't create one when
# rebasing in-memory (it's not needed). # rebasing in-memory (it's not needed).
dsguard = None dsguard = None
if singletr and not inmemory: if singletr and not inmemory:
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
rbsrt._performrebase(tr) rbsrt._performrebase(tr)
rbsrt._finishrebase() rbsrt._finishrebase()
def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
revf=None, destspace=None): revf=None, destspace=None):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []
# destspace is here to work around issues with `hg pull --rebase` see # destspace is here to work around issues with `hg pull --rebase` see

tests/test-rebase-transaction.t

> | D > | D
> | | > | |
> | C > | C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
- We should only see two status stored messages. One from the start, one from - We should only see one status stored message. It comes from the start.
- the end.
$ hg rebase --debug -b D -d Z | grep 'status stored' $ hg rebase --debug -b D -d Z | grep 'status stored'
rebase status stored rebase status stored
rebase status stored
$ hg tglog $ hg tglog
o 5: D o 5: D
| |
o 4: C o 4: C
| |
o 3: B o 3: B
| |
o 2: Z o 2: Z
> | | > | |
> | C > | C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
- We should only see two status stored messages. One from the start, one from - We should only see two status stored messages. One from the start, one from
- the end. - cmdutil.commitforceeditor() which forces tr.writepending()
$ hg rebase --collapse --debug -b D -d Z | grep 'status stored' $ hg rebase --collapse --debug -b D -d Z | grep 'status stored'
rebase status stored rebase status stored
rebase status stored rebase status stored
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
$ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C) rebasing 3:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip) rebasing 5:f585351a92f8 "D" (D tip)
transaction abort!
rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
o 5: D o 5: D
| |
| @ 4: Z | o 4: Z
| | | |
o | 3: C o | 3: C
| | | |
| o 2: Y | o 2: Y
| | | |
o | 1: B o | 1: B
|/ |/
o 0: A o 0: A
$ hg rebase --continue $ hg rebase --continue
already rebased 1:112478962961 "B" (B) as e9b22a392ce0 rebasing 1:112478962961 "B" (B)
already rebased 3:26805aba1e60 "C" (C) as e9b22a392ce0 rebasing 3:26805aba1e60 "C" (C)
already rebased 5:f585351a92f8 "D" (D tip) as e9b22a392ce0 rebasing 5:f585351a92f8 "D" (D tip)
saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
o 2: Z o 2: Z
| |
o 1: Y o 1: Y
| |
o 0: A o 0: A
$ cd .. $ cd ..