Patchwork D5279: rebase: fix two ui.logs to actually have text when using default blackbox log

login
register
mail settings
Submitter phabricator
Date Nov. 16, 2018, 12:59 p.m.
Message ID <ba126b545dbd29e6319a9a3441373f3c@localhost.localdomain>
Download mbox | patch
Permalink /patch/36624/
State Not Applicable
Headers show

Comments

phabricator - Nov. 16, 2018, 12:59 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7ce3662bf1bc: rebase: fix two ui.logs to actually have text when using default blackbox log (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5279?vs=12551&id=12555

REVISION DETAIL
  https://phab.mercurial-scm.org/D5279

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: spectral, martinvonz, #hg-reviewers, lothiraldan
Cc: lothiraldan, mercurial-devel
Yuya Nishihara - Nov. 16, 2018, 1:51 p.m.
> +        self.repo.ui.log("rebase",
> +                         "using in-memory rebase: %r\n" % self.inmemory,

Updated as `"...%r\n", self.inmemory`, so string formatting wouldn't be run
unless blackbox or logtoprocess is enabled.
phabricator - Nov. 16, 2018, 1:58 p.m.
yuja added a comment.


  > +        self.repo.ui.log("rebase",
  >  +                         "using in-memory rebase: %r\n" % self.inmemory,
  
  Updated as `"...%r\n", self.inmemory`, so string formatting wouldn't be run
  unless blackbox or logtoprocess is enabled.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5279

To: spectral, martinvonz, #hg-reviewers, lothiraldan
Cc: yuja, lothiraldan, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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)