This is an archive of the discontinued Mercurial Phabricator instance.

Differential D652

blackbox: simplify ui states
ClosedPublic

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

Details

Reviewers
durham
yuja
Group Reviewers
hg-reviewers
Commits
rHGa37e18b5f055: blackbox: simplify ui states
Summary

It seems cleaner to just remove _partialinit, copy, __init__. This
patch makes it so by using getattr in log so those fields do not need to
be existed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 7 2017, 1:32 AM
durham accepted this revision.Sep 7 2017, 8:22 PM
yuja requested changes to this revision.Sep 12 2017, 10:08 AM
yuja added a subscriber: yuja.

uisetup() only replaces the __class__. Can we be sure that blackboxui.__init__()
was called prior to ui.log() ?

This revision now requires changes to proceed.Sep 12 2017, 10:08 AM
quark added a comment.Sep 12 2017, 2:04 PM

Good catch! I should have been aware of that since that's part of the experience working on chg. I still want to simplify the interface. Maybe we can remove __init__ and copy instead.

quark edited the summary of this revision. (Show Details)Sep 18 2017, 7:03 PM
quark retitled this revision from blackbox: remove _partialinit to blackbox: simplify ui states.
quark updated this revision to Diff 1878.
yuja accepted this revision.Sep 19 2017, 10:33 AM

Looks good.

This revision is now accepted and ready to land.Sep 19 2017, 10:33 AM
Closed by commit rHGa37e18b5f055: blackbox: simplify ui states (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 (29 lines)

Diff 1878

hgext/blackbox.py

configitem('blackbox', 'logsource', configitem('blackbox', 'logsource',
default=False, default=False,
) )
lastui = None lastui = None
def wrapui(ui): def wrapui(ui):
class blackboxui(ui.__class__): class blackboxui(ui.__class__):
def __init__(self, src=None):
super(blackboxui, self).__init__(src)
if src is None:
self._partialinit()
else:
self._bbinlog = False
self._bbrepo = getattr(src, '_bbrepo', None)
def _partialinit(self):
if self._bbvfs:
return
self._bbinlog = False
self._bbrepo = None
def copy(self):
self._partialinit()
return self.__class__(self)
@property @property
def _bbvfs(self): def _bbvfs(self):
repo = getattr(self, '_bbrepo', None) repo = getattr(self, '_bbrepo', None)
if repo: if repo:
return repo.vfs return repo.vfs
@util.propertycache @util.propertycache
def track(self): def track(self):
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 self._bbvfs(name, 'a')
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)
self._partialinit()
if not '*' in self.track and not event in self.track: if not '*' in self.track and not event in self.track:
return return
if self._bbvfs: if self._bbvfs:
ui = self ui = self
else: else:
# certain ui instances exist outside the context of # certain ui instances exist outside the context of
# a repo, so just default to the last blackbox that # a repo, so just default to the last blackbox that
# was seen. # was seen.
ui = lastui ui = lastui
if not ui: if not ui:
return return
if not lastui or ui._bbrepo: repo = getattr(ui, '_bbrepo', None)
if not lastui or repo:
lastui = ui lastui = ui
if ui._bbinlog: if getattr(ui, '_bbinlog', False):
# recursion and failure guard # recursion and failure guard
return return
try: 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 ui._bbrepo: if repo:
ctx = ui._bbrepo[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:
# 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: finally:
pass pass
def setrepo(self, repo): def setrepo(self, repo):
self._bbinlog = False
self._bbrepo = repo self._bbrepo = repo
ui.__class__ = blackboxui ui.__class__ = blackboxui
uimod.ui = blackboxui uimod.ui = blackboxui
def uisetup(ui): def uisetup(ui):
wrapui(ui) wrapui(ui)