##// END OF EJS Templates
copies: detect files as `touched/salvaged` if they only existed on one side...
copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

File last commit:

r44461:e685fac5 default
r47570:c52c3c4c default
Show More
__init__.py
109 lines | 3.6 KiB | text/x-python | PythonLexer
# highlight - syntax highlighting in hgweb, based on Pygments
#
# Copyright 2008, 2009 Patrick Mezard <pmezard@gmail.com> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
#
# The original module was split in an interface and an implementation
# file to defer pygments loading and speedup extension setup.
"""syntax highlighting for hgweb (requires Pygments)
It depends on the Pygments syntax highlighting library:
http://pygments.org/
There are the following configuration options::
[web]
pygments_style = <style> (default: colorful)
highlightfiles = <fileset> (default: size('<5M'))
highlightonlymatchfilename = <bool> (default False)
``highlightonlymatchfilename`` will only highlight files if their type could
be identified by their filename. When this is not enabled (the default),
Pygments will try very hard to identify the file type from content and any
match (even matches with a low confidence score) will be used.
"""
from __future__ import absolute_import
from . import highlight
from mercurial.hgweb import (
webcommands,
webutil,
)
from mercurial import (
extensions,
pycompat,
)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' 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 = b'ships-with-hg-core'
def pygmentize(web, field, fctx, tmpl):
style = web.config(b'web', b'pygments_style', b'colorful')
expr = web.config(b'web', b'highlightfiles', b"size('<5M')")
filenameonly = web.configbool(b'web', b'highlightonlymatchfilename', False)
ctx = fctx.changectx()
m = ctx.matchfileset(fctx.repo().root, expr)
if m(fctx.path()):
highlight.pygmentize(
field, fctx, style, tmpl, guessfilenameonly=filenameonly
)
def filerevision_highlight(orig, web, fctx):
mt = web.res.headers[b'Content-Type']
# only pygmentize for mimetype containing 'html' so we both match
# 'text/html' and possibly 'application/xhtml+xml' in the future
# so that we don't have to touch the extension when the mimetype
# for a template changes; also hgweb optimizes the case that a
# raw file is sent using rawfile() and doesn't call us, so we
# can't clash with the file's content-type here in case we
# pygmentize a html file
if b'html' in mt:
pygmentize(web, b'fileline', fctx, web.tmpl)
return orig(web, fctx)
def annotate_highlight(orig, web):
mt = web.res.headers[b'Content-Type']
if b'html' in mt:
fctx = webutil.filectx(web.repo, web.req)
pygmentize(web, b'annotateline', fctx, web.tmpl)
return orig(web)
def generate_css(web):
pg_style = web.config(b'web', b'pygments_style', b'colorful')
fmter = highlight.HtmlFormatter(style=pycompat.sysstr(pg_style))
web.res.headers[b'Content-Type'] = b'text/css'
style_defs = fmter.get_style_defs(pycompat.sysstr(b''))
web.res.setbodybytes(
b''.join(
[
b'/* pygments_style = %s */\n\n' % pg_style,
pycompat.bytestr(style_defs),
]
)
)
return web.res.sendresponse()
def extsetup(ui):
# monkeypatch in the new version
extensions.wrapfunction(
webcommands, b'_filerevision', filerevision_highlight
)
extensions.wrapfunction(webcommands, b'annotate', annotate_highlight)
webcommands.highlightcss = generate_css
webcommands.__all__.append(b'highlightcss')