This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10258

reabase: call rewriteutil.precheck() a bit later
ClosedPublic

Authored by martinvonz on Mar 24 2021, 2:25 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG80cac9936324: reabase: call rewriteutil.precheck() a bit later
Summary

We now filter out descendants of divergence-causing commits in
_handleskippingobsolete(). The filtered-out commits are removed from
the rebase set (destmap and state). We should therefore call
rewriteutil.precheck() after _handleskippingobsolete(). This patch
does that. It hasn't mattered so far because rewriteutil.precheck()
doesn't yet check for divergence, but it will soon.

This affects one test where we now fail because the user is trying to
rebase an ancestor instead of failing because they tried to rebase a
public commit. We have several similar tests just after, where we
still fail because of the phase, so that seems fine. The difference in
behavior also seems fine to me.

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.Mar 24 2021, 2:25 AM
martinvonz added a commit: rHG80cac9936324: reabase: call rewriteutil.precheck() a bit later.Mar 25 2021, 5:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG80cac9936324: reabase: call rewriteutil.precheck() a bit later (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (18 lines)
Mtests/test-rebase-scenario-global.t (5 lines)

Diff 26593

hgext/rebase.py

dryrun=dryrun, dryrun=dryrun,
confirm=confirm, confirm=confirm,
) )
def _preparenewrebase(self, destmap): def _preparenewrebase(self, destmap):
if not destmap: if not destmap:
return _nothingtorebase() return _nothingtorebase()
rebaseset = destmap.keys()
if not self.keepf:
try:
rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
except error.Abort as e:
if e.hint is None:
e.hint = _(b'use --keep to keep original changesets')
raise e
result = buildstate(self.repo, destmap, self.collapsef) result = buildstate(self.repo, destmap, self.collapsef)
if not result: if not result:
# Empty state built, nothing to rebase # Empty state built, nothing to rebase
self.ui.status(_(b'nothing to rebase\n')) self.ui.status(_(b'nothing to rebase\n'))
return _nothingtorebase() return _nothingtorebase()
(self.originalwd, self.destmap, self.state) = result (self.originalwd, self.destmap, self.state) = result
for destrev in sorted(set(destmap.values())): for destrev in sorted(set(destmap.values())):
dest = self.repo[destrev] dest = self.repo[destrev]
if dest.closesbranch() and not self.keepbranchesf: if dest.closesbranch() and not self.keepbranchesf:
self.ui.status(_(b'reopening closed branch head %s\n') % dest) self.ui.status(_(b'reopening closed branch head %s\n') % dest)
# Calculate self.obsolete_* sets # Calculate self.obsolete_* sets
self._handleskippingobsolete() self._handleskippingobsolete()
rebaseset = destmap.keys()
if not self.keepf:
try:
rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
except error.Abort as e:
if e.hint is None:
e.hint = _(b'use --keep to keep original changesets')
raise e
self.prepared = True self.prepared = True
def _assignworkingcopy(self): def _assignworkingcopy(self):
if self.inmemory: if self.inmemory:
from mercurial.context import overlayworkingctx from mercurial.context import overlayworkingctx
self.wctx = overlayworkingctx(self.repo) self.wctx = overlayworkingctx(self.repo)
self.repo.ui.debug(b"rebasing in memory\n") self.repo.ui.debug(b"rebasing in memory\n")

tests/test-rebase-scenario-global.t

|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
Check rebasing public changeset Check rebasing public changeset
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
$ hg rebase -d 0 -b 6 $ hg rebase -d 0 -b 6
abort: cannot rebase public changesets nothing to rebase
(see 'hg help phases' for details) [1]
[10]
$ hg rebase -d 5 -b 6 $ hg rebase -d 5 -b 6
abort: cannot rebase public changesets abort: cannot rebase public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg rebase -d 5 -r '1 + (6::)' $ hg rebase -d 5 -r '1 + (6::)'
abort: cannot rebase public changesets abort: cannot rebase public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]