This is an archive of the discontinued Mercurial Phabricator instance.

Differential D654

blackbox: unindent a try block
ClosedPublic

Authored by quark on Sep 7 2017, 1:33 AM.

Details

Reviewers
durham
yuja
Group Reviewers
hg-reviewers
Commits
rHG86a5df995880: blackbox: unindent a try block
Summary

The try block is no longer necessary.

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

quark created this revision.Sep 7 2017, 1:33 AM
durham accepted this revision.Sep 7 2017, 8:22 PM
quark updated this revision to Diff 1879.Sep 18 2017, 7:03 PM
yuja requested changes to this revision.Sep 19 2017, 10:40 AM
yuja added a subscriber: yuja.

This look like doing more than "unindent a try block".

hgext/blackbox.py
153

ui._bbrepo might be unset.

This revision now requires changes to proceed.Sep 19 2017, 10:40 AM
quark added a comment.Sep 19 2017, 12:43 PM

Sorry, did a wrong merge resolution. Will fix soon.

quark updated this revision to Diff 1897.Sep 19 2017, 1:50 PM
yuja accepted this revision.Sep 20 2017, 8:46 AM

Queued the series, thanks.

This revision is now accepted and ready to land.Sep 20 2017, 8:46 AM
Closed by commit rHG86a5df995880: blackbox: unindent a try block (authored by quark). · Explain WhySep 20 2017, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/blackbox.py (63 lines)

Diff 1921

hgext/blackbox.py

if not ui: if not ui:
return return
repo = getattr(ui, '_bbrepo', None) repo = getattr(ui, '_bbrepo', None)
if not lastui or repo: if not lastui or repo:
lastui = ui lastui = ui
if getattr(ui, '_bbinlog', False): if getattr(ui, '_bbinlog', False):
# recursion and failure guard # recursion and failure guard
return return
try:
ui._bbinlog = True ui._bbinlog = True
default = self.configdate('devel', 'default-date') default = self.configdate('devel', 'default-date')
date = util.datestr(default, '%Y/%m/%d %H:%M:%S') date = util.datestr(default, '%Y/%m/%d %H:%M:%S')
user = util.getuser() user = util.getuser()
pid = '%d' % util.getpid() pid = '%d' % util.getpid()
formattedmsg = msg[0] % msg[1:] formattedmsg = msg[0] % msg[1:]
rev = '(unknown)' rev = '(unknown)'
changed = '' changed = ''
if repo: if repo:
yujaUnsubmitted
Not Done

ui._bbrepo might be unset.

yuja: ui._bbrepo might be unset.
ctx = repo[None] ctx = repo[None]
parents = ctx.parents() parents = ctx.parents()
rev = ('+'.join([hex(p.node()) for p in parents])) rev = ('+'.join([hex(p.node()) for p in parents]))
if (ui.configbool('blackbox', 'dirty') and if (ui.configbool('blackbox', 'dirty') and
ctx.dirty(missing=True, merge=False, branch=False)): ctx.dirty(missing=True, merge=False, branch=False)):
changed = '+' changed = '+'
if ui.configbool('blackbox', 'logsource'): if ui.configbool('blackbox', 'logsource'):
src = ' [%s]' % event src = ' [%s]' % event
else: else:
src = '' src = ''
try: try:
fmt = '%s %s @%s%s (%s)%s> %s' fmt = '%s %s @%s%s (%s)%s> %s'
args = (date, user, rev, changed, pid, src, formattedmsg) args = (date, user, rev, changed, pid, src, formattedmsg)
with ui._openlogfile() as fp: with ui._openlogfile() as fp:
fp.write(fmt % args) fp.write(fmt % args)
except (IOError, OSError) as err: except (IOError, OSError) as err:
self.debug('warning: cannot write to blackbox.log: %s\n' % self.debug('warning: cannot write to blackbox.log: %s\n' %
err.strerror) err.strerror)
# do not restore _bbinlog intentionally to avoid failed # do not restore _bbinlog intentionally to avoid failed
# logging again # logging again
else: else:
ui._bbinlog = False ui._bbinlog = False
finally:
pass
def setrepo(self, repo): def setrepo(self, repo):
self._bbrepo = repo self._bbrepo = repo
ui.__class__ = blackboxui ui.__class__ = blackboxui
uimod.ui = blackboxui uimod.ui = blackboxui
def uisetup(ui): def uisetup(ui):