This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1166

ui: move request exit handlers to global state
ClosedPublic

Authored by singhsrb on Oct 17 2017, 4:23 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHGe9f320a40b44: ui: move request exit handlers to global state
rHG2bcf27922651: ui: move request exit handlers to global state
Summary

Since the ui objects can be created with the 'load' class method, it
is possible to lose the exit handlers information from the old ui instance. For
example, running 'test-bad-extension.t' leads to this situation where chg
creates a new ui instance which does not copy the exit handlers from the
earlier ui instance. For exit handlers, which are special cases anyways, it
probably makes sense to have a global state of the handlers. This would ensure
that the exit handlers registered once are definitely executed at the end of
the request.

Test Plan

Ran all the tests without '--chg' option. This also fixes the
'test-bad-extension.t' with the '--chg' option.

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

singhsrb created this revision.Oct 17 2017, 4:23 PM
quark accepted this revision.Oct 17 2017, 5:18 PM
quark added a subscriber: quark.

This was discussed internally. Exit handlers should be per process (ex. "global"), non-copyable to avoid run them multiple times. So this change is a pure improvement.

durin42 accepted this revision.Oct 18 2017, 4:07 PM
This revision is now accepted and ready to land.Oct 18 2017, 4:07 PM
Closed by commit rHG2bcf27922651: ui: move request exit handlers to global state (authored by singhsrb). · Explain WhyOct 18 2017, 4:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (10 lines)

Diff 2994

mercurial/ui.py

def _catchterm(*args): def _catchterm(*args):
raise error.SignalInterrupt raise error.SignalInterrupt
# unique object used to detect no default value has been provided when # unique object used to detect no default value has been provided when
# retrieving configuration value. # retrieving configuration value.
_unset = object() _unset = object()
# _reqexithandlers: callbacks run at the end of a request
_reqexithandlers = []
class ui(object): class ui(object):
def __init__(self, src=None): def __init__(self, src=None):
"""Create a fresh new ui object if no src given """Create a fresh new ui object if no src given
Use uimod.ui.load() to create a ui which knows global and user configs. Use uimod.ui.load() to create a ui which knows global and user configs.
In most cases, you should use ui.copy() to create a copy of an existing In most cases, you should use ui.copy() to create a copy of an existing
ui object. ui object.
""" """
# _buffers: used for temporary capture of output # _buffers: used for temporary capture of output
self._buffers = [] self._buffers = []
# _exithandlers: callbacks run at the end of a request
self._exithandlers = []
# 3-tuple describing how each buffer in the stack behaves. # 3-tuple describing how each buffer in the stack behaves.
# Values are (capture stderr, capture subprocesses, apply labels). # Values are (capture stderr, capture subprocesses, apply labels).
self._bufferstates = [] self._bufferstates = []
# When a buffer is active, defines whether we are expanding labels. # When a buffer is active, defines whether we are expanding labels.
# This exists to prevent an extra list lookup. # This exists to prevent an extra list lookup.
self._bufferapplylabels = None self._bufferapplylabels = None
self.quiet = self.verbose = self.debugflag = self.tracebackflag = False self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
self._reportuntrusted = True self._reportuntrusted = True
# Blocked time # Blocked time
self.logblockedtimes = False self.logblockedtimes = False
# color mode: see mercurial/color.py for possible value # color mode: see mercurial/color.py for possible value
self._colormode = None self._colormode = None
self._terminfoparams = {} self._terminfoparams = {}
self._styles = {} self._styles = {}
if src: if src:
self._exithandlers = src._exithandlers
self.fout = src.fout self.fout = src.fout
self.ferr = src.ferr self.ferr = src.ferr
self.fin = src.fin self.fin = src.fin
self.pageractive = src.pageractive self.pageractive = src.pageractive
self._disablepager = src._disablepager self._disablepager = src._disablepager
self._tweaked = src._tweaked self._tweaked = src._tweaked
self._tcfg = src._tcfg.copy() self._tcfg = src._tcfg.copy()
# restore original fds, closing pager.stdin copies in the process # restore original fds, closing pager.stdin copies in the process
os.dup2(stdoutfd, util.stdout.fileno()) os.dup2(stdoutfd, util.stdout.fileno())
os.dup2(stderrfd, util.stderr.fileno()) os.dup2(stderrfd, util.stderr.fileno())
pager.stdin.close() pager.stdin.close()
pager.wait() pager.wait()
return True return True
@property
def _exithandlers(self):
return _reqexithandlers
def atexit(self, func, *args, **kwargs): def atexit(self, func, *args, **kwargs):
'''register a function to run after dispatching a request '''register a function to run after dispatching a request
Handlers do not stay registered across request boundaries.''' Handlers do not stay registered across request boundaries.'''
self._exithandlers.append((func, args, kwargs)) self._exithandlers.append((func, args, kwargs))
return func return func
def interface(self, feature): def interface(self, feature):