##// END OF EJS Templates
rebase: small refactoring to allow better extensibility from extensions...
Laurent Charignon -
r27790:2d294dad default
parent child Browse files
Show More
@@ -343,8 +343,7 b' def rebase(ui, repo, **opts):'
343 obsoletenotrebased = {}
343 obsoletenotrebased = {}
344 if ui.configbool('experimental', 'rebaseskipobsolete'):
344 if ui.configbool('experimental', 'rebaseskipobsolete'):
345 rebasesetrevs = set(rebaseset)
345 rebasesetrevs = set(rebaseset)
346 rebaseobsrevs = set(r for r in rebasesetrevs
346 rebaseobsrevs = _filterobsoleterevs(repo, rebasesetrevs)
347 if repo[r].obsolete())
348 obsoletenotrebased = _computeobsoletenotrebased(repo,
347 obsoletenotrebased = _computeobsoletenotrebased(repo,
349 rebaseobsrevs,
348 rebaseobsrevs,
350 dest)
349 dest)
@@ -1188,6 +1187,10 b' def _rebasedvisible(orig, repo):'
1188 blockers.update(getattr(repo, '_rebaseset', ()))
1187 blockers.update(getattr(repo, '_rebaseset', ()))
1189 return blockers
1188 return blockers
1190
1189
1190 def _filterobsoleterevs(repo, revs):
1191 """returns a set of the obsolete revisions in revs"""
1192 return set(r for r in revs if repo[r].obsolete())
1193
1191 def _computeobsoletenotrebased(repo, rebaseobsrevs, dest):
1194 def _computeobsoletenotrebased(repo, rebaseobsrevs, dest):
1192 """return a mapping obsolete => successor for all obsolete nodes to be
1195 """return a mapping obsolete => successor for all obsolete nodes to be
1193 rebased that have a successors in the destination
1196 rebased that have a successors in the destination
General Comments 0
You need to be logged in to leave comments. Login now