Mercurial Mercurial > hg / 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/monoblue/filediff.tmpl
author wujek srujek
Sun, 08 Jul 2012 17:17:02 +0200
changeset 17202 1ae119269ddc
parent 13860 b5b84dd43613
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:
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset 
     1
 
{header}
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset 
     2
 
<title>{repo|escape}: diff {file|escape}</title>
8430
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset 
     3
 
    <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset 
     4
 
    <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset 
     5
 
</head>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset 
     6
 












91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




     7


<body>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




     8


<div id="container">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




     9


    <div class="page-header">








8430






8b47efdf40ee
monoblue: use newer template syntax everywhere



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8355

diff
changeset




    10


        <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file diff</h1>








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    11














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    12


        <form action="{url}log">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    13


            {sessionvars%hiddenformentry}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    14


            <dl class="search">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    15


                <dt><label>Search: </label></dt>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    16


                <dd><input type="text" name="rev" /></dd>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    17


            </dl>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    18


        </form>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    19














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    20


        <ul class="page-nav">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    21


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    22


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    23


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    24


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    25


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








13860






b5b84dd43613
hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)



Yuya Nishihara <yuya@tcha.org>


parents: 
12680

diff
changeset




    26


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








8355






5ba798f339c8
monoblue: add branches page



Sune Foldager <cryo@cyanite.org>


parents: 
7111

diff
changeset




    27


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    28


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








12680






d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1



Augie Fackler <durin42@gmail.com>


parents: 
9999

diff
changeset




    29


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    30


        </ul>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    31


    </div>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    32














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    33


    <ul class="submenu">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    34


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    35


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    36


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    37


        <li class="current">diff</li>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    38


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    39


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    40


    </ul>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    41














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    42


    <h2 class="no-link no-border">diff: {file|escape}</h2>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    43


    <h3 class="changeset">{file|escape}</h3>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    44














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    45


    <dl class="overview">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    46


        {branch%filerevbranch}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    47


        <dt>changeset {rev}</dt>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    48


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    49


        {parent%filediffparent}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    50


        {child%filediffchild}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    51


    </dl>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    52














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    53


    <div class="diff">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    54


    {diff}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    55


    </div>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    56














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    57


{footer}















Mercurial