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/filecomparison.tmpl
author Matt Harbison <matt_harbison@yahoo.com>
Fri, 15 Apr 2022 11:32:27 -0400
changeset 49082 dd381b973efc
parent 32759 265196cd7d7f
permissions -rw-r--r--
contrib: add a hint if the Windows dependency MSI is already installed In the past, I've gotten confused when the script failed on seemingly random python installs (and thus the py3.8 install was commented out from the last time this happened to me, which has been reverted here). This particular error code means the package was already installed. For python, it means the major and minor version are the same, but the micro version may differ. In practice, ignoring the python installation failure will cause the pip installation that happens next to fail, because python.exe for that version is somewhere else on the system. This could probably be fixed by running py.exe with the major and minor version, but that is skipped during the install for some reason. I didn't feel like over complicating this though, and at least there's a better hint when the problem occurs. Differential Revision: https://phab.mercurial-scm.org/D12560
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}
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset 
     2
 
<title>{repo|escape}: comparison {file|escape}</title>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     3
 
    <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     4
 
    <link rel="alternate" type="application/rss+xml" href="{url|urlescape}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">








18258






bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages



Angel Ezquerra <angel.ezquerra at gmail.com>


parents: 
17302

diff
changeset




    10


        <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    11









32759






265196cd7d7f
hgweb: consolidate search form for monoblue



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
26598

diff
changeset




    12


        {searchform}








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    13














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    14


        <ul class="page-nav">








18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    15


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













9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    16


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













9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    17


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








25604






0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    18


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








18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    19


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













9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    20


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













9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    21


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








25604






0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    22


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








18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    23


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    24


        </ul>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    25


    </div>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    26














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    27


    <ul class="submenu">








25604






0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    28


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








26598






264e88901c44
monoblue: add a link to the latest file revision



Anton Shestakov <av6@dwimlabs.net>


parents: 
25604

diff
changeset




    29


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








25604






0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    30


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













0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    31


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













0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    32


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








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    33


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








25604






0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style



Anton Shestakov <av6@dwimlabs.net>


parents: 
18526

diff
changeset




    34


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    35


    </ul>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    36









17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    37


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








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    38


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













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    39














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    40


    <dl class="overview">













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    41


        {branch%filerevbranch}













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    42


        <dt>changeset {rev}</dt>








18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    43


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








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    44


        {parent%filecompparent}













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    45


        {child%filecompchild}








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    46


    </dl>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    47









17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    48


    <div class="legend">













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    49


      <span class="legendinfo equal">equal</span>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    50


      <span class="legendinfo delete">deleted</span>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    51


      <span class="legendinfo insert">inserted</span>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    52


      <span class="legendinfo replace">replaced</span>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    53


    </div>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    54














1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
13860

diff
changeset




    55


    <div class="comparison">








17302






5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    56


      <table class="bigtable">













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    57


        <thead class="header">













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    58


          <tr>













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    59


            <th>{leftrev}:{leftnode|short}</th>













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    60


            <th>{rightrev}:{rightnode|short}</th>













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    61


          </tr>













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    62


        </thead>













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    63


        {comparison}













5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    64


      </table>








7111






91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    65


    </div>













91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    66














91b0ada2d94b
added monoblue hgweb theme



Hiroshi Funai <hfunai@gmail.com>


parents: 

diff
changeset




    67


{footer}















Mercurial