D654: blackbox: unindent a try block
quark (Jun Wu)
phabricator at mercurial-scm.org
Thu Sep 7 05:33:03 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The try block is no longer necessary.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D654
AFFECTED FILES
hgext/blackbox.py
CHANGE DETAILS
diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -146,40 +146,37 @@
if ui._bbinlog:
# recursion and failure guard
return
+ ui._bbinlog = True
+ default = self.configdate('devel', 'default-date')
+ date = util.datestr(default, '%Y/%m/%d %H:%M:%S')
+ user = util.getuser()
+ pid = '%d' % util.getpid()
+ formattedmsg = msg[0] % msg[1:]
+ rev = '(unknown)'
+ changed = ''
+ if ui._bbrepo:
+ ctx = ui._bbrepo[None]
+ parents = ctx.parents()
+ rev = ('+'.join([hex(p.node()) for p in parents]))
+ if (ui.configbool('blackbox', 'dirty') and
+ ctx.dirty(missing=True, merge=False, branch=False)):
+ changed = '+'
+ if ui.configbool('blackbox', 'logsource'):
+ src = ' [%s]' % event
+ else:
+ src = ''
try:
- ui._bbinlog = True
- default = self.configdate('devel', 'default-date')
- date = util.datestr(default, '%Y/%m/%d %H:%M:%S')
- user = util.getuser()
- pid = '%d' % util.getpid()
- formattedmsg = msg[0] % msg[1:]
- rev = '(unknown)'
- changed = ''
- if ui._bbrepo:
- ctx = ui._bbrepo[None]
- parents = ctx.parents()
- rev = ('+'.join([hex(p.node()) for p in parents]))
- if (ui.configbool('blackbox', 'dirty') and
- ctx.dirty(missing=True, merge=False, branch=False)):
- changed = '+'
- if ui.configbool('blackbox', 'logsource'):
- src = ' [%s]' % event
- else:
- src = ''
- try:
- fmt = '%s %s @%s%s (%s)%s> %s'
- args = (date, user, rev, changed, pid, src, formattedmsg)
- with ui._openlogfile() as fp:
- fp.write(fmt % args)
- except (IOError, OSError) as err:
- self.debug('warning: cannot write to blackbox.log: %s\n' %
- err.strerror)
- # do not restore _bbinlog intentionally to avoid failed
- # logging again
- else:
- ui._bbinlog = False
- finally:
- pass
+ fmt = '%s %s @%s%s (%s)%s> %s'
+ args = (date, user, rev, changed, pid, src, formattedmsg)
+ with ui._openlogfile() as fp:
+ fp.write(fmt % args)
+ except (IOError, OSError) as err:
+ self.debug('warning: cannot write to blackbox.log: %s\n' %
+ err.strerror)
+ # do not restore _bbinlog intentionally to avoid failed
+ # logging again
+ else:
+ ui._bbinlog = False
def setrepo(self, repo):
self._bbinlog = False
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list