Mercurial > hg
changeset 46835:c2438f2f635c
rebase: set `prepared = True` at very end of `_preparenewrebase()`
Once we've set `rebaseruntime.prepared = True`, `rebaseruntime.repo`
starts returning the unfiltered repo. That will make my next patch
break, because that patch moves the call to `rewriteutil.precheck()`
after the call to `_handleskippingobsolete()`, which current happens
after `prepared = True`. We therefore need to prepare by moving
`prepared = True` a bit later, after `_handleskippingobsolete()`. I
don't think that matters for that call.
Differential Revision: https://phab.mercurial-scm.org/D10257
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 23 Mar 2021 14:49:31 -0700 |
| parents | 535de0e34a79 |
| children | 80cac9936324 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Mar 19 22:52:59 2021 -0700 +++ b/hgext/rebase.py Tue Mar 23 14:49:31 2021 -0700 @@ -447,11 +447,11 @@ if dest.closesbranch() and not self.keepbranchesf: self.ui.status(_(b'reopening closed branch head %s\n') % dest) - self.prepared = True - # Calculate self.obsolete_* sets self._handleskippingobsolete() + self.prepared = True + def _assignworkingcopy(self): if self.inmemory: from mercurial.context import overlayworkingctx @@ -2192,7 +2192,6 @@ obsolete_with_successor_in_destination = {} obsolete_with_successor_in_rebase_set = set() - assert repo.filtername is None cl = repo.changelog get_rev = cl.index.get_rev extinctrevs = set(repo.revs(b'extinct()'))