Mercurial > hg-stable
changeset 35491: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 | 4c7ae95e1c71 |
| children | 4f5596e5e311 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Dec 22 21:25:46 2017 +0800 +++ b/hgext/rebase.py Fri Dec 22 13:13:45 2017 -0600 @@ -390,9 +390,7 @@ 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 @@ # 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.