D85: rebase: remove rebaseset from _checkobsrebase
quark (Jun Wu)
phabricator at mercurial-scm.org
Fri Aug 11 09:02:05 UTC 2017
quark updated this revision to Diff 776.
This revision is now accepted and ready to land.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D85?vs=160&id=776
REVISION DETAIL
https://phab.mercurial-scm.org/D85
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
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
"""
To: quark, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list