This is an archive of the discontinued Mercurial Phabricator instance.

Differential D91

fastannotate: mark as wlock safe
ClosedPublic

Authored by quark on Jul 14 2017, 7:05 PM.
Tags
None
Subscribers
durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX1c1959423122: fastannotate: mark as wlock safe
Summary

fastannotate has its own file-level flock implementation and does not need
to use the repo lock.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Jul 14 2017, 7:05 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 14 2017, 7:05 PM
durham accepted this revision.Jul 14 2017, 7:06 PM
durham added a subscriber: durham.
durham added inline comments.
hgext3rd/fastannotate/__init__.py
161

You can add it to the class level variable. Then you can do it in extsetup

localrep.localrepository._wlockfreeprefix.add(...)

This revision is now accepted and ready to land.Jul 14 2017, 7:06 PM
quark updated this revision to Diff 173.Jul 14 2017, 7:11 PM
Closed by commit rFBHGX1c1959423122: fastannotate: mark as wlock safe (authored by quark). · Explain WhyJul 17 2017, 7:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fastannotate/__init__.py (4 lines)

Diff 194

hgext3rd/fastannotate/__init__.py

perfhack = True perfhack = True
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error as hgerror, error as hgerror,
localrepo,
util, util,
) )
from . import ( from . import (
commands, commands,
context, context,
protocol, protocol,
) )
raise hgerror.Abort(_('fastannotate: invalid mode: %s') % name) raise hgerror.Abort(_('fastannotate: invalid mode: %s') % name)
if ui.configbool('fastannotate', 'server'): if ui.configbool('fastannotate', 'server'):
protocol.serveruisetup(ui) protocol.serveruisetup(ui)
if ui.configbool('fastannotate', 'useflock', _flockavailable()): if ui.configbool('fastannotate', 'useflock', _flockavailable()):
context.pathhelper.lock = context.pathhelper._lockflock context.pathhelper.lock = context.pathhelper._lockflock
# fastannotate has its own locking, without depending on repo lock
localrepo.localrepository._wlockfreeprefix.add('fastannotate/')
def reposetup(ui, repo): def reposetup(ui, repo):
client = ui.configbool('fastannotate', 'client', default=None) client = ui.configbool('fastannotate', 'client', default=None)
if client is None: if client is None:
if util.safehasattr(repo, 'requirements'): if util.safehasattr(repo, 'requirements'):
durhamUnsubmitted
Not Done

You can add it to the class level variable. Then you can do it in extsetup

localrep.localrepository._wlockfreeprefix.add(...)

durham: You can add it to the class level variable. Then you can do it in extsetup localrep.
client = 'remotefilelog' in repo.requirements client = 'remotefilelog' in repo.requirements
if client: if client:
protocol.clientreposetup(ui, repo) protocol.clientreposetup(ui, repo)