# HG changeset patch # User Jun Wu # Date 1500048105 25200 # Node ID 3b04a6ff625c20f7bd9b1aa41b0b744d00f8b192 # Parent 3ddbab49efcf56f93002e9e6c6b542416003d532 rebase: remove rebaseset from _checkobsrebase The parameter is not used. Therefore removed. Differential Revision: https://phab.mercurial-scm.org/D85 diff -r 3ddbab49efcf -r 3b04a6ff625c hgext/rebase.py --- a/hgext/rebase.py Mon Jul 10 12:18:32 2017 -0700 +++ b/hgext/rebase.py Fri Jul 14 09:01:45 2017 -0700 @@ -279,12 +279,11 @@ if not self.ui.configbool('experimental', 'rebaseskipobsolete', default=True): return - rebaseset = set(rebaserevs) obsoleteset = set(obsoleterevs) self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, obsoleteset, dest) skippedset = set(self.obsoletenotrebased) - _checkobsrebase(self.repo, self.ui, obsoleteset, rebaseset, skippedset) + _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) def _prepareabortorcontinue(self, isabort): try: @@ -939,12 +938,11 @@ result.append(adjusted) return result -def _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped): +def _checkobsrebase(repo, ui, rebaseobsrevs, rebaseobsskipped): """ Abort if rebase will create divergence or rebase is noop because of markers `rebaseobsrevs`: set of obsolete revision in source - `rebasesetrevs`: set of revisions to be rebased from source `rebaseobsskipped`: set of revisions from source skipped because they have successors in destination """