##// END OF EJS Templates
rebase: inline simple function for finding obsolete subset of commits...
Martin von Zweigbergk -
r47435:7ed7b13f default
parent child Browse files
Show More
@@ -474,7 +474,7 b' class rebaseruntime(object):'
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
@@ -2184,11 +2184,6 b' def pullrebase(orig, ui, repo, *args, **'
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
General Comments 0
You need to be logged in to leave comments. Login now