This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10259

rebase: don't call rewriteutil.precheck() with to-be-skipped commits
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG27ba8acd5684: rebase: don't call rewriteutil.precheck() with to-be-skipped commits
rHG2cdb05da997d: rebase: don't call rewriteutil.precheck() with to-be-skipped commits
Summary

It's clearly incorrect to call rewriteutil.precheck() for commits
that we're not about to rewrite. We haven't noticed yet because the
function doesn't check for divergence, but I'm about to teach it to do
that.

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 (4 lines)

Diff 26594

hgext/rebase.py

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: if not self.keepf:
rebaseset = destmap.keys()
rebaseset -= set(self.obsolete_with_successor_in_destination)
rebaseset -= self.obsolete_with_successor_in_rebase_set
try: try:
rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
except error.Abort as e: except error.Abort as e:
if e.hint is None: if e.hint is None:
e.hint = _(b'use --keep to keep original changesets') e.hint = _(b'use --keep to keep original changesets')
raise e raise e
self.prepared = True self.prepared = True