| durin42 |
| hg-reviewers |
The parameter is not used. Therefore removed.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| rebaserevs: iterable of all revisions that are to be rebased | rebaserevs: iterable of all revisions that are to be rebased | ||||
| obsoleterevs: iterable of all obsolete revisions in rebaseset | obsoleterevs: iterable of all obsolete revisions in rebaseset | ||||
| dest: a destination revision for the rebase operation | dest: a destination revision for the rebase operation | ||||
| """ | """ | ||||
| self.obsoletenotrebased = {} | self.obsoletenotrebased = {} | ||||
| if not self.ui.configbool('experimental', 'rebaseskipobsolete', | if not self.ui.configbool('experimental', 'rebaseskipobsolete', | ||||
| default=True): | default=True): | ||||
| return | return | ||||
| rebaseset = set(rebaserevs) | |||||
| obsoleteset = set(obsoleterevs) | obsoleteset = set(obsoleterevs) | ||||
| self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, | self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, | ||||
| obsoleteset, dest) | obsoleteset, dest) | ||||
| skippedset = set(self.obsoletenotrebased) | skippedset = set(self.obsoletenotrebased) | ||||
| _checkobsrebase(self.repo, self.ui, obsoleteset, rebaseset, skippedset) | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | ||||
| def _prepareabortorcontinue(self, isabort): | def _prepareabortorcontinue(self, isabort): | ||||
| try: | try: | ||||
| self.restorestatus() | self.restorestatus() | ||||
| self.collapsemsg = restorecollapsemsg(self.repo, isabort) | self.collapsemsg = restorecollapsemsg(self.repo, isabort) | ||||
| except error.RepoLookupError: | except error.RepoLookupError: | ||||
| if isabort: | if isabort: | ||||
| clearstatus(self.repo) | clearstatus(self.repo) | ||||
| # pick already rebased revs from state | # pick already rebased revs from state | ||||
| source = [s for s, d in state.items() if d > 0] | source = [s for s, d in state.items() if d > 0] | ||||
| candidate = repo.revs('max(%ld and (::%d))', source, prev).first() | candidate = repo.revs('max(%ld and (::%d))', source, prev).first() | ||||
| if candidate is not None: | if candidate is not None: | ||||
| adjusted = state[candidate] | adjusted = state[candidate] | ||||
| result.append(adjusted) | result.append(adjusted) | ||||
| return result | 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 | Abort if rebase will create divergence or rebase is noop because of markers | ||||
| `rebaseobsrevs`: set of obsolete revision in source | `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 | `rebaseobsskipped`: set of revisions from source skipped because they have | ||||
| successors in destination | successors in destination | ||||
| """ | """ | ||||
| # Obsolete node with successors not in dest leads to divergence | # Obsolete node with successors not in dest leads to divergence | ||||
| divergenceok = ui.configbool('experimental', | divergenceok = ui.configbool('experimental', | ||||
| 'allowdivergence') | 'allowdivergence') | ||||
| divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | ||||