MercurialWebTheme

Changeset

67:d7c03ac6cd58
2016-04-28 Paul Boddie raw files shortlog changelog graph 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.
patches/patch-hgext-highlight-xmlescape.diff themes/mercurialweb/annotateline.tmpl themes/mercurialweb/map (file)
     1.1 --- a/patches/patch-hgext-highlight-xmlescape.diff	Thu Apr 28 21:47:11 2016 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,9 +0,0 @@
     1.4 -diff -r 72d7d390ef5d hgext/highlight/highlight.py
     1.5 ---- a/hgext/highlight/highlight.py	Thu Mar 19 10:18:05 2015 -0700
     1.6 -+++ b/hgext/highlight/highlight.py	Thu Apr 28 21:44:17 2016 +0200
     1.7 -@@ -64,4 +64,5 @@
     1.8 - 
     1.9 -     oldl = tmpl.cache[field]
    1.10 -     newl = oldl.replace('line|escape', 'line|colorize')
    1.11 -+    newl = oldl.replace('line|xmlescape', 'line|colorize')
    1.12 -     tmpl.cache[field] = newl
     2.1 --- a/themes/mercurialweb/annotateline.tmpl	Thu Apr 28 21:47:11 2016 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,6 +0,0 @@
     2.4 -<tr class="annotate">
     2.5 -  <td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"
     2.6 -      title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td>
     2.7 -  <td class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td>
     2.8 -  <td class="source"><pre>{line|escape}</pre></td>
     2.9 -</tr>
     3.1 --- a/themes/mercurialweb/map	Thu Apr 28 21:47:11 2016 +0200
     3.2 +++ b/themes/mercurialweb/map	Thu Apr 28 23:01:51 2016 +0200
     3.3 @@ -22,7 +22,6 @@
     3.4  summary = summary.tmpl
     3.5  tags = tags.tmpl
     3.6  
     3.7 -annotateline = annotateline.tmpl
     3.8  bookmarkentry = bookmarkentry.tmpl
     3.9  branchentry = branchentry.tmpl
    3.10  changelogentry = changelogentry.tmpl
    3.11 @@ -42,35 +41,37 @@
    3.12  graphpagerentry = '{before%graphpagerlink}{after%graphpagerlink}'
    3.13  shortlogpagerentry = '{before%shortlogpagerlink}{after%shortlogpagerlink}'
    3.14  
    3.15 +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>'
    3.16 +
    3.17  annotatelink = '<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    3.18 -archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|xmlescape}</a> '
    3.19 +archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
    3.20  bookmarktag = '<span class="bookmark"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    3.21  branchlabel = '<span class="branch">{name}</span> '
    3.22  branchtag = '<span class="branch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    3.23 -changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    3.24 +changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    3.25  changeloglink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{rev}:{node|short}</a> '
    3.26  changesetlink = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    3.27  changesetfiledifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    3.28  filerevlink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    3.29 -graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    3.30 +graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    3.31  inbranchlabel = '<span class="inbranch">{name}</span> '
    3.32  inbranchtag = '<span class="inbranch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    3.33 -shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    3.34 +shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    3.35  tagtag = '<span class="tag">{name}</span> '
    3.36  
    3.37  diffblock = '<div id="diff{blockno}" class="source"><pre>{lines}</pre></div>'
    3.38 -difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|xmlescape}</span>'
    3.39 -difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|xmlescape}</span>'
    3.40 -difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|xmlescape}</span>'
    3.41 -diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}'
    3.42 +difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
    3.43 +difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
    3.44 +difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
    3.45 +diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
    3.46  
    3.47 -filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|xmlescape}</a></span> '
    3.48 +filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></span> '
    3.49  fileellipses = '...'
    3.50  
    3.51 -fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}</span>'
    3.52 +fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
    3.53  
    3.54 -filenolink = '<span>{file|xmlescape}</span> '
    3.55 -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> '
    3.56 +filenolink = '<span>{file|escape}</span> '
    3.57 +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> '
    3.58  
    3.59  hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
    3.60  urlparameter = '{separator}{name}={value|urlescape}'