D85: rebase: remove rebaseset from _checkobsrebase
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=979
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
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D85: rebase: remove rebaseset from _checkobsrebase
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=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
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D85: rebase: remove rebaseset from _checkobsrebase
quark abandoned this revision. quark added a comment. Not going to hit 4.3 release. Let's revisit after freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D85 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: quark, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Differential] [Request, 6 lines] D85: rebase: remove rebaseset from _checkobsrebase
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The parameter is not used. Therefore removed.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D85
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
Index: hgext/rebase.py
===
--- hgext/rebase.py
+++ 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:
@@ -862,12 +861,11 @@
copies.duplicatecopies(repo, rev, p1rev, skiprev=dest)
return stats
-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
"""
EMAIL PREFERENCES
https://phab.mercurial-scm.org/settings/panel/emailpreferences/
To: quark, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
