# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461877311 -7200
# Node ID d7c03ac6cd58cd3b093173791451ad37c83106aa
# Parent  91685df316d4c16f2cf1cb8af26923c265fff668
Replaced xmlescape usage with escape since it is only employed between tags,
thus removing the need to patch hgext.highlight.
Moved the annotateline definition into the map in order to satisfy the highlight
extension which cannot handle the separate definition.

diff -r 91685df316d4 -r d7c03ac6cd58 patches/patch-hgext-highlight-xmlescape.diff
--- a/patches/patch-hgext-highlight-xmlescape.diff	Thu Apr 28 21:47:11 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-diff -r 72d7d390ef5d hgext/highlight/highlight.py
---- a/hgext/highlight/highlight.py	Thu Mar 19 10:18:05 2015 -0700
-+++ b/hgext/highlight/highlight.py	Thu Apr 28 21:44:17 2016 +0200
-@@ -64,4 +64,5 @@
- 
-     oldl = tmpl.cache[field]
-     newl = oldl.replace('line|escape', 'line|colorize')
-+    newl = oldl.replace('line|xmlescape', 'line|colorize')
-     tmpl.cache[field] = newl
diff -r 91685df316d4 -r d7c03ac6cd58 themes/mercurialweb/annotateline.tmpl
--- a/themes/mercurialweb/annotateline.tmpl	Thu Apr 28 21:47:11 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<tr class="annotate">
-  <td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"
-      title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td>
-  <td class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td>
-  <td class="source"><pre>{line|escape}</pre></td>
-</tr>
diff -r 91685df316d4 -r d7c03ac6cd58 themes/mercurialweb/map
--- a/themes/mercurialweb/map	Thu Apr 28 21:47:11 2016 +0200
+++ b/themes/mercurialweb/map	Thu Apr 28 23:01:51 2016 +0200
@@ -22,7 +22,6 @@
 summary = summary.tmpl
 tags = tags.tmpl
 
-annotateline = annotateline.tmpl
 bookmarkentry = bookmarkentry.tmpl
 branchentry = branchentry.tmpl
 changelogentry = changelogentry.tmpl
@@ -42,35 +41,37 @@
 graphpagerentry = '{before%graphpagerlink}{after%graphpagerlink}'
 shortlogpagerentry = '{before%shortlogpagerlink}{after%shortlogpagerlink}'
 
+annotateline = '<tr class="annotate"> <td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td> <td class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td> <td class="source"><pre>{line|escape}</pre></td> </tr>'
+
 annotatelink = '<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
-archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|xmlescape}</a> '
+archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
 bookmarktag = '<span class="bookmark"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
 branchlabel = '<span class="branch">{name}</span> '
 branchtag = '<span class="branch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
-changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
+changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
 changeloglink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{rev}:{node|short}</a> '
 changesetlink = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
 changesetfiledifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
 filerevlink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
-graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
+graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
 inbranchlabel = '<span class="inbranch">{name}</span> '
 inbranchtag = '<span class="inbranch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
-shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
+shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
 tagtag = '<span class="tag">{name}</span> '
 
 diffblock = '<div id="diff{blockno}" class="source"><pre>{lines}</pre></div>'
-difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|xmlescape}</span>'
-difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|xmlescape}</span>'
-difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|xmlescape}</span>'
-diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}'
+difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
+difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
+difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
+diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
 
-filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|xmlescape}</a></span> '
+filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></span> '
 fileellipses = '...'
 
-fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}</span>'
+fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 
-filenolink = '<span>{file|xmlescape}</span> '
-filenodelink = '<span><a href="{url}rev/{node|short}{sessionvars%urlparameter}#diff{blockno}">{file|xmlescape}</a> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(file)</a></span> '
+filenolink = '<span>{file|escape}</span> '
+filenodelink = '<span><a href="{url}rev/{node|short}{sessionvars%urlparameter}#diff{blockno}">{file|escape}</a> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(file)</a></span> '
 
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
 urlparameter = '{separator}{name}={value|urlescape}'