Show More
@@ -279,12 +279,11 b' class rebaseruntime(object):' | |||
|
279 | 279 | if not self.ui.configbool('experimental', 'rebaseskipobsolete', |
|
280 | 280 | default=True): |
|
281 | 281 | return |
|
282 | rebaseset = set(rebaserevs) | |
|
283 | 282 | obsoleteset = set(obsoleterevs) |
|
284 | 283 | self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, |
|
285 | 284 | obsoleteset, dest) |
|
286 | 285 | skippedset = set(self.obsoletenotrebased) |
|
287 |
_checkobsrebase(self.repo, self.ui, obsoleteset, |
|
|
286 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | |
|
288 | 287 | |
|
289 | 288 | def _prepareabortorcontinue(self, isabort): |
|
290 | 289 | try: |
@@ -939,12 +938,11 b' def adjustdest(repo, rev, dest, state):' | |||
|
939 | 938 | result.append(adjusted) |
|
940 | 939 | return result |
|
941 | 940 | |
|
942 |
def _checkobsrebase(repo, ui, rebaseobsrevs, |
|
|
941 | def _checkobsrebase(repo, ui, rebaseobsrevs, rebaseobsskipped): | |
|
943 | 942 | """ |
|
944 | 943 | Abort if rebase will create divergence or rebase is noop because of markers |
|
945 | 944 | |
|
946 | 945 | `rebaseobsrevs`: set of obsolete revision in source |
|
947 | `rebasesetrevs`: set of revisions to be rebased from source | |
|
948 | 946 | `rebaseobsskipped`: set of revisions from source skipped because they have |
|
949 | 947 | successors in destination |
|
950 | 948 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now