This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10257

rebase: set `prepared = True` at very end of `_preparenewrebase()`
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc2438f2f635c: rebase: set `prepared = True` at very end of `_preparenewrebase()`
Summary

Once we've set rebaseruntime.prepared = True, rebaseruntime.repo
starts returning the unfiltered repo. That will make my next patch
break, because that patch moves the call to rewriteutil.precheck()
after the call to _handleskippingobsolete(), which current happens
after prepared = True. We therefore need to prepare by moving
prepared = True a bit later, after _handleskippingobsolete(). I
don't think that matters for that call.

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: rHGc2438f2f635c: rebase: set `prepared = True` at very end of `_preparenewrebase()`.Mar 25 2021, 5:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc2438f2f635c: rebase: set `prepared = True` at very end of `_preparenewrebase()` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (5 lines)

Diff 26592

hgext/rebase.py

) )
self.external = externalparent(self.repo, self.state, destancestors) self.external = externalparent(self.repo, self.state, destancestors)
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)
self.prepared = True
# Calculate self.obsolete_* sets # Calculate self.obsolete_* sets
self._handleskippingobsolete() self._handleskippingobsolete()
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")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
obsolete nodes to be rebased given in `rebaseobsrevs`. obsolete nodes to be rebased given in `rebaseobsrevs`.
`obsolete_with_successor_in_rebase_set` is a set with obsolete revisions, `obsolete_with_successor_in_rebase_set` is a set with obsolete revisions,
without a successor in destination, that would cause divergence. without a successor in destination, that would cause divergence.
""" """
obsolete_with_successor_in_destination = {} obsolete_with_successor_in_destination = {}
obsolete_with_successor_in_rebase_set = set() obsolete_with_successor_in_rebase_set = set()
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