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/filecomparison.tmpl
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Tue, 01 Nov 2016 20:39:37 +0900
branchstable
changeset 30246 b4c0f8d5edd2
parent 25605 dd89304687a3
child 32781 cb5123eff7d1
permissions -rw-r--r--
contrib: check reference to old selenic.com domain Now, all URL in Mercurial source tree should refer mercurial-scm.org domain instead of selenic.com. *.po files are ignored in this patch, because they might contain msgid/msgstr coming from old source files. This ignorance seems safe enough, because such msgstr should be ignored at runtime, because: - msgid corresponded to it should be invalid, or - msgstr itself should be marked as fuzzy at synchronized to recent hg.pot If any additional examination for *.po files is needed in the future, let i18n/check-translation.py achieve such examination. BTW, some binary files (e.g. *.png) are meaningless for checking reference to old domain in this patch, but aren't ignored like as *.po files, because excluding multiple suffixes is difficult for regexp matching.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
{header}
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset 
     2
 
<title>{repo|escape}: comparison {file|escape}</title>
5269
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4467
diff changeset 
     3
 
<link rel="alternate" type="application/atom+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     4
 
   href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     5
 
<link rel="alternate" type="application/rss+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     6
 
   href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     7
 
</head>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
<body>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    10


<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




    11


<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>













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



Angel Ezquerra <angel.ezquerra at gmail.com>


parents: 
17302

diff
changeset




    12


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








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    13


</div>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    14














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    15


<div 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




    16


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    17


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    18


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    19


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    20


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    21


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













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    22


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








25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    23


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













dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    24


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













dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    25


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








18526






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    26


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








25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    27


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













dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    28


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













dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    29


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








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    30


comparison |








25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    31


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








18526






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    32


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








16844






a7ba57b10530
hgweb: fixes linebreak location in gitweb filediff.tmpl view



wujek srujek <wujek.srujek@googlemail.com>


parents: 
13964

diff
changeset




    33


<br/>








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    34


</div>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    35














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    36


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













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    37














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    38


<table>








6250






bf0dd23f55fa
gitweb: show branches in most of the templates



Florent Guillaume <fg@nuxeo.com>


parents: 
6177

diff
changeset




    39


{branch%filerevbranch}








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    40


<tr>








4467






faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



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


parents: 
3364

diff
changeset




    41


 <td>changeset {rev}</td>








24999






30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles



Anton Shestakov <engored@ya.ru>


parents: 
18526

diff
changeset




    42


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













30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles



Anton Shestakov <engored@ya.ru>


parents: 
18526

diff
changeset




    43


</tr>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    44


{parent%filecompparent}













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    45


{child%filecompchild}








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    46


</table>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    47









4467






faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



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


parents: 
3364

diff
changeset




    48


<div class="list_head"></div>













faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



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


parents: 
3364

diff
changeset




    49









3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    50


<div class="page_body">








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    51














1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    52


<div class="legend">













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    53


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    54


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    55


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    56


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    57


</div>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    58














1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    59


<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




    60


  <table style="border-collapse:collapse;">













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    61


    <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




    62


      <tr>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    63


        <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




    64


        <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




    65


      </tr>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    66


    </thead>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    67


    {comparison}













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    68


  </table>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    69


</div>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    70









3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    71


</div>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    72














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    73


{footer}















hg-stable