This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7727

rebase: make sure pruning does not confuse rebase (issue6180)
AbandonedPublic

Authored by khanchi97 on Dec 27 2019, 11:56 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

Before this patch, if a user is rebasing a stack of commits and
hit a conflict in between and decided to drop that commit (the commit
which is being rebased but hit conflict) and pruned it, now what
hg rebase --continue does is: skip that dropped commit and move
on to rebase the next commit and gets confused here because wdir
has two parents which is because while we skipped that dropped
commit wdir had two parents and we didn't update that to one parent.

Changes in test file demonstrate the fixed behavior.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

khanchi97 created this revision.Dec 27 2019, 11:56 AM
khanchi97 abandoned this revision.Dec 27 2019, 12:04 PM

abandoing because I phabsent them in reverse order and it got messed up saying 'Graph cycle detected'

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)
Mtests/test-rebase-conflicts.t (7 lines)

Diff 18936

hgext/rebase.py

# Make clearrebased aware state[rev] is not a true successor # Make clearrebased aware state[rev] is not a true successor
self.skipped.add(rev) self.skipped.add(rev)
# Record rev as moved to its desired destination in self.state. # Record rev as moved to its desired destination in self.state.
# This helps bookmark and working parent movement. # This helps bookmark and working parent movement.
dest = max( dest = max(
adjustdest(repo, rev, self.destmap, self.state, self.skipped) adjustdest(repo, rev, self.destmap, self.state, self.skipped)
) )
self.state[rev] = dest self.state[rev] = dest
# since we are done, make sure wdir has one parent (issue6180)
if len(repo[None].parents()) == 2:
p1 = repo[None].p1().node()
repo.setparents(p1)
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
ui.status(_(b'rebasing %s\n') % desc) ui.status(_(b'rebasing %s\n') % desc)
progressfn(ctx) progressfn(ctx)
p1, p2, base = defineparents( p1, p2, base = defineparents(
repo, repo,
rev, rev,
self.destmap, self.destmap,
self.state, self.state,

tests/test-rebase-conflicts.t

$ echo 1 > a $ echo 1 > a
$ hg debugobsolete $(hg id -ir 2 --debug) $ hg debugobsolete $(hg id -ir 2 --debug)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets 1 new orphan changesets
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
XXX: it should have rebased revision 3 since it made changes unrelated to
destination, so no reason to say "its destination already has all its changes"
$ hg rebase -c $ hg rebase -c
note: not rebasing 2:06a50ac6b5ab "conflict in a", it has no successor note: not rebasing 2:06a50ac6b5ab "conflict in a", it has no successor
rebasing 3:aea370672fd7 "add b" (tip) rebasing 3:aea370672fd7 "add b" (tip)
note: not rebasing 3:aea370672fd7 "add b" (tip), its destination already has all its changes
$ hg tglog $ hg tglog
@ 1:draft 'edit a' @ 4:draft 'add b'
|
o 1:draft 'edit a'
| |
o 0:draft 'add a' o 0:draft 'add a'