Show More
@@ -382,14 +382,16 b' class rebaseruntime(object):' | |||||
382 |
|
382 | |||
383 | self.prepared = True |
|
383 | self.prepared = True | |
384 |
|
384 | |||
385 | def _performrebase(self, tr): |
|
385 | def _assignworkingcopy(self): | |
386 | repo, ui = self.repo, self.ui |
|
|||
387 | # Assign a working copy object. |
|
|||
388 | if self.inmemory: |
|
386 | if self.inmemory: | |
389 | from mercurial.context import overlayworkingctx |
|
387 | from mercurial.context import overlayworkingctx | |
390 | self.wctx = overlayworkingctx(self.repo) |
|
388 | self.wctx = overlayworkingctx(self.repo) | |
391 | else: |
|
389 | else: | |
392 | self.wctx = self.repo[None] |
|
390 | self.wctx = self.repo[None] | |
|
391 | ||||
|
392 | def _performrebase(self, tr): | |||
|
393 | self._assignworkingcopy() | |||
|
394 | repo, ui = self.repo, self.ui | |||
393 | if self.keepbranchesf: |
|
395 | if self.keepbranchesf: | |
394 | # insert _savebranch at the start of extrafns so if |
|
396 | # insert _savebranch at the start of extrafns so if | |
395 | # there's a user-provided extrafn it can clobber branch if |
|
397 | # there's a user-provided extrafn it can clobber branch if |
General Comments 0
You need to be logged in to leave comments.
Login now