This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10240

rebase: skip obsolete commits even if they have pruned successors
ClosedPublic

Authored by martinvonz on Mar 19 2021, 3:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG32399d0813e0: rebase: skip obsolete commits even if they have pruned successors
Summary

Issue 5782 reported that `hg rebase -r <obsolete commit with pruned
successor>` failed with an error saying that it would cause
divergence. Commit b7e2cf114e85 (rebase: do not consider extincts for
divergence detection (issue5782), 2018-02-09) fixed it by letting you
rebase the commit. However, that fix seems inconsistent with how we
handle hg rebase -r <pruned commit>. To me, it should make no
difference whether a commit is pruned itself or if it has (only)
pruned successors. This patch changes it so we treat these two kinds
of commits the same way. I let the message we print remain "note: not
rebasing <commit>, it has no successor" even though that last part is
not technically correct for commits with pruned successors. I doubt it
will confuse users.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (19 lines)
Mtests/test-rebase-obsolete.t (14 lines)

Diff 26536

hgext/rebase.py

""" """
self.obsoletenotrebased = {} self.obsoletenotrebased = {}
if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'):
return return
obsoleteset = set(obsoleterevs) obsoleteset = set(obsoleterevs)
( (
self.obsoletenotrebased, self.obsoletenotrebased,
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors,
) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap) ) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap)
skippedset = set(self.obsoletenotrebased) skippedset = set(self.obsoletenotrebased)
skippedset.update(self.obsoletewithoutsuccessorindestination) skippedset.update(self.obsoletewithoutsuccessorindestination)
skippedset.update(obsoleteextinctsuccessors)
_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
def _prepareabortorcontinue( def _prepareabortorcontinue(
self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False
): ):
self.resume = True self.resume = True
try: try:
self.restorestatus() self.restorestatus()
def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap):
"""Return (obsoletenotrebased, obsoletewithoutsuccessorindestination). """Return (obsoletenotrebased, obsoletewithoutsuccessorindestination).
`obsoletenotrebased` is a mapping mapping obsolete => successor for all `obsoletenotrebased` is a mapping mapping obsolete => successor for all
obsolete nodes to be rebased given in `rebaseobsrevs`. obsolete nodes to be rebased given in `rebaseobsrevs`.
`obsoletewithoutsuccessorindestination` is a set with obsolete revisions `obsoletewithoutsuccessorindestination` is a set with obsolete revisions
without a successor in destination. without a successor in destination.
`obsoleteextinctsuccessors` is a set of obsolete revisions with only
obsolete successors.
""" """
obsoletenotrebased = {} obsoletenotrebased = {}
obsoletewithoutsuccessorindestination = set() obsoletewithoutsuccessorindestination = set()
obsoleteextinctsuccessors = set()
assert repo.filtername is None assert repo.filtername is None
cl = repo.changelog cl = repo.changelog
get_rev = cl.index.get_rev get_rev = cl.index.get_rev
extinctrevs = set(repo.revs(b'extinct()')) extinctrevs = set(repo.revs(b'extinct()'))
for srcrev in rebaseobsrevs: for srcrev in rebaseobsrevs:
srcnode = cl.node(srcrev) srcnode = cl.node(srcrev)
# XXX: more advanced APIs are required to handle split correctly # XXX: more advanced APIs are required to handle split correctly
successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode]))
# obsutil.allsuccessors includes node itself # obsutil.allsuccessors includes node itself
successors.remove(srcnode) successors.remove(srcnode)
succrevs = {get_rev(s) for s in successors} succrevs = {get_rev(s) for s in successors}
succrevs.discard(None) succrevs.discard(None)
if succrevs.issubset(extinctrevs): if not successors or succrevs.issubset(extinctrevs):
# all successors are extinct # no successor, or all successors are extinct
obsoleteextinctsuccessors.add(srcrev)
if not successors:
# no successor
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 a successor in rebase set but none in
# destination (which would be catched above), we shall skip it # destination (which would be catched above), we shall skip it
# and its descendants to avoid divergence. # and its descendants to avoid divergence.
if srcrev in extinctrevs or any(s in destmap for s in succrevs): if srcrev in extinctrevs or any(s in destmap for s in succrevs):
obsoletewithoutsuccessorindestination.add(srcrev) obsoletewithoutsuccessorindestination.add(srcrev)
return ( return obsoletenotrebased, obsoletewithoutsuccessorindestination
obsoletenotrebased,
obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors,
)
def abortrebase(ui, repo): def abortrebase(ui, repo):
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
rbsrt = rebaseruntime(repo, ui) rbsrt = rebaseruntime(repo, ui)
rbsrt._prepareabortorcontinue(isabort=True) rbsrt._prepareabortorcontinue(isabort=True)

tests/test-rebase-obsolete.t

| | | |
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", it has no successor
$ 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