D5279: rebase: fix two ui.logs to actually have text when using default blackbox log
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Fri Nov 16 07:59:30 EST 2018
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
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)
To: spectral, martinvonz, #hg-reviewers, lothiraldan
Cc: lothiraldan, mercurial-devel
More information about the Mercurial-devel
mailing list