Mercurial > hg
changeset 40650:ea84c2b286a2
rebase: fix two ui.logs to actually have text when using default blackbox log
Some implementations of ui.log record structured information along with the
ui.log which can be used for metrics, but ui.log() as implemented by the
blackbox logging does not do anything special with this, and we end up with a
log line with no text (not even a line break) so it ends up looking something
like:
date time user @node (pid) [rebase]> date time user @node (pid) ...
Differential Revision: https://phab.mercurial-scm.org/D5279
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 15 Nov 2018 13:16:46 -0800 |
| parents | f83cea7f54d7 |
| children | 1243295fcc3a |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Nov 15 11:22:32 2018 -0800 +++ b/hgext/rebase.py Thu Nov 15 13:16:46 2018 -0800 @@ -404,7 +404,9 @@ else: self.wctx = self.repo[None] self.repo.ui.debug("rebasing on disk\n") - self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory) + self.repo.ui.log("rebase", + "using in-memory rebase: %r\n", self.inmemory, + rebase_imm_used=self.inmemory) def _performrebase(self, tr): self._assignworkingcopy() @@ -1076,7 +1078,8 @@ return None rebasingwcp = repo['.'].rev() in rebaseset - ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) + ui.log("rebase", "rebasing working copy parent: %r\n", rebasingwcp, + rebase_rebasing_wcp=rebasingwcp) if inmemory and rebasingwcp: # Check these since we did not before. cmdutil.checkunfinished(repo)