| durin42 |
| hg-reviewers |
I'm about to make it so we don't have two parents when a rebase is
interrupted (unless we're just rebasing on a merge commit). The code
for detecting if we're resuming a rebase relied on having two parents,
so this patch rewrites that to instead set a boolean when we resume.
Note that self.resume in the new condition implies `not
self.inmemory` (rebase cannot be resumed in memory), so that's why
that part can be omitted.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # decides whether "self.repo" is unfiltered or not. | # decides whether "self.repo" is unfiltered or not. | ||||
| # The rebasestate has explicit hash to hash instructions not depending | # The rebasestate has explicit hash to hash instructions not depending | ||||
| # on visibility. If rebasestate exists (in-memory or on-disk), use | # on visibility. If rebasestate exists (in-memory or on-disk), use | ||||
| # unfiltered repo to avoid visibility issues. | # unfiltered repo to avoid visibility issues. | ||||
| # Before knowing rebasestate (i.e. when starting a new rebase (not | # Before knowing rebasestate (i.e. when starting a new rebase (not | ||||
| # --continue or --abort)), the original repo should be used so | # --continue or --abort)), the original repo should be used so | ||||
| # visibility-dependent revsets are correct. | # visibility-dependent revsets are correct. | ||||
| self.prepared = False | self.prepared = False | ||||
| self.resume = False | |||||
| self._repo = repo | self._repo = repo | ||||
| self.ui = ui | self.ui = ui | ||||
| self.opts = opts | self.opts = opts | ||||
| self.originalwd = None | self.originalwd = None | ||||
| self.external = nullrev | self.external = nullrev | ||||
| # Mapping between the old revision id and either what is the new rebased | # Mapping between the old revision id and either what is the new rebased | ||||
| # revision or what needs to be done with the old revision. The state | # revision or what needs to be done with the old revision. The state | ||||
| obsoleteextinctsuccessors, | obsoleteextinctsuccessors, | ||||
| ) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap) | ) = _computeobsoletenotrebased(self.repo, obsoleteset, destmap) | ||||
| skippedset = set(self.obsoletenotrebased) | skippedset = set(self.obsoletenotrebased) | ||||
| skippedset.update(self.obsoletewithoutsuccessorindestination) | skippedset.update(self.obsoletewithoutsuccessorindestination) | ||||
| skippedset.update(obsoleteextinctsuccessors) | skippedset.update(obsoleteextinctsuccessors) | ||||
| _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | ||||
| def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): | def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): | ||||
| self.resume = True | |||||
| 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) | ||||
| clearcollapsemsg(self.repo) | clearcollapsemsg(self.repo) | ||||
| self.repo.ui.warn( | self.repo.ui.warn( | ||||
| p1, p2, base = defineparents( | p1, p2, base = defineparents( | ||||
| repo, | repo, | ||||
| rev, | rev, | ||||
| self.destmap, | self.destmap, | ||||
| self.state, | self.state, | ||||
| self.skipped, | self.skipped, | ||||
| self.obsoletenotrebased, | self.obsoletenotrebased, | ||||
| ) | ) | ||||
| if not self.inmemory and len(repo[None].parents()) == 2: | if self.resume and self.wctx.p1().rev() == p1: | ||||
| repo.ui.debug(b'resuming interrupted rebase\n') | repo.ui.debug(b'resuming interrupted rebase\n') | ||||
| self.resume = False | |||||
| else: | else: | ||||
| overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | ||||
| with ui.configoverride(overrides, b'rebase'): | with ui.configoverride(overrides, b'rebase'): | ||||
| stats = rebasenode( | stats = rebasenode( | ||||
| repo, | repo, | ||||
| rev, | rev, | ||||
| p1, | p1, | ||||
| base, | base, | ||||