This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7176

rebase: allow rebasing obsolete commit without successor
Needs RevisionPublic

Authored by martinvonz on Oct 25 2019, 8:48 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

When trying to rebase an obsolete whose successors are also all
obsolete, we would skip it and tell the user that it would have caused
divergence. That is not correct. We could just change the message, but
I don't see any harm in rebasing such commits. It even seems like a
reasonable way to make it not obsolete. So this patch makes that type
of rebase allowed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 25 2019, 8:48 PM
marmoute added subscribers: khanchi97, marmoute.Oct 30 2019, 3:59 PM

That is not necessarly True, If the changeset is pruned, but successors of a public changeset, rebasing it would create phase-divergence. @khanchi97 fixed similar cases in September.

Overall, we should migrate the rebase code to use the precheck logic in rewrite util (and make sure things are well covered there).

One can read more about current Sushil work in this area here: https://www.mercurial-scm.org/wiki/CEDPrecheckPlan.

baymax requested changes to this revision.Jan 30 2020, 1:06 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 30 2020, 1:06 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (6 lines)
Mtests/test-rebase-obsolete.t (3 lines)

Diff 17409

hgext/rebase.py

if e: if e:
self.extrafns = [e] self.extrafns = [e]
self.backupf = ui.configbool(b'rewrite', b'backup-bundle') self.backupf = ui.configbool(b'rewrite', b'backup-bundle')
self.keepf = opts.get(b'keep', False) self.keepf = opts.get(b'keep', False)
self.keepbranchesf = opts.get(b'keepbranches', False) self.keepbranchesf = opts.get(b'keepbranches', False)
self.obsoletenotrebased = {} self.obsoletenotrebased = {}
self.obsoletewithoutsuccessorindestination = set() self.obsoletewithoutsuccessorindestination = set()
self.obsoleteextinctsuccessors = set()
self.inmemory = inmemory self.inmemory = inmemory
self.stateobj = statemod.cmdstate(repo, b'rebasestate') self.stateobj = statemod.cmdstate(repo, b'rebasestate')
@property @property
def repo(self): def repo(self):
if self.prepared: if self.prepared:
return self._repo.unfiltered() return self._repo.unfiltered()
else: else:
""" """
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, self.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) skippedset.update(self.obsoleteextinctsuccessors)
_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False):
try: try:
self.restorestatus() self.restorestatus()
self.collapsemsg = restorecollapsemsg(self.repo, isabort) self.collapsemsg = restorecollapsemsg(self.repo, isabort)
except error.RepoLookupError: except error.RepoLookupError:
if isabort: if isabort:
dest = self.destmap[rev] dest = self.destmap[rev]
ctx = repo[rev] ctx = repo[rev]
desc = _ctxdesc(ctx) desc = _ctxdesc(ctx)
if self.state[rev] == rev: if self.state[rev] == rev:
ui.status(_(b'already rebased %s\n') % desc) ui.status(_(b'already rebased %s\n') % desc)
elif ( elif (
not allowdivergence not allowdivergence
and rev in self.obsoletewithoutsuccessorindestination and rev in self.obsoletewithoutsuccessorindestination
and rev not in self.obsoleteextinctsuccessors
): ):
msg = ( msg = (
_( _(
b'note: not rebasing %s and its descendants as ' b'note: not rebasing %s and its descendants as '
b'this would cause divergence\n' b'this would cause divergence\n'
) )
% desc % desc
) )

tests/test-rebase-obsolete.t

$ hg rebase -d D -s B $ hg rebase -d D -s B
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence
$ hg debugobsolete $(hg log -r E -T '{node}') $ hg debugobsolete $(hg log -r E -T '{node}')
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg tag --local --remove E $ hg tag --local --remove E
BROKEN: this rebase would not cause divergence
$ hg rebase -d D -s C $ hg rebase -d D -s C
note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence rebasing 3:26805aba1e60 "C" (C)
$ cd .. $ cd ..
$ hg init p2-succ-in-dest-c $ hg init p2-succ-in-dest-c
$ cd p2-succ-in-dest-c $ cd p2-succ-in-dest-c
The scenario here was that B::D were developed on default. B was queued on The scenario here was that B::D were developed on default. B was queued on
stable, but amended before being push to hg-committed. C was queued on default, stable, but amended before being push to hg-committed. C was queued on default,