This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4201

fastannotate: rip out specialized support for remotefilelog
ClosedPublic

Authored by durin42 on Aug 9 2018, 3:13 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG303dae0136b0: fastannotate: rip out specialized support for remotefilelog
Summary

remotefilelog can choose to collaborate with fastannotate for now if
it needs to, and in the future when we make good on our longstanding
desire to move remotefilelog-like features in-house we'll make sure
things are well-supported via a reasonable interface.

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

durin42 created this revision.Aug 9 2018, 3:13 PM
indygreg accepted this revision.Aug 9 2018, 11:37 PM
This revision is now accepted and ready to land.Aug 9 2018, 11:37 PM
Closed by commit rHG303dae0136b0: fastannotate: rip out specialized support for remotefilelog (authored by durin42). · Explain WhyAug 20 2018, 3:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10474

hgext/fastannotate/__init__.py

server = True server = True
# build annotate cache on demand for every client request (default: True) # build annotate cache on demand for every client request (default: True)
# disabling it could make server response faster, useful when there is a # disabling it could make server response faster, useful when there is a
# cronjob building the cache. # cronjob building the cache.
serverbuildondemand = True serverbuildondemand = True
# update local annotate cache from remote on demand # update local annotate cache from remote on demand
# (default: True for remotefilelog repo, False otherwise) client = False
client = True
# path to use when connecting to the remote server (default: default) # path to use when connecting to the remote server (default: default)
remotepath = default remotepath = default
# share sshpeer with remotefilelog. this would allow fastannotate to peek
# into remotefilelog internals, and steal its sshpeer, or in the reversed
# direction: donate its sshpeer to remotefilelog. disable this if
# fastannotate and remotefilelog should not share a sshpeer when their
# endpoints are different and incompatible. (default: True)
clientsharepeer = True
# minimal length of the history of a file required to fetch linelog from # minimal length of the history of a file required to fetch linelog from
# the server. (default: 10) # the server. (default: 10)
clientfetchthreshold = 10 clientfetchthreshold = 10
# use flock instead of the file existence lock # use flock instead of the file existence lock
# flock may not work well on some network filesystems, but they avoid # flock may not work well on some network filesystems, but they avoid
# creating and deleting files frequently, which is faster when updating # creating and deleting files frequently, which is faster when updating
# the annotate cache in batch. if you have issues with this option, set it # the annotate cache in batch. if you have issues with this option, set it
# #
# * replace the fastannotate `modes` configuration with a collection # * replace the fastannotate `modes` configuration with a collection
# of booleans. # of booleans.
# #
# * Use the templater instead of bespoke formatting # * Use the templater instead of bespoke formatting
# #
# * rename the config knob for updating the local cache from a remote server # * rename the config knob for updating the local cache from a remote server
# #
# * remove the remotefilelog-peer-sharing functionality
#
# * move various global-setup bits to extsetup() or reposetup() # * move various global-setup bits to extsetup() or reposetup()
# #
# * assume repo.requirements will always exist
#
# * move `flock` based locking to a common area # * move `flock` based locking to a common area
# #
# * revise wireprotocol for sharing annotate files # * revise wireprotocol for sharing annotate files
# #
# * figure out a sensible default for `mainbranch` (with the caveat # * figure out a sensible default for `mainbranch` (with the caveat
# that we probably also want to figure out a better term than # that we probably also want to figure out a better term than
# `branch`, see above) # `branch`, see above)
# #
cmdtable = commands.cmdtable cmdtable = commands.cmdtable
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('fastannotate', 'modes', default=['fastannotate']) configitem('fastannotate', 'modes', default=['fastannotate'])
configitem('fastannotate', 'server', default=False) configitem('fastannotate', 'server', default=False)
configitem('fastannotate', 'useflock', default=True) configitem('fastannotate', 'useflock', default=True)
configitem('fastannotate', 'client') configitem('fastannotate', 'client', default=False)
configitem('fastannotate', 'unfilteredrepo', default=True) configitem('fastannotate', 'unfilteredrepo', default=True)
configitem('fastannotate', 'defaultformat', default=['number']) configitem('fastannotate', 'defaultformat', default=['number'])
configitem('fastannotate', 'perfhack', default=False) configitem('fastannotate', 'perfhack', default=False)
configitem('fastannotate', 'mainbranch') configitem('fastannotate', 'mainbranch')
configitem('fastannotate', 'forcetext', default=True) configitem('fastannotate', 'forcetext', default=True)
configitem('fastannotate', 'forcefollow', default=True) configitem('fastannotate', 'forcefollow', default=True)
configitem('fastannotate', 'clientfetchthreshold', default=10) configitem('fastannotate', 'clientfetchthreshold', default=10)
configitem('fastannotate', 'clientsharepeer', default=True)
configitem('fastannotate', 'serverbuildondemand', default=True) configitem('fastannotate', 'serverbuildondemand', default=True)
configitem('fastannotate', 'remotepath', default='default') configitem('fastannotate', 'remotepath', default='default')
def _flockavailable(): def _flockavailable():
try: try:
import fcntl import fcntl
fcntl.flock fcntl.flock
except StandardError: except StandardError:
if name == 'fastannotate': if name == 'fastannotate':
commands.registercommand() commands.registercommand()
elif name == 'hgweb': elif name == 'hgweb':
from . import support from . import support
support.replacehgwebannotate() support.replacehgwebannotate()
elif name == 'fctx': elif name == 'fctx':
from . import support from . import support
support.replacefctxannotate() support.replacefctxannotate()
support.replaceremotefctxannotate()
commands.wrapdefault() commands.wrapdefault()
else: else:
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 # fastannotate has its own locking, without depending on repo lock
localrepo.localrepository._wlockfreeprefix.add('fastannotate/') localrepo.localrepository._wlockfreeprefix.add('fastannotate/')
def reposetup(ui, repo): def reposetup(ui, repo):
client = ui.configbool('fastannotate', 'client', default=None) if ui.configbool('fastannotate', 'client'):
if client is None:
if util.safehasattr(repo, 'requirements'):
client = 'remotefilelog' in repo.requirements
if client:
protocol.clientreposetup(ui, repo) protocol.clientreposetup(ui, repo)

