diff --git a/hgext/rebase.py b/hgext/rebase.py index 03bec089e105b2a02951b80043a5bb94a60bb2c7_aGdleHQvcmViYXNlLnB5..8dba17546016981475b7bda21b29e9267566fce7_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -382,11 +382,9 @@ self.prepared = True - def _performrebase(self, tr): - repo, ui = self.repo, self.ui - # Assign a working copy object. + def _assignworkingcopy(self): if self.inmemory: from mercurial.context import overlayworkingctx self.wctx = overlayworkingctx(self.repo) else: self.wctx = self.repo[None] @@ -388,8 +386,12 @@ if self.inmemory: from mercurial.context import overlayworkingctx self.wctx = overlayworkingctx(self.repo) else: self.wctx = self.repo[None] + + def _performrebase(self, tr): + self._assignworkingcopy() + repo, ui = self.repo, self.ui if self.keepbranchesf: # insert _savebranch at the start of extrafns so if # there's a user-provided extrafn it can clobber branch if