| hg-reviewers |
The function already has self as an argument, so there's no need to
pass data from self into it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (15 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| data[b'skipped'] = skipped | data[b'skipped'] = skipped | ||||
| repo.ui.debug( | repo.ui.debug( | ||||
| b'computed skipped revs: %s\n' | b'computed skipped revs: %s\n' | ||||
| % (b' '.join(b'%d' % r for r in sorted(skipped)) or b'') | % (b' '.join(b'%d' % r for r in sorted(skipped)) or b'') | ||||
| ) | ) | ||||
| return data | return data | ||||
| def _handleskippingobsolete(self, obsoleterevs, destmap): | def _handleskippingobsolete(self): | ||||
| """Compute structures necessary for skipping obsolete revisions | """Compute structures necessary for skipping obsolete revisions""" | ||||
| obsoleterevs: iterable of all obsolete revisions in rebaseset | |||||
| destmap: {srcrev: destrev} destination revisions | |||||
| """ | |||||
| self.obsoletenotrebased = {} | self.obsoletenotrebased = {} | ||||
| if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): | if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): | ||||
| return | return | ||||
| obsoleteset = set(obsoleterevs) | obsoleteset = {r for r in self.state if self.repo[r].obsolete()} | ||||
| ( | ( | ||||
| self.obsoletenotrebased, | self.obsoletenotrebased, | ||||
| self.obsoletewithoutsuccessorindestination, | self.obsoletewithoutsuccessorindestination, | ||||
| ) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap) | ) = _computeobsoletenotrebased(self.repo, obsoleteset, self.destmap) | ||||
| skippedset = set(self.obsoletenotrebased) | skippedset = set(self.obsoletenotrebased) | ||||
| skippedset.update(self.obsoletewithoutsuccessorindestination) | skippedset.update(self.obsoletewithoutsuccessorindestination) | ||||
| _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | ||||
| def _prepareabortorcontinue( | def _prepareabortorcontinue( | ||||
| self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False | self, isabort, backup=True, suppwarns=False, dryrun=False, confirm=False | ||||
| ): | ): | ||||
| self.resume = True | self.resume = True | ||||
| 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 = {r for r in self.state if self.repo[r].obsolete()} | self._handleskippingobsolete() | ||||
| 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' | ||||
| # if we fail before the transaction closes. | # if we fail before the transaction closes. | ||||