This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1612

fsmonitor: fsmonitor should send wlock notifications to watchman
ClosedPublic

Authored by • ekent on Dec 6 2017, 9:54 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc67fb3bfe3a1: fsmonitor: fsmonitor should send wlock notifications to watchman
Summary

The fsmonitor extension should send state-enter and state-leave
notifications to watchman when the wlock is acquired/release, respectively.
This will allow watchman and watchman subscribers to customize behavior based
on whether source control operations are occurring.

Test Plan

Tested checkout, update and working copy changes with extension enabled.

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

• ekent created this revision.Dec 6 2017, 9:54 PM
durin42 mentioned this in D1611: fsmonitor: remove watchman transaction and working copy change notifications.Dec 7 2017, 2:19 PM
durin42 added a subscriber: durin42.

This looks fine to me, assuming I'm right that D1611 and D1612 have swapped commit messages...

• ekent retitled this revision from fsmonitor: remove watchman transaction and working copy change notifications to fsmonitor: fsmonitor should send wlock notifications to watchman.Dec 7 2017, 7:38 PM
• ekent edited the summary of this revision. (Show Details)
durin42 accepted this revision.Dec 8 2017, 2:32 PM
This revision is now accepted and ready to land.Dec 8 2017, 2:32 PM
Closed by commit rHGc67fb3bfe3a1: fsmonitor: fsmonitor should send wlock notifications to watchman (authored by • ekent). · Explain WhyDec 8 2017, 2:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (49 lines)

Diff 4257

hgext/fsmonitor/__init__.py

default=False, default=False,
) )
configitem('fsmonitor', 'timeout', configitem('fsmonitor', 'timeout',
default='2', default='2',
) )
configitem('fsmonitor', 'blacklistusers', configitem('fsmonitor', 'blacklistusers',
default=list, default=list,
) )
configitem('experimental', 'fsmonitor.transaction_notify',
default=False,
)
# This extension is incompatible with the following blacklisted extensions # This extension is incompatible with the following blacklisted extensions
# and will disable itself when encountering one of these: # and will disable itself when encountering one of these:
_blacklist = ['largefiles', 'eol'] _blacklist = ['largefiles', 'eol']
def _handleunavailable(ui, state, ex): def _handleunavailable(ui, state, ex):
"""Exception handler for Watchman interaction exceptions""" """Exception handler for Watchman interaction exceptions"""
if isinstance(ex, watchmanclient.Unavailable): if isinstance(ex, watchmanclient.Unavailable):
self.partial = partial self.partial = partial
self._lock = None self._lock = None
self.need_leave = False self.need_leave = False
def __enter__(self): def __enter__(self):
self.enter() self.enter()
def enter(self): def enter(self):
# We explicitly need to take a lock here, before we proceed to update # Make sure we have a wlock prior to sending notifications to watchman.
# watchman about the update operation, so that we don't race with # We don't want to race with other actors. In the update case,
# some other actor. merge.update is going to take the wlock almost # merge.update is going to take the wlock almost immediately. We are
# immediately anyway, so this is effectively extending the lock # effectively extending the lock around several short sanity checks.
# around a couple of short sanity checks.
if self.oldnode is None: if self.oldnode is None:
self.oldnode = self.repo['.'].node() self.oldnode = self.repo['.'].node()
if self.repo.currentwlock() is None:
if util.safehasattr(self.repo, 'wlocknostateupdate'):
self._lock = self.repo.wlocknostateupdate()
else:
self._lock = self.repo.wlock() self._lock = self.repo.wlock()
self.need_leave = self._state( self.need_leave = self._state(
'state-enter', 'state-enter',
hex(self.oldnode)) hex(self.oldnode))
return self return self
def __exit__(self, type_, value, tb): def __exit__(self, type_, value, tb):
abort = True if type_ else False abort = True if type_ else False
self.exit(abort=abort) self.exit(abort=abort)
# repo.dirstate is not a fsmonitordirstate # repo.dirstate is not a fsmonitordirstate
makedirstate(repo, dirstate) makedirstate(repo, dirstate)
class fsmonitorrepo(repo.__class__): class fsmonitorrepo(repo.__class__):
def status(self, *args, **kwargs): def status(self, *args, **kwargs):
orig = super(fsmonitorrepo, self).status orig = super(fsmonitorrepo, self).status
return overridestatus(orig, self, *args, **kwargs) return overridestatus(orig, self, *args, **kwargs)
def wlocknostateupdate(self, *args, **kwargs):
return super(fsmonitorrepo, self).wlock(*args, **kwargs)
def wlock(self, *args, **kwargs):
l = super(fsmonitorrepo, self).wlock(*args, **kwargs)
if not ui.configbool(
"experimental", "fsmonitor.transaction_notify"):
return l
if l.held != 1:
return l
origrelease = l.releasefn
def staterelease():
if origrelease:
origrelease()
if l.stateupdate:
l.stateupdate.exit()
l.stateupdate = None
try:
l.stateupdate = None
l.stateupdate = state_update(self, name="hg.transaction")
l.stateupdate.enter()
l.releasefn = staterelease
except Exception as e:
# Swallow any errors; fire and forget
self.ui.log(
'watchman', 'Exception in state update %s\n', e)
return l
repo.__class__ = fsmonitorrepo repo.__class__ = fsmonitorrepo