##// END OF EJS Templates
fsmonitor: refresh pywatchman with upstream...
fsmonitor: refresh pywatchman with upstream This commit vendors pywatchman commit 259dc66dc9591f9b7ce76d0275bb1065f390c9b1 from upstream without modifications. The previously vendored pywatchman from changeset 16f4b341288d was from Git commit c77452. This commit effectively undoes the following Mercurial changesets: * dd35abc409ee fsmonitor: correct an error message * b1f62cd39b5c fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811) * c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess * 876494fd967d cleanup: delete lots of unused local variables * 57264906a996 watchman: add the possibility to set the exact watchman binary location The newly-vendored code has support for specifying the binary location, so 57264906a996 does not need applied. But we do need to modify our code to specify a proper argument name. 876494fd967d is not important, so it will be ignored. c31ce080eb75 globally changed the code base to always pass str to subprocess. But pywatchman's code is Python 3 clean, so we don't need to do this. This leaves dd35abc409ee and b1f62cd39b5c, which will be re-applied in subsequent commits. Differential Revision: https://phab.mercurial-scm.org/D7201

File last commit:

r43387:8ff1ecfa default
r43703:6469c23a stable
Show More
support.py
138 lines | 4.1 KiB | text/x-python | PythonLexer
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 # Copyright 2016-present Facebook. All Rights Reserved.
#
# support: fastannotate support for hgweb, and filectx
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from mercurial.pycompat import getattr
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 from mercurial import (
context as hgcontext,
dagop,
extensions,
hgweb,
patch,
util,
)
from . import (
context,
revmap,
)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 class _lazyfctx(object):
"""delegates to fctx but do not construct fctx when unnecessary"""
def __init__(self, repo, node, path):
self._node = node
self._path = path
self._repo = repo
def node(self):
return self._node
def path(self):
return self._path
@util.propertycache
def _fctx(self):
return context.resolvefctx(self._repo, self._node, self._path)
def __getattr__(self, name):
return getattr(self._fctx, name)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _convertoutputs(repo, annotated, contents):
"""convert fastannotate outputs to vanilla annotate format"""
# fastannotate returns: [(nodeid, linenum, path)], [linecontent]
# convert to what fctx.annotate returns: [annotateline]
results = []
fctxmap = {}
annotateline = dagop.annotateline
for i, (hsh, linenum, path) in enumerate(annotated):
if (hsh, path) not in fctxmap:
fctxmap[(hsh, path)] = _lazyfctx(repo, hsh, path)
# linenum: the user wants 1-based, we have 0-based.
lineno = linenum + 1
fctx = fctxmap[(hsh, path)]
line = contents[i]
results.append(annotateline(fctx=fctx, lineno=lineno, text=line))
return results
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _getmaster(fctx):
"""(fctx) -> str"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return fctx._repo.ui.config(b'fastannotate', b'mainbranch') or b'default'
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _doannotate(fctx, follow=True, diffopts=None):
"""like the vanilla fctx.annotate, but do it via fastannotate, and make
the output format compatible with the vanilla fctx.annotate.
may raise Exception, and always return line numbers.
"""
master = _getmaster(fctx)
annotated = contents = None
with context.fctxannotatecontext(fctx, follow, diffopts) as ac:
try:
Augie Fackler
formatting: blacken the codebase...
r43346 annotated, contents = ac.annotate(
fctx.rev(), master=master, showpath=True, showlines=True
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 except Exception:
Augie Fackler
formatting: blacken the codebase...
r43346 ac.rebuild() # try rebuild once
fctx._repo.ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fastannotate: %s: rebuilding broken cache\n' % fctx._path
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 try:
Augie Fackler
formatting: blacken the codebase...
r43346 annotated, contents = ac.annotate(
fctx.rev(), master=master, showpath=True, showlines=True
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 except Exception:
raise
assert annotated and contents
return _convertoutputs(fctx._repo, annotated, contents)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def _hgwebannotate(orig, fctx, ui):
Augie Fackler
formatting: blacken the codebase...
r43346 diffopts = patch.difffeatureopts(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui, untrusted=True, section=b'annotate', whitespace=True
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 return _doannotate(fctx, diffopts=diffopts)
Augie Fackler
formatting: blacken the codebase...
r43346
def _fctxannotate(
orig, self, follow=False, linenumber=False, skiprevs=None, diffopts=None
):
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 if skiprevs:
# skiprevs is not supported yet
Augie Fackler
formatting: blacken the codebase...
r43346 return orig(
self, follow, linenumber, skiprevs=skiprevs, diffopts=diffopts
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 try:
return _doannotate(self, follow, diffopts)
except Exception as ex:
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.debug(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'fastannotate: falling back to the vanilla annotate: %r\n' % ex
Augie Fackler
formatting: blacken the codebase...
r43346 )
return orig(self, follow=follow, skiprevs=skiprevs, diffopts=diffopts)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None):
# skipset: a set-like used to test if a fctx needs to be downloaded
with context.fctxannotatecontext(self, follow, diffopts) as ac:
skipset = revmap.revmap(ac.revmappath)
Augie Fackler
formatting: blacken the codebase...
r43346 return orig(
self, follow, skiprevs=skiprevs, diffopts=diffopts, prefetchskip=skipset
)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
def replacehgwebannotate():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(hgweb.webutil, b'annotate', _hgwebannotate)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 def replacefctxannotate():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(hgcontext.basefilectx, b'annotate', _fctxannotate)