Patchwork D85: rebase: remove rebaseset from _checkobsrebase

login
register
mail settings
Submitter phabricator
Date Aug. 16, 2017, 6:33 a.m.
Message ID <6a5eb66585fadbdc38d8d96be75d79fc@localhost.localdomain>
Download mbox | patch
Permalink /patch/23077/
State Not Applicable
Headers show

Comments

phabricator - Aug. 16, 2017, 6:33 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3b04a6ff625c: rebase: remove rebaseset from _checkobsrebase (authored by quark).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D85?vs=776&id=979

REVISION DETAIL
  https://phab.mercurial-scm.org/D85

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: quark, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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
     """