hgext/fastannotate/protocol.py

yield args, f yield args, f
yield _parseresponse(f.value) yield _parseresponse(f.value)
peer.__class__ = fastannotatepeer peer.__class__ = fastannotatepeer
@contextlib.contextmanager @contextlib.contextmanager
def annotatepeer(repo): def annotatepeer(repo):
ui = repo.ui ui = repo.ui
# fileservice belongs to remotefilelog
fileservice = getattr(repo, 'fileservice', None)
sharepeer = ui.configbool('fastannotate', 'clientsharepeer', True)
if sharepeer and fileservice:
ui.debug('fastannotate: using remotefilelog connection pool\n')
conn = repo.connectionpool.get(repo.fallbackpath)
peer = conn.peer
stolen = True
else:
remotepath = ui.expandpath( remotepath = ui.expandpath(
ui.config('fastannotate', 'remotepath', 'default')) ui.config('fastannotate', 'remotepath', 'default'))
peer = hg.peer(ui, {}, remotepath) peer = hg.peer(ui, {}, remotepath)
stolen = False
try: try:
# Note: fastannotate requests should never trigger a remotefilelog
# "getfiles" request, because "getfiles" puts the stream into a state
# that does not exit. See "clientfetch": it does "getannotate" before
# any hg stuff that could potentially trigger a "getfiles".
yield peer yield peer
finally: finally:
if not stolen: peer.close()
for i in ['close', 'cleanup']:
getattr(peer, i, lambda: None)()
else:
conn.__exit__(None, None, None)
def clientfetch(repo, paths, lastnodemap=None, peer=None): def clientfetch(repo, paths, lastnodemap=None, peer=None):
"""download annotate cache from the server for paths""" """download annotate cache from the server for paths"""
if not paths: if not paths:
return return
if peer is None: if peer is None:
with annotatepeer(repo) as peer: with annotatepeer(repo) as peer:
from the server. works with remotefilelog and non-remotefilelog repos. from the server. works with remotefilelog and non-remotefilelog repos.
""" """
threshold = repo.ui.configint('fastannotate', 'clientfetchthreshold', 10) threshold = repo.ui.configint('fastannotate', 'clientfetchthreshold', 10)
if threshold <= 0: if threshold <= 0:
return paths return paths
master = repo.ui.config('fastannotate', 'mainbranch') or 'default' master = repo.ui.config('fastannotate', 'mainbranch') or 'default'
if 'remotefilelog' in repo.requirements:
ctx = scmutil.revsingle(repo, master)
f = lambda path: len(ctx[path].ancestormap())
else:
f = lambda path: len(repo.file(path))
result = [] result = []
for path in paths: for path in paths:
try: try:
if f(path) >= threshold: if len(repo.file(path)) >= threshold:
result.append(path) result.append(path)
except Exception: # file not found etc. except Exception: # file not found etc.
result.append(path) result.append(path)
return result return result
def localreposetup(ui, repo): def localreposetup(ui, repo):
class fastannotaterepo(repo.__class__): class fastannotaterepo(repo.__class__):

hgext/fastannotate/support.py

return orig(self, follow, skiprevs=skiprevs, diffopts=diffopts, return orig(self, follow, skiprevs=skiprevs, diffopts=diffopts,
prefetchskip=skipset) prefetchskip=skipset)
def replacehgwebannotate(): def replacehgwebannotate():
extensions.wrapfunction(hgweb.webutil, 'annotate', _hgwebannotate) extensions.wrapfunction(hgweb.webutil, 'annotate', _hgwebannotate)
def replacefctxannotate(): def replacefctxannotate():
extensions.wrapfunction(hgcontext.basefilectx, 'annotate', _fctxannotate) extensions.wrapfunction(hgcontext.basefilectx, 'annotate', _fctxannotate)
def replaceremotefctxannotate():
try:
r = extensions.find('remotefilelog')
except KeyError:
return
else:
extensions.wrapfunction(r.remotefilectx.remotefilectx, 'annotate',
_remotefctxannotate)