| hg-reviewers |
This removes several stat syscalls for accessing _bbvfs and makes ui
object cleaner.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| default='1 MB', | default='1 MB', | ||||
| ) | ) | ||||
| configitem('blackbox', 'logsource', | configitem('blackbox', 'logsource', | ||||
| default=False, | default=False, | ||||
| ) | ) | ||||
| lastui = None | lastui = None | ||||
| def wrapui(ui): | def _openlogfile(ui, vfs): | ||||
| class blackboxui(ui.__class__): | |||||
| @property | |||||
| def _bbvfs(self): | |||||
| vfs = None | |||||
| repo = getattr(self, '_bbrepo', None) | |||||
| if repo: | |||||
| vfs = repo.vfs | |||||
| if not vfs.isdir('.'): | |||||
| vfs = None | |||||
| return vfs | |||||
| @util.propertycache | |||||
| def track(self): | |||||
| return self.configlist('blackbox', 'track', ['*']) | |||||
| def _openlogfile(self): | |||||
| def rotate(oldpath, newpath): | def rotate(oldpath, newpath): | ||||
| try: | try: | ||||
| self._bbvfs.unlink(newpath) | vfs.unlink(newpath) | ||||
| except OSError as err: | except OSError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| self.debug("warning: cannot remove '%s': %s\n" % | ui.debug("warning: cannot remove '%s': %s\n" % | ||||
| (newpath, err.strerror)) | (newpath, err.strerror)) | ||||
| try: | try: | ||||
| if newpath: | if newpath: | ||||
| self._bbvfs.rename(oldpath, newpath) | vfs.rename(oldpath, newpath) | ||||
| except OSError as err: | except OSError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| self.debug("warning: cannot rename '%s' to '%s': %s\n" % | ui.debug("warning: cannot rename '%s' to '%s': %s\n" % | ||||
| (newpath, oldpath, err.strerror)) | (newpath, oldpath, err.strerror)) | ||||
| maxsize = self.configbytes('blackbox', 'maxsize') | maxsize = ui.configbytes('blackbox', 'maxsize') | ||||
| name = 'blackbox.log' | name = 'blackbox.log' | ||||
| if maxsize > 0: | if maxsize > 0: | ||||
| try: | try: | ||||
| st = self._bbvfs.stat(name) | st = vfs.stat(name) | ||||
| except OSError: | except OSError: | ||||
| pass | pass | ||||
| else: | else: | ||||
| if st.st_size >= maxsize: | if st.st_size >= maxsize: | ||||
| path = self._bbvfs.join(name) | path = vfs.join(name) | ||||
| maxfiles = self.configint('blackbox', 'maxfiles', 7) | maxfiles = ui.configint('blackbox', 'maxfiles', 7) | ||||
| for i in xrange(maxfiles - 1, 1, -1): | for i in xrange(maxfiles - 1, 1, -1): | ||||
| rotate(oldpath='%s.%d' % (path, i - 1), | rotate(oldpath='%s.%d' % (path, i - 1), | ||||
| newpath='%s.%d' % (path, i)) | newpath='%s.%d' % (path, i)) | ||||
| rotate(oldpath=path, | rotate(oldpath=path, | ||||
| newpath=maxfiles > 0 and path + '.1') | newpath=maxfiles > 0 and path + '.1') | ||||
| return self._bbvfs(name, 'a') | return vfs(name, 'a') | ||||
| def wrapui(ui): | |||||
| class blackboxui(ui.__class__): | |||||
| @property | |||||
| def _bbvfs(self): | |||||
| vfs = None | |||||
| repo = getattr(self, '_bbrepo', None) | |||||
| if repo: | |||||
| vfs = repo.vfs | |||||
| if not vfs.isdir('.'): | |||||
| vfs = None | |||||
| return vfs | |||||
| @util.propertycache | |||||
| def track(self): | |||||
| return self.configlist('blackbox', 'track', ['*']) | |||||
| def log(self, event, *msg, **opts): | def log(self, event, *msg, **opts): | ||||
| global lastui | global lastui | ||||
| super(blackboxui, self).log(event, *msg, **opts) | super(blackboxui, self).log(event, *msg, **opts) | ||||
| if not '*' in self.track and not event in self.track: | if not '*' in self.track and not event in self.track: | ||||
| return | return | ||||
| 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 _openlogfile(ui, vfs) 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 | ||||