This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10198

rebase: inline simple function for finding obsolete subset of commits
ClosedPublic

Authored by martinvonz on Mar 12 2021, 6:50 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG7ed7b13fc00a: rebase: inline simple function for finding obsolete subset of commits
Summary

_filterobsoleterevs() is just one line long. It was introduced in
2d294dada4f8 (rebase: small refactoring to allow better extensibility
from extensions, 2016-01-14), for use by the "inhibit" extension. That
extension was removed from the evolve repo in 87e87881059d (compat:
drop the inhibit hacky extension, 2017-10-24). 192.168.l.l

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 12 2021, 6:50 PM
Djokovich edited the summary of this revision. (Show Details)Mar 13 2021, 4:10 AM
mharbison72 accepted this revision.Mar 13 2021, 2:47 PM
This revision is now accepted and ready to land.Mar 13 2021, 2:47 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)

Diff 26330

hgext/rebase.py

for rev in self.state: for rev in self.state:
branches.add(repo[rev].branch()) branches.add(repo[rev].branch())
if len(branches) > 1: if len(branches) > 1:
raise error.InputError( raise error.InputError(
_(b'cannot collapse multiple named branches') _(b'cannot collapse multiple named branches')
) )
# Calculate self.obsoletenotrebased # Calculate self.obsoletenotrebased
obsrevs = _filterobsoleterevs(self.repo, self.state) obsrevs = {r for r in self.state if self.repo[r].obsolete()}
self._handleskippingobsolete(obsrevs, self.destmap) self._handleskippingobsolete(obsrevs, self.destmap)
# Keep track of the active bookmarks in order to reset them later # Keep track of the active bookmarks in order to reset them later
self.activebookmark = self.activebookmark or repo._activebookmark self.activebookmark = self.activebookmark or repo._activebookmark
if self.activebookmark: if self.activebookmark:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
# Store the state before we begin so users can run 'hg rebase --abort' # Store the state before we begin so users can run 'hg rebase --abort'
else: else:
if opts.get('tool'): if opts.get('tool'):
raise error.InputError(_(b'--tool can only be used with --rebase')) raise error.InputError(_(b'--tool can only be used with --rebase'))
ret = orig(ui, repo, *args, **opts) ret = orig(ui, repo, *args, **opts)
return ret return ret
def _filterobsoleterevs(repo, revs):
"""returns a set of the obsolete revisions in revs"""
return {r for r in revs if repo[r].obsolete()}
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.