Comments
Patch
@@ -267,10 +267,9 @@ class rebaseruntime(object):
self.external = external
self.activebookmark = activebookmark
- def _handleskippingobsolete(self, rebaserevs, obsoleterevs, dest):
+ def _handleskippingobsolete(self, obsoleterevs, dest):
"""Compute structures necessary for skipping obsolete revisions
- rebaserevs: iterable of all revisions that are to be rebased
obsoleterevs: iterable of all obsolete revisions in rebaseset
dest: a destination revision for the rebase operation
"""
@@ -317,7 +316,7 @@ class rebaseruntime(object):
hint=_('use --keep to keep original changesets'))
obsrevs = _filterobsoleterevs(self.repo, set(rebaseset))
- self._handleskippingobsolete(rebaseset, obsrevs, dest.rev())
+ self._handleskippingobsolete(obsrevs, dest.rev())
result = buildstate(self.repo, dest, rebaseset, self.collapsef,
self.obsoletenotrebased)