This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4409

rebase: skip *all* obsolete revisions, just warn about divergence
Needs RevisionPublic

Authored by martinvonz on Aug 28 2018, 3:33 AM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

We already skip obsolete revisions in some case: if there is no
successor, or when the successor is in the rebase set or in the
destination, I think. However, we instead error out if the successor
is elsewhere (e.g. a child or a sibling of the destination), because
it would cause divergence. The previous commit fixed one specific case
of this.

Consider this history (based on a test case updated by this patch):

o  D
|
| o  B'
|/
| o  C
| |
| x  B
|/
o A

If the user now runs hg rebase -s B -d D we would error out and tell
them that it would cause divergence from B. This patch makes it so we
instead ignore B and C (and tell the user that we're doing that
because it would cause divergence). I think this simpler model will be
easier for users to understand (I had also thought that all obsolete
commits and their descendants were skipped until we got reports from
users that that wasn't the case).

Note that we still skip just the obsolete (not its descendants) if
it's a prune or if the successor is in the destination.

This should also let us simplify the source quite a bit. I'll do that
in later commits after I've heard people's thoughts on this one.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 28 2018, 3:33 AM
martinvonz edited the summary of this revision. (Show Details)Aug 28 2018, 11:13 AM
martinvonz edited the summary of this revision. (Show Details)
martinvonz edited the summary of this revision. (Show Details)Aug 28 2018, 12:46 PM
martinvonz retitled this revision from rebase: skip *all* obsolete revisions to rebase: skip *all* obsolete revisions, just warn about divergence.
yuja added a subscriber: yuja.Aug 29 2018, 8:55 AM

@@ -1289,18 +1286,16 @@

o  0:b173517d0057 a
$ hg rebase -d 0 -r 2
  • rebasing 2:a82ac2b38757 "c" (c)

+ note: not rebasing 2:a82ac2b38757 "c" (c) and its descendants as this would cause divergence

Looks like the fix for issue5782 regressed.

https://bz.mercurial-scm.org/show_bug.cgi?id=5782

lothiraldan added a subscriber: lothiraldan.Aug 29 2018, 10:00 AM

Changing the behavior of --src to ignore obsolete and orphan unrelated to the destination seems like a good idea.

However, this change seems to also affect --rev. The --rev allow for a precise selection of what the user wants to see rebased and it feels like we should stick to the user wishes here. Dropping explicitly selected revisions feels wrong and will make some use cases harder to perform.

baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (9 lines)
Mtests/test-rebase-obsolete.t (31 lines)

Diff 10616

hgext/rebase.py

obsoletenotrebased[srcrev] = None obsoletenotrebased[srcrev] = None
else: else:
dstrev = destmap[srcrev] dstrev = destmap[srcrev]
for succrev in succrevs: for succrev in succrevs:
if cl.isancestorrev(succrev, dstrev): if cl.isancestorrev(succrev, dstrev):
obsoletenotrebased[srcrev] = succrev obsoletenotrebased[srcrev] = succrev
break break
else: else:
# If 'srcrev' has a successor in rebase set but none in # If 'srcrev' has no successor in destination (which would be
# destination (which would be catched above), we shall skip it # caught above), we shall skip it and its descendants to
# and its descendants to avoid divergence. # avoid divergence.
if srcrev in extinctrevs or any(s in destmap for s in succrevs):
obsoletewithoutsuccessorindestination.add(srcrev) obsoletewithoutsuccessorindestination.add(srcrev)
return ( return (
obsoletenotrebased, obsoletenotrebased,
obsoletewithoutsuccessorindestination, obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors, obsoleteextinctsuccessors,
) )
def summaryhook(ui, repo): def summaryhook(ui, repo):

tests/test-rebase-obsolete.t

parent: 14:73568ab6879d tip (orphan) parent: 14:73568ab6879d tip (orphan)
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets, 3 branch heads (merge) update: 2 new changesets, 3 branch heads (merge)
phases: 8 draft phases: 8 draft
orphan: 1 changesets orphan: 1 changesets
$ hg rebase -s 10 -d 12 $ hg rebase -s 10 -d 12
abort: this rebase will cause divergences from: 121d9e3bc4c6 note: not rebasing 10:121d9e3bc4c6 "P" and its descendants as this would cause divergence
(to force the rebase please set experimental.evolution.allowdivergence=True)
[255]
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
| | | |
| | o 12:3eb461388009 john doe | | o 12:3eb461388009 john doe
| |/ | |/
x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
o 0:b173517d0057 a o 0:b173517d0057 a
If the rebase set has an obsolete (d) with a successor (d') outside the rebase If the rebase set has an obsolete (d) with a successor (d') outside the rebase
set and none in destination, we still get the divergence warning. set and none in destination, we still get the divergence warning.
By allowing divergence, we can perform the rebase. By allowing divergence, we can perform the rebase.
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b rebasing 3:a82ac2b38757 "c" (c)
(to force the rebase please set experimental.evolution.allowdivergence=True) note: not rebasing 4:76be324c128b "d" (d) and its descendants as this would cause divergence
[255] 2 new orphan changesets
$ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 3:a82ac2b38757 "c" (c)
rebasing 4:76be324c128b "d" (d) rebasing 4:76be324c128b "d" (d)
rebasing 7:1143e9adc121 "f" (f tip) rebasing 7:1143e9adc121 "f" (f)
1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -r 'a':: -T instabilities $ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f o 10:e1744ea07510 f
| |
* 9:e2b36ea9a0a0 d (content-divergent) * 9:e2b36ea9a0a0 d (content-divergent)
| |
o 8:6a0376de376e c o 8:6a0376de376e c
| |
| | | |
x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa) x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa)
|/ |/
o 1:488e1b7e7341 b o 1:488e1b7e7341 b
| |
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg rebase -d 0 -r 2 $ hg rebase -d 0 -r 2
rebasing 2:a82ac2b38757 "c" (c) note: not rebasing 2:a82ac2b38757 "c" (c) and its descendants as this would cause divergence
$ hg log -G -r 'a': --hidden $ hg log -G -r 'a': --hidden
o 5:69ad416a4a26 c * 4:76be324c128b d
| |
| * 4:76be324c128b d | x 3:ef8a456de8fa c1 (pruned)
| | | |
| | x 3:ef8a456de8fa c1 (pruned) x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa)
| | |
| x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa rewritten using rebase as 5:69ad416a4a26)
| |/
| o 1:488e1b7e7341 b
|/ |/
o 1:488e1b7e7341 b
|
o 0:b173517d0057 a o 0:b173517d0057 a
$ cd .. $ cd ..
Rebase merge where successor of one parent is equal to destination (issue5198) Rebase merge where successor of one parent is equal to destination (issue5198)
$ hg init p1-succ-is-dest $ hg init p1-succ-is-dest
$ cd p1-succ-is-dest $ cd p1-succ-is-dest
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
This strip seems to be the key to avoid an early divergence warning. This strip seems to be the key to avoid an early divergence warning.
$ hg --config extensions.strip= --hidden strip -qr H $ hg --config extensions.strip= --hidden strip -qr H
1 new orphan changesets 1 new orphan changesets
$ hg rebase -b 'desc("D")' -d 'desc("J")' $ hg rebase -b 'desc("D")' -d 'desc("J")'
abort: this rebase will cause divergences from: 112478962961 note: not rebasing 2:112478962961 "B" (B) and its descendants as this would cause divergence
(to force the rebase please set experimental.evolution.allowdivergence=True)
[255]
Rebase merge where both parents have successors in destination Rebase merge where both parents have successors in destination
$ hg init p12-succ-in-dest $ hg init p12-succ-in-dest
$ cd p12-succ-in-dest $ cd p12-succ-in-dest
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> E F > E F
> /| /| # replace: A -> C > /| /| # replace: A -> C