annotate mercurial/templates/gitweb/map @ 17202:1ae119269ddc

hgweb: side-by-side comparison functionality

Adds new web command to the core, ``comparison``, which enables colorful
side-by-side change display, which for some might be much easier to work with
than the standard line diff output. The idea how to implement comes from the
SonicHq extension.
The web interface gets a new link to call the comparison functionality. It lets
users configure the amount of context lines around change blocks, or to show
full files - check help (also in this changeset) for details and defaults. The
setting in hgrc can be overridden by adding ``context=<value>`` to the request
query string. The comparison creates addressable lines, so as to enable sharing
links to specific lines, just as standard diff does.
Incorporates updates to all web related styles.

Known limitations:
* the column diff is done against the first parent, just as the standard diff
* this change allows examining diffs for single files only (as I am not sure if
  examining the whole changeset in this way would be helpful)
* syntax highlighting of the output changes is not performed (enabling the
  highlight extension has no influence on it)

default = 'summary'
mimetype = 'text/html; charset={encoding}'
header = header.tmpl
footer = footer.tmpl
search = search.tmpl
changelog = changelog.tmpl
summary = summary.tmpl
error = error.tmpl
notfound = notfound.tmpl

help = help.tmpl
helptopics = helptopics.tmpl

helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'

naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
filenodelink = '
  <tr class="parity{parity}">
    <td><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
    <td></td>
    <td class="link">
      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
      <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
      <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
      <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
    </td>
  </tr>'
filenolink = '
  <tr class="parity{parity}">
    <td><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
    <td></td>
    <td class="link">
      file |
      annotate |
      <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
      <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
      <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
    </td>
  </tr>'

nav = '{before%naventry} {after%naventry}'
navshort = '{before%navshortentry}{after%navshortentry}'
navgraph = '{before%navgraphentry}{after%navgraphentry}'
filenav = '{before%filenaventry}{after%filenaventry}'

fileellipses = '...'
changelogentry = changelogentry.tmpl
searchentry = changelogentry.tmpl
changeset = changeset.tmpl
manifest = manifest.tmpl
direntry = '
  <tr class="parity{parity}">
    <td style="font-family:monospace">drwxr-xr-x</td>
    <td style="font-family:monospace"></td>
    <td style="font-family:monospace"></td>
    <td>
      <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
      <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a>
    </td>
    <td class="link">
      <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a>
    </td>
  </tr>'
fileentry = '
  <tr class="parity{parity}">
    <td style="font-family:monospace">{permissions|permissions}</td>
    <td style="font-family:monospace" align=right>{date|isodate}</td>
    <td style="font-family:monospace" align=right>{size}</td>
    <td class="list">
      <a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
    </td>
    <td class="link">
      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
      <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
    </td>
  </tr>'
filerevision = filerevision.tmpl
fileannotate = fileannotate.tmpl
filediff = filediff.tmpl
filecomparison = filecomparison.tmpl
filelog = filelog.tmpl
fileline = '
  <div style="font-family:monospace" class="parity{parity}">
    <pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</pre>
  </div>'
annotateline = '
  <tr style="font-family:monospace" class="parity{parity}">
    <td class="linenr" style="text-align: right;">
      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"
         title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
    </td>
    <td><pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a></pre></td>
    <td><pre>{line|escape}</pre></td>
  </tr>'
difflineplus = '<span style="color:#008800;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
difflineat = '<span style="color:#990099;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'

comparison = '
  <table style="border-collapse:collapse;">
    <thead class="header">
      <tr>
        <th>{leftrev}:{leftnode|short}</th>
        <th>{rightrev}:{rightnode|short}</th>
      </tr>
    </thead>
    {blocks}
  </table>'
comparisonblock ='
  <tbody class="block">
  {lines}
  </tbody>'
comparisonline = '
  <tr style="font-family:monospace">
    <td class="{type}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</pre></td>
    <td class="{type}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</pre></td>
  </tr>'

changelogparent = '
  <tr>
    <th class="parent">parent {rev}:</th>
    <td class="parent">
      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
    </td>
  </tr>'
