D1748: rebase: switch ui.log calls to common style
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Dec 22 19:16:21 UTC 2017
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The old style raised errors in some cases.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1748
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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()
@@ -960,7 +958,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.
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list