Mercurial > hg
comparison hgext/rebase.py @ 46677:7ed7b13fc00a
rebase: inline simple function for finding obsolete subset of commits
`_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).
Differential Revision: https://phab.mercurial-scm.org/D10198
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Feb 2021 16:13:34 -0800 |
parents | 9989a276712f |
children | 32399d0813e0 |
comparison
equal
deleted
inserted
replaced
46676:b41f551c5dc7 | 46677:7ed7b13fc00a |
---|---|
472 raise error.InputError( | 472 raise error.InputError( |
473 _(b'cannot collapse multiple named branches') | 473 _(b'cannot collapse multiple named branches') |
474 ) | 474 ) |
475 | 475 |
476 # Calculate self.obsoletenotrebased | 476 # Calculate self.obsoletenotrebased |
477 obsrevs = _filterobsoleterevs(self.repo, self.state) | 477 obsrevs = {r for r in self.state if self.repo[r].obsolete()} |
478 self._handleskippingobsolete(obsrevs, self.destmap) | 478 self._handleskippingobsolete(obsrevs, self.destmap) |
479 | 479 |
480 # Keep track of the active bookmarks in order to reset them later | 480 # Keep track of the active bookmarks in order to reset them later |
481 self.activebookmark = self.activebookmark or repo._activebookmark | 481 self.activebookmark = self.activebookmark or repo._activebookmark |
482 if self.activebookmark: | 482 if self.activebookmark: |
2182 ret = orig(ui, repo, *args, **opts) | 2182 ret = orig(ui, repo, *args, **opts) |
2183 | 2183 |
2184 return ret | 2184 return ret |
2185 | 2185 |
2186 | 2186 |
2187 def _filterobsoleterevs(repo, revs): | |
2188 """returns a set of the obsolete revisions in revs""" | |
2189 return {r for r in revs if repo[r].obsolete()} | |
2190 | |
2191 | |
2192 def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): | 2187 def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): |
2193 """Return (obsoletenotrebased, obsoletewithoutsuccessorindestination). | 2188 """Return (obsoletenotrebased, obsoletewithoutsuccessorindestination). |
2194 | 2189 |
2195 `obsoletenotrebased` is a mapping mapping obsolete => successor for all | 2190 `obsoletenotrebased` is a mapping mapping obsolete => successor for all |
2196 obsolete nodes to be rebased given in `rebaseobsrevs`. | 2191 obsolete nodes to be rebased given in `rebaseobsrevs`. |