Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/templates/paper/fileannotate.tmpl
author wujek srujek
Sun, 08 Jul 2012 17:17:02 +0200
changeset 17202 1ae119269ddc
parent 15375 fe9d36a6853e
child 18258 bebb05a7e249
permissions -rw-r--r--
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)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     1
 
{header}
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     2
 
<title>{repo|escape}: {file|escape} annotate</title>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     3
 
</head>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     4
 
<body>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     5
 












b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




     6


<div class="container">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




     7


<div class="menu">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




     8


<div class="logo">








13964






616ad3f6fd33
hgweb: support alternate logo url



Steven Stallion <sstallion@gmail.com>


parents: 
13948

diff
changeset




     9


<a href="{logourl}">








14913






44382887d012
hgweb: add a "web/logoimg" setting to customize the web logo image



Angel Ezquerra <angel.ezquerra@gmail.com>


parents: 
14046

diff
changeset




    10


<img src="{staticurl}{logoimg}" alt="mercurial" /></a>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    11


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    12


<ul>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    13


<li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    14


<li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    15


<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>








13597






38c9837b1f75
hgweb: add separate page with bookmarks listing



Alexander Solovyov <alexander@solovyov.net>


parents: 
12680

diff
changeset




    16


<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>








8353






6058d291abdf
paper/coal: add branches page



Sune Foldager <cryo@cyanite.org>


parents: 
8235

diff
changeset




    17


<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    18


</ul>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    19














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    20


<ul>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    21


<li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    22


<li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    23


</ul>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    24


<ul>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    25


<li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>








9720






bb00a159e594
coal/paper: show link to latest file revision (issue1344)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8936

diff
changeset




    26


<li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    27


<li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
15375

diff
changeset




    28


<li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    29


<li class="active">annotate</li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    30


<li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    31


<li><a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a></li>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    32


</ul>








12680






d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    33


<ul>













d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    34


<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>













d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    35


</ul>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    36


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    37














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    38


<div class="main">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    39


<h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    40


<h3>annotate {file|escape} @ {rev}:{node|short}</h3>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    41














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    42


<form class="search" action="{url}log">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    43


{sessionvars%hiddenformentry}








7725






6a888d491eaf
coal/paper: switch to XHTML 1.1



Benoit Allard <benoit@aeteurope.nl>


parents: 
7411

diff
changeset




    44


<p><input name="rev" id="search1" type="text" size="30" /></p>













6a888d491eaf
coal/paper: switch to XHTML 1.1



Benoit Allard <benoit@aeteurope.nl>


parents: 
7411

diff
changeset




    45


<div id="hint">find changesets by author, revision,













6a888d491eaf
coal/paper: switch to XHTML 1.1



Benoit Allard <benoit@aeteurope.nl>


parents: 
7411

diff
changeset




    46


files, or words in the commit message</div>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    47


</form>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    48









13948






3fc5420016cc
paper: don't add breaks on the remaining instances of desc



Adrian Buehlmann <adrian@cadifra.com>


parents: 
13597

diff
changeset




    49


<div class="description">{desc|strip|escape|nonempty}</div>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    50














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    51


<table id="changesetEntry">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    52


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    53


 <th class="author">author</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    54


 <td class="author">{author|obfuscate}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    55


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    56


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    57


 <th class="date">date</th>








15375






fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari



Brodie Rao <brodie@bitheap.org>


parents: 
14913

diff
changeset




    58


 <td class="date age">{date|rfc822date}</td>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    59


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    60


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    61


 <th class="author">parents</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    62


 <td class="author">{parent%filerevparent}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    63


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    64


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    65


 <th class="author">children</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    66


 <td class="author">{child%filerevchild}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    67


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    68


{changesettag}













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    69


</table>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    70














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    71


<div class="overflow">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    72


<table class="bigtable">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    73


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    74


 <th class="annotate">rev</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    75


 <th class="line">&nbsp;&nbsp;line source</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    76


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    77


{annotate%annotateline}













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    78


</table>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    79


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    80


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    81


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    82














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    83


{footer}















hg-stable