This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5279

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

Authored by spectral on Nov 15 2018, 5:36 PM.

Details

Reviewers
martinvonz
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHGea84c2b286a2: rebase: fix two ui.logs to actually have text when using default blackbox log
rHG7ce3662bf1bc: rebase: fix two ui.logs to actually have text when using default blackbox log
Summary

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) ...

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Nov 15 2018, 5:36 PM
lothiraldan accepted this revision.Nov 16 2018, 7:58 AM
lothiraldan added a subscriber: lothiraldan.

Looks good to me, queued thanks

Closed by commit rHG7ce3662bf1bc: rebase: fix two ui.logs to actually have text when using default blackbox log (authored by spectral). · Explain WhyNov 16 2018, 7:59 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Nov 16 2018, 8:58 AM

+ 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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)

Diff 12555

hgext/rebase.py

def _assignworkingcopy(self): def _assignworkingcopy(self):
if self.inmemory: if self.inmemory:
from mercurial.context import overlayworkingctx from mercurial.context import overlayworkingctx
self.wctx = overlayworkingctx(self.repo) self.wctx = overlayworkingctx(self.repo)
self.repo.ui.debug("rebasing in-memory\n") self.repo.ui.debug("rebasing in-memory\n")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
self.repo.ui.debug("rebasing on disk\n") 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): def _performrebase(self, tr):
self._assignworkingcopy() self._assignworkingcopy()
repo, ui = self.repo, self.ui repo, ui = self.repo, self.ui
if self.keepbranchesf: if self.keepbranchesf:
# insert _savebranch at the start of extrafns so if # insert _savebranch at the start of extrafns so if
# there's a user-provided extrafn it can clobber branch if # there's a user-provided extrafn it can clobber branch if
# desired # desired
'directory parent is already an ' 'directory parent is already an '
'ancestor of destination %s\n') % dest) 'ancestor of destination %s\n') % dest)
else: # can it happen? else: # can it happen?
ui.status(_('nothing to rebase from %s to %s\n') % ui.status(_('nothing to rebase from %s to %s\n') %
('+'.join(bytes(repo[r]) for r in base), dest)) ('+'.join(bytes(repo[r]) for r in base), dest))
return None return None
rebasingwcp = repo['.'].rev() in rebaseset 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: if inmemory and rebasingwcp:
# Check these since we did not before. # Check these since we did not before.
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if not destf: if not destf:
dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] dest = repo[_destrebase(repo, rebaseset, destspace=destspace)]
destf = bytes(dest) destf = bytes(dest)