Show More
@@ -348,20 +348,16 b' class rebaseruntime(object):' | |||||
348 |
|
348 | |||
349 | return data |
|
349 | return data | |
350 |
|
350 | |||
351 |
def _handleskippingobsolete(self |
|
351 | def _handleskippingobsolete(self): | |
352 | """Compute structures necessary for skipping obsolete revisions |
|
352 | """Compute structures necessary for skipping obsolete revisions""" | |
353 |
|
||||
354 | obsoleterevs: iterable of all obsolete revisions in rebaseset |
|
|||
355 | destmap: {srcrev: destrev} destination revisions |
|
|||
356 | """ |
|
|||
357 | self.obsoletenotrebased = {} |
|
353 | self.obsoletenotrebased = {} | |
358 | if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): |
|
354 | if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): | |
359 | return |
|
355 | return | |
360 |
obsoleteset = set( |
|
356 | obsoleteset = {r for r in self.state if self.repo[r].obsolete()} | |
361 | ( |
|
357 | ( | |
362 | self.obsoletenotrebased, |
|
358 | self.obsoletenotrebased, | |
363 | self.obsoletewithoutsuccessorindestination, |
|
359 | self.obsoletewithoutsuccessorindestination, | |
364 | ) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap) |
|
360 | ) = _computeobsoletenotrebased(self.repo, obsoleteset, self.destmap) | |
365 | skippedset = set(self.obsoletenotrebased) |
|
361 | skippedset = set(self.obsoletenotrebased) | |
366 | skippedset.update(self.obsoletewithoutsuccessorindestination) |
|
362 | skippedset.update(self.obsoletewithoutsuccessorindestination) | |
367 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) |
|
363 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | |
@@ -472,8 +468,7 b' class rebaseruntime(object):' | |||||
472 | ) |
|
468 | ) | |
473 |
|
469 | |||
474 | # Calculate self.obsoletenotrebased |
|
470 | # Calculate self.obsoletenotrebased | |
475 | obsrevs = {r for r in self.state if self.repo[r].obsolete()} |
|
471 | self._handleskippingobsolete() | |
476 | self._handleskippingobsolete(obsrevs, self.destmap) |
|
|||
477 |
|
472 | |||
478 | # Keep track of the active bookmarks in order to reset them later |
|
473 | # Keep track of the active bookmarks in order to reset them later | |
479 | self.activebookmark = self.activebookmark or repo._activebookmark |
|
474 | self.activebookmark = self.activebookmark or repo._activebookmark |
General Comments 0
You need to be logged in to leave comments.
Login now