Mercurial > hg
comparison hgext/rebase.py @ 35487:bf556bd2f589
rebase: switch ui.log calls to common style
The old style raised errors in some cases.
Differential Revision: https://phab.mercurial-scm.org/D1748
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Fri, 22 Dec 2017 13:13:45 -0600 |
parents | 01b084914a60 |
children | c5d220a621e7 |
comparison
equal
deleted
inserted
replaced
35486:4c7ae95e1c71 | 35487:bf556bd2f589 |
---|---|
388 self.wctx = overlayworkingctx(self.repo) | 388 self.wctx = overlayworkingctx(self.repo) |
389 self.repo.ui.debug("rebasing in-memory\n") | 389 self.repo.ui.debug("rebasing in-memory\n") |
390 else: | 390 else: |
391 self.wctx = self.repo[None] | 391 self.wctx = self.repo[None] |
392 self.repo.ui.debug("rebasing on disk\n") | 392 self.repo.ui.debug("rebasing on disk\n") |
393 self.repo.ui.log("rebase", "", { | 393 self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory()) |
394 'rebase_imm_used': self.wctx.isinmemory() | |
395 }) | |
396 | 394 |
397 def _performrebase(self, tr): | 395 def _performrebase(self, tr): |
398 self._assignworkingcopy() | 396 self._assignworkingcopy() |
399 repo, ui = self.repo, self.ui | 397 repo, ui = self.repo, self.ui |
400 if self.keepbranchesf: | 398 if self.keepbranchesf: |
964 # | 962 # |
965 # Note that there are cases where this isn't true -- e.g., rebasing large | 963 # Note that there are cases where this isn't true -- e.g., rebasing large |
966 # stacks that include the WCP. However, I'm not yet sure where the cutoff | 964 # stacks that include the WCP. However, I'm not yet sure where the cutoff |
967 # is. | 965 # is. |
968 rebasingwcp = repo['.'].rev() in rebaseset | 966 rebasingwcp = repo['.'].rev() in rebaseset |
969 ui.log("rebase", "", {'rebase_rebasing_wcp': rebasingwcp}) | 967 ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) |
970 if rbsrt.inmemory and rebasingwcp: | 968 if rbsrt.inmemory and rebasingwcp: |
971 rbsrt.inmemory = False | 969 rbsrt.inmemory = False |
972 # Check these since we did not before. | 970 # Check these since we did not before. |
973 cmdutil.checkunfinished(repo) | 971 cmdutil.checkunfinished(repo) |
974 cmdutil.bailifchanged(repo) | 972 cmdutil.bailifchanged(repo) |