This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8356

rebase: don't create merge when continuing rebase interrupted by old hg
ClosedPublic

Authored by martinvonz on Apr 1 2020, 5:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe7af56a0733e: rebase: don't create merge when continuing rebase interrupted by old hg
Summary

This fixes the bug described and demonstrated in the previous
commit. It does so by practically undoing 8082a77cc3a2 (rebase: remove
some redundant setting of dirstate parents, 2020-01-10).

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.Apr 1 2020, 5:46 PM
martinvonz added a commit: rHGe7af56a0733e: rebase: don't create merge when continuing rebase interrupted by old hg.Apr 3 2020, 11:04 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe7af56a0733e: rebase: don't create merge when continuing rebase interrupted by old hg (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (6 lines)
Mtests/test-rebase-interruptions.t (23 lines)

Diff 20985

hgext/rebase.py

) )
) )
if not self.collapsef: if not self.collapsef:
merging = p2 != nullrev merging = p2 != nullrev
editform = cmdutil.mergeeditform(merging, b'rebase') editform = cmdutil.mergeeditform(merging, b'rebase')
editor = cmdutil.getcommiteditor( editor = cmdutil.getcommiteditor(
editform=editform, **pycompat.strkwargs(opts) editform=editform, **pycompat.strkwargs(opts)
) )
# We need to set parents again here just in case we're continuing
# a rebase started with an old hg version (before 9c9cfecd4600),
# because those old versions would have left us with two dirstate
# parents, and we don't want to create a merge commit here (unless
# we're rebasing a merge commit).
self.wctx.setparents(repo[p1].node(), repo[p2].node())
newnode = self._concludenode(rev, p1, editor) newnode = self._concludenode(rev, p1, editor)
else: else:
# Skip commit if we are collapsing # Skip commit if we are collapsing
newnode = None newnode = None
# Update the state # Update the state
if newnode is not None: if newnode is not None:
self.state[rev] = repo[newnode].rev() self.state[rev] = repo[newnode].rev()
ui.debug(b'rebased as %s\n' % short(newnode)) ui.debug(b'rebased as %s\n' % short(newnode))

tests/test-rebase-interruptions.t

$ hg debugsetparents 5 2 $ hg debugsetparents 5 2
$ echo 'conflict solved' > A $ echo 'conflict solved' > A
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
already rebased 1:27547f69f254 "B" as 45396c49d53b already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db saved backup bundle to $TESTTMP/a4/.hg/strip-backup/27547f69f254-359abdd7-rebase.hg
BROKEN: we should not have a merge commit here
$ hg tglog $ hg tglog
o 6: 567335b578a0 'C' o 4: d2d25e26288e 'C'
|\ |
| o 5: 45396c49d53b 'B' o 3: 45396c49d53b 'B'
| | |
| @ 4: ae36e8e3dfd7 'E' @ 2: ae36e8e3dfd7 'E'
| | |
| o 3: 46b37eabc604 'D' o 1: 46b37eabc604 'D'
| | |
o | 2: 965c486023db 'C'
| |
o | 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cd .. $ cd ..
(precommit version) (precommit version)
$ cp -R a3 hook-precommit $ cp -R a3 hook-precommit
$ cd hook-precommit $ cd hook-precommit