Mercurial > hg-stable
changeset 33867:3b04a6ff625c
rebase: remove rebaseset from _checkobsrebase
The parameter is not used. Therefore removed.
Differential Revision: https://phab.mercurial-scm.org/D85
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Fri, 14 Jul 2017 09:01:45 -0700 |
| parents | 3ddbab49efcf |
| children | ddf77c0cc169 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 """