# HG changeset patch # User Phil Cohen # Date 2017-12-22 19:13:45 # Node ID bf556bd2f589db3d9952ff269f6faa12875346b9 # Parent 4c7ae95e1c714c6e35795fab4a8d2d6e31764b8c rebase: switch ui.log calls to common style The old style raised errors in some cases. Differential Revision: https://phab.mercurial-scm.org/D1748 diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -390,9 +390,7 @@ class rebaseruntime(object): else: self.wctx = self.repo[None] self.repo.ui.debug("rebasing on disk\n") - self.repo.ui.log("rebase", "", { - 'rebase_imm_used': self.wctx.isinmemory() - }) + self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory()) def _performrebase(self, tr): self._assignworkingcopy() @@ -966,7 +964,7 @@ def _definedestmap(ui, repo, rbsrt, dest # stacks that include the WCP. However, I'm not yet sure where the cutoff # is. rebasingwcp = repo['.'].rev() in rebaseset - ui.log("rebase", "", {'rebase_rebasing_wcp': rebasingwcp}) + ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) if rbsrt.inmemory and rebasingwcp: rbsrt.inmemory = False # Check these since we did not before.