comparison hgext/blackbox.py @ 40760:ffd574c144d2

ui: pass in formatted message to logger.log() This makes sure that all logger instances will handle the message arguments properly.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 11 Nov 2018 19:35:33 +0900
parents fdc6eb1d650d
children 37d6ee46a965
comparison
equal deleted inserted replaced
40759:fdc6eb1d650d 40760:ffd574c144d2
158 def _log(self, ui, event, msg, opts): 158 def _log(self, ui, event, msg, opts):
159 default = ui.configdate('devel', 'default-date') 159 default = ui.configdate('devel', 'default-date')
160 date = dateutil.datestr(default, ui.config('blackbox', 'date-format')) 160 date = dateutil.datestr(default, ui.config('blackbox', 'date-format'))
161 user = procutil.getuser() 161 user = procutil.getuser()
162 pid = '%d' % procutil.getpid() 162 pid = '%d' % procutil.getpid()
163 formattedmsg = msg[0] % msg[1:]
164 rev = '(unknown)' 163 rev = '(unknown)'
165 changed = '' 164 changed = ''
166 ctx = self._repo[None] 165 ctx = self._repo[None]
167 parents = ctx.parents() 166 parents = ctx.parents()
168 rev = ('+'.join([hex(p.node()) for p in parents])) 167 rev = ('+'.join([hex(p.node()) for p in parents]))
173 src = ' [%s]' % event 172 src = ' [%s]' % event
174 else: 173 else:
175 src = '' 174 src = ''
176 try: 175 try:
177 fmt = '%s %s @%s%s (%s)%s> %s' 176 fmt = '%s %s @%s%s (%s)%s> %s'
178 args = (date, user, rev, changed, pid, src, formattedmsg) 177 args = (date, user, rev, changed, pid, src, msg)
179 with _openlogfile(ui, self._bbvfs) as fp: 178 with _openlogfile(ui, self._bbvfs) as fp:
180 fp.write(fmt % args) 179 fp.write(fmt % args)
181 except (IOError, OSError) as err: 180 except (IOError, OSError) as err:
182 # deactivate this to avoid failed logging again 181 # deactivate this to avoid failed logging again
183 self._repo = None 182 self._repo = None