##// 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:

r44014:856cce0c stable
r47570:c52c3c4c default
Show More
highlight.py
101 lines | 3.1 KiB | text/x-python | PythonLexer
# highlight.py - highlight extension implementation file
#
# Copyright 2007-2009 Adam Hupp <adam@hupp.org> 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.
from __future__ import absolute_import
from mercurial import demandimport
demandimport.IGNORES.update([b'pkgutil', b'pkg_resources', b'__main__'])
from mercurial import (
encoding,
pycompat,
)
from mercurial.utils import stringutil
with demandimport.deactivated():
import pygments
import pygments.formatters
import pygments.lexers
import pygments.plugin
import pygments.util
for unused in pygments.plugin.find_plugin_lexers():
pass
highlight = pygments.highlight
ClassNotFound = pygments.util.ClassNotFound
guess_lexer = pygments.lexers.guess_lexer
guess_lexer_for_filename = pygments.lexers.guess_lexer_for_filename
TextLexer = pygments.lexers.TextLexer
HtmlFormatter = pygments.formatters.HtmlFormatter
SYNTAX_CSS = (
b'\n<link rel="stylesheet" href="{url}highlightcss" type="text/css" />'
)
def pygmentize(field, fctx, style, tmpl, guessfilenameonly=False):
# append a <link ...> to the syntax highlighting css
tmpl.load(b'header')
old_header = tmpl.cache[b'header']
if SYNTAX_CSS not in old_header:
new_header = old_header + SYNTAX_CSS
tmpl.cache[b'header'] = new_header
text = fctx.data()
if stringutil.binary(text):
return
# str.splitlines() != unicode.splitlines() because "reasons"
for c in b"\x0c", b"\x1c", b"\x1d", b"\x1e":
if c in text:
text = text.replace(c, b'')
# Pygments is best used with Unicode strings:
# <http://pygments.org/docs/unicode/>
text = text.decode(pycompat.sysstr(encoding.encoding), 'replace')
# To get multi-line strings right, we can't format line-by-line
try:
path = pycompat.sysstr(fctx.path())
lexer = guess_lexer_for_filename(path, text[:1024], stripnl=False)
except (ClassNotFound, ValueError):
# guess_lexer will return a lexer if *any* lexer matches. There is
# no way to specify a minimum match score. This can give a high rate of
# false positives on files with an unknown filename pattern.
if guessfilenameonly:
return
try:
lexer = guess_lexer(text[:1024], stripnl=False)
except (ClassNotFound, ValueError):
# Don't highlight unknown files
return
# Don't highlight text files
if isinstance(lexer, TextLexer):
return
formatter = HtmlFormatter(nowrap=True, style=pycompat.sysstr(style))
colorized = highlight(text, lexer, formatter)
coloriter = (
s.encode(pycompat.sysstr(encoding.encoding), 'replace')
for s in colorized.splitlines()
)
tmpl._filters[b'colorize'] = lambda x: next(coloriter)
oldl = tmpl.cache[field]
newl = oldl.replace(b'line|escape', b'line|colorize')
tmpl.cache[field] = newl