Mercurial > public > mercurial-scm > hg-stable
diff hgext/highlight/__init__.py @ 26249:3166bcc0c538
highlight: add highlightfiles config option which takes a fileset (issue3005)
Highlight extension lacked a way to limit files by size, by extension, and/or
by any other part of file path. A good solution would be to use a fileset,
since it can check file path, extension and size (and more) in one expression.
So this change introduces such an option, highlighfiles, which takes a fileset
and on each request decides if the requested file should be highlighted.
The default "size('<5M')" is, in a way, suggested in issue3005.
checkfctx() limits the amount of work to just one file (subset kwarg in
fileset.matchctx()).
Monkey-patching works around issue4568, otherwise using filesets here while
running hgweb in directory mode would say, for example, "Abort: **.py not under
root", but this fix is very local and probably far from ideal. I suspect there
to be a way to fix this for the whole hgweb and resolve the issue, but I don't
know how to do it.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 16 Sep 2015 22:30:36 +0800 |
| parents | 85fb416f2fa7 |
| children | e7cb19b1ef2b |
line wrap: on
line diff
--- a/hgext/highlight/__init__.py Fri Sep 04 11:15:02 2015 -0400 +++ b/hgext/highlight/__init__.py Wed Sep 16 22:30:36 2015 +0800 @@ -13,23 +13,32 @@ It depends on the Pygments syntax highlighting library: http://pygments.org/ -There is a single configuration option:: +There are two configuration options:: [web] - pygments_style = <style> - -The default is 'colorful'. + pygments_style = <style> (default: colorful) + highlightfiles = <fileset> (default: size('<5M')) """ import highlight from mercurial.hgweb import webcommands, webutil, common -from mercurial import extensions, encoding +from mercurial import extensions, encoding, fileset # Note for extension authors: ONLY specify testedwith = 'internal' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'internal' +def checkfctx(fctx, expr): + ctx = fctx.changectx() + tree = fileset.parse(expr) + mctx = fileset.matchctx(ctx, subset=[fctx.path()], status=None) + repo = ctx.repo() + # To allow matching file names in the fileset in hgweb directory mode. + # See issue4568. + object.__setattr__(repo, 'getcwd', lambda: repo.root) + return fctx.path() in fileset.getset(mctx, tree) + def filerevision_highlight(orig, web, req, tmpl, fctx): mt = ''.join(tmpl('mimetype', encoding=encoding.encoding)) # only pygmentize for mimetype containing 'html' so we both match @@ -41,7 +50,9 @@ # pygmentize a html file if 'html' in mt: style = web.config('web', 'pygments_style', 'colorful') - highlight.pygmentize('fileline', fctx, style, tmpl) + expr = web.config('web', 'highlightfiles', "size('<5M')") + if checkfctx(fctx, expr): + highlight.pygmentize('fileline', fctx, style, tmpl) return orig(web, req, tmpl, fctx) def annotate_highlight(orig, web, req, tmpl): @@ -49,7 +60,9 @@ if 'html' in mt: fctx = webutil.filectx(web.repo, req) style = web.config('web', 'pygments_style', 'colorful') - highlight.pygmentize('annotateline', fctx, style, tmpl) + expr = web.config('web', 'highlightfiles', "size('<5M')") + if checkfctx(fctx, expr): + highlight.pygmentize('annotateline', fctx, style, tmpl) return orig(web, req, tmpl) def generate_css(web, req, tmpl):