changesetbranch = '<tr><td>branch</td><td>{name}</td></tr>'
changesetparent = '
  <tr>
    <td>parent {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
    </td>
  </tr>'
filerevbranch = '<tr><td>branch</td><td>{name}</td></tr>'
filerevparent = '
  <tr>
    <td>parent {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
        {rename%filerename}{node|short}
      </a>
    </td>
  </tr>'
filerename = '{file|escape}@'
filelogrename = '| <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">base</a>'
fileannotateparent = '
  <tr>
    <td>parent {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
        {rename%filerename}{node|short}
      </a>
    </td>
  </tr>'
changelogchild = '
  <tr>
    <th class="child">child {rev}:</th>
    <td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
  </tr>'
changesetchild = '
  <tr>
    <td>child {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
    </td>
  </tr>'
filerevchild = '
  <tr>
    <td>child {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
    </tr>'
fileannotatechild = '
  <tr>
    <td>child {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
    </tr>'
tags = tags.tmpl
tagentry = '
  <tr class="parity{parity}">
    <td class="age"><i class="age">{date|rfc822date}</i></td>
    <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td>
    <td class="link">
      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
      <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
    </td>
  </tr>'
bookmarks = bookmarks.tmpl
bookmarkentry = '
  <tr class="parity{parity}">
    <td class="age"><i class="age">{date|rfc822date}</i></td>
    <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
    <td class="link">
      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
      <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
    </td>
  </tr>'
branches = branches.tmpl
branchentry = '
  <tr class="parity{parity}">
    <td class="age"><i class="age">{date|rfc822date}</i></td>
    <td><a class="list" href="{url}shortlog/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td>
    <td class="{status}">{branch|escape}</td>
    <td class="link">
      <a href="{url}changeset/{node|short}{sessionvars%urlparameter}">changeset</a> |
      <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
    </td>
  </tr>'
diffblock = '<pre>{lines}</pre>'
filediffparent = '
  <tr>
    <td>parent {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
        {node|short}
      </a>
    </td>
  </tr>'
filecompparent = '
  <tr>
    <td>parent {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
        {node|short}
      </a>
    </td>
  </tr>'
filelogparent = '
  <tr>
    <td align="right">parent {rev}:&nbsp;</td>
    <td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
  </tr>'
filediffchild = '
  <tr>
    <td>child {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
    </td>
  </tr>'
filecompchild = '
  <tr>
    <td>child {rev}</td>
    <td style="font-family:monospace">
      <a class="list" href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
    </td>
  </tr>'
filelogchild = '
  <tr>
    <td align="right">child {rev}:&nbsp;</td>
    <td><a href="{url}file{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
  </tr>'
shortlog = shortlog.tmpl
graph = graph.tmpl
tagtag = '<span class="tagtag" title="{name}">{name}</span> '
branchtag = '<span class="branchtag" title="{name}">{name}</span> '
inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> '
shortlogentry = '
  <tr class="parity{parity}">
    <td class="age"><i class="age">{date|rfc822date}</i></td>
    <td><i>{author|person}</i></td>
    <td>
      <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
        <b>{desc|strip|firstline|escape|nonempty}</b>
        <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
      </a>
    </td>
    <td class="link" nowrap>
      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
      <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
    </td>
  </tr>'
filelogentry = '
  <tr class="parity{parity}">
    <td class="age"><i class="age">{date|rfc822date}</i></td>
    <td>
      <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
        <b>{desc|strip|firstline|escape|nonempty}</b>
      </a>
    </td>
    <td class="link">
      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a>&nbsp;|&nbsp;<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>&nbsp;|&nbsp;<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> {rename%filelogrename}</td>
    </tr>'
archiveentry = ' | <a href="{url}archive/{node|short}{extension}">{type|escape}</a> '
indexentry = '
  <tr class="parity{parity}">
    <td>
      <a class="list" href="{url}{sessionvars%urlparameter}">
        <b>{name|escape}</b>
      </a>
    </td>
    <td>{description}</td>
    <td>{contact|obfuscate}</td>
    <td class="age">{lastchange|rfc822date}</td>
    <td class="indexlinks">{archives%indexarchiveentry}</td>
    <td><div class="rss_logo"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a></div></td>
  </tr>\n'
indexarchiveentry = ' <a href="{url}archive/{node|short}{extension}">{type|escape}</a> '
index = index.tmpl
urlparameter = '{separator}{name}={value|urlescape}'
hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'