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/gitweb/filerevision.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:
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset 
     1
 
{header}
3476
62f53b8f00c4 gitweb: add revision numbers to filerevision changeset links
Brendan Cully <brendan@kublai.com>
parents: 3395
diff changeset 
     2
 
<title>{repo|escape}: {file|escape}@{node|short}</title>
5269
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4465
diff changeset 
     3
 
<link rel="alternate" type="application/atom+xml"
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset 
     4
 
   href="{url}atom-log" title="Atom feed for {repo|escape}"/>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset 
     5
 
<link rel="alternate" type="application/rss+xml"
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset 
     6
 
   href="{url}rss-log" title="RSS feed for {repo|escape}"/>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset 
     7
 
</head>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset 
     8
 
<body>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset 
     9
 












385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    10


<div class="page_header">








13964






616ad3f6fd33
hgweb: support alternate logo url



Steven Stallion <sstallion@gmail.com>


parents: 
13864

diff
changeset




    11


<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision








1572






385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    12


</div>













385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    13














385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    14


<div class="page_nav">








3363






ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3353

diff
changeset




    15


<a href="{url}summary{sessionvars%urlparameter}">summary</a> |













ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3353

diff
changeset




    16


<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |













ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3353

diff
changeset




    17


<a href="{url}log{sessionvars%urlparameter}">changelog</a> |








6693






7f58dec6aeb7
hgweb: Fix up non-coal styles to support graph.



Augie Fackler <durin42@gmail.com>


parents: 
6250

diff
changeset




    18


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








3363






ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3353

diff
changeset




    19


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








13864






fd8a6ca3a750
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)



Yuya Nishihara <yuya@tcha.org>


parents: 
12680

diff
changeset




    20


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








8356






439663cd043a
gitweb: add branches page



Sune Foldager <cryo@cyanite.org>


parents: 
8235

diff
changeset




    21


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








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    22


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













cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    23


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








3271






36fa5db79dd5
hgweb: convert gitweb to NWI



Brendan Cully <brendan@kublai.com>


parents: 
3234

diff
changeset




    24


file |








9882






b3b57ecbda50
gitweb: add a latest link to the gitweb style



Zhigang Wang <w1z2g3@gmail.com>


parents: 
9721

diff
changeset




    25


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








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    26


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













cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    27


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








3363






ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3353

diff
changeset




    28


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








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
15375

diff
changeset




    29


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








12680






d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    30


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













d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    31


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













d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    32


<br/>








1572






385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    33


</div>













385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    34









8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    35


<div class="title">{file|escape}</div>








1575






0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
1573

diff
changeset




    36









3395






3c8f0dc9a6d3
hgweb: add changeset description to file revision page



Brendan Cully <brendan@kublai.com>


parents: 
3393

diff
changeset




    37


<div class="title_text">








4465






e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    38


<table cellspacing="0">













e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    39


<tr>













e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    40


 <td>author</td>








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    41


 <td>{author|obfuscate}</td></tr>








1575






0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
1573

diff
changeset




    42


<tr>








4465






e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    43


 <td></td>








15375






fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari



Brodie Rao <brodie@bitheap.org>


parents: 
14046

diff
changeset




    44


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








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    45


{branch%filerevbranch}








4465






e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    46


<tr>













e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    47


 <td>changeset {rev}</td>








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    48


 <td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>













cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    49


{parent%filerevparent}













cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    50


{child%filerevchild}








1575






0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
1573

diff
changeset




    51


<tr>








4465






e8da331a860f
gitweb: file rev template: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3476

diff
changeset




    52


 <td>permissions</td>








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    53


 <td style="font-family:monospace">{permissions|permissions}</td></tr>








1575






0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
1573

diff
changeset




    54


</table>








3395






3c8f0dc9a6d3
hgweb: add changeset description to file revision page



Brendan Cully <brendan@kublai.com>


parents: 
3393

diff
changeset




    55


</div>













3c8f0dc9a6d3
hgweb: add changeset description to file revision page



Brendan Cully <brendan@kublai.com>


parents: 
3393

diff
changeset




    56














3c8f0dc9a6d3
hgweb: add changeset description to file revision page



Brendan Cully <brendan@kublai.com>


parents: 
3393

diff
changeset




    57


<div class="page_path">








8235






89bc3946c8f3
hgweb: use "nonempty" filter in templates for the changelog message



Rocco Rutte <pdmef@gmx.net>


parents: 
6693

diff
changeset




    58


{desc|strip|escape|addbreaks|nonempty}








3395






3c8f0dc9a6d3
hgweb: add changeset description to file revision page



Brendan Cully <brendan@kublai.com>


parents: 
3393

diff
changeset




    59


</div>








1575






0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
1573

diff
changeset




    60









1572






385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    61


<div class="page_body">








8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    62


{text%fileline}








1572






385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    63


</div>













385b8872b8e3
[hgweb] Initial import of the "gitweb" style



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 

diff
changeset




    64









8427






cebdfdcc3e42
git: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8356

diff
changeset




    65


{footer}















hg-stable