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/gitweb/filecomparison.tmpl
author Matt Harbison <matt_harbison@yahoo.com>
Sun, 23 Dec 2018 22:57:03 -0500
changeset 41062 0a7f582f6f1f
parent 32762 2d93d2159e30
permissions -rw-r--r--
largefiles: port wrapped functions to exthelper Things get interesting in the commit. I hadn't seen issue6033 on Windows, and yet it is now reproducible 100% of the time on Windows 10 with this commit. I didn't test Linux. (For comparison, after seeing this issue, I tested on the parent with --loop, and it failed 5 times out of over 1300 tests.) The strange thing is that largefiles has nothing to do with that test (it's not even mentioned there). It isn't autoloading run amuck- it occurs even if largefiles is explicitly disabled, and also if the entry in afterhgrcload() is commented out. It's also not the import of lfutil- I disabled that by copying the function into lfs and removing the import, and the problem still occurs. Experimenting further, it seems that the problem is isolated to 3 entries: exchange.pushoperation, hg.clone, and cmdutil.revert. If those decorators are all commented out, the test passes when run in a loop for awhile. (Obviously, some largefiles tests will fail.) But if any one is commented back in, the test fails immediately. I left one method related to wrapping the wire protocol, because it seemed more natural with the TODO. Also, exthelper doesn't support wrapping functions from another extension, only commands in another extension. I didn't try to figure out why rebase is both command wrapped and function wrapped.
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">








32762






2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    16


<div>








18526






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




    18


<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




    19


<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




    20


<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




    21


<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




    22


<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




    23


<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




    24


<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




    25


<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




    26


<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




    27


<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




    28


<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




    29


<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




    30


<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




    31


comparison |








25605






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



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    32


<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




    33


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








32762






2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    34


</div>













2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    35


{searchform}








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    36


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


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













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    39














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    40


<table>








6250






bf0dd23f55fa
gitweb: show branches in most of the templates



Florent Guillaume <fg@nuxeo.com>


parents: 
6177

diff
changeset




    41


{branch%filerevbranch}








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    42


<tr>








4467






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



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


parents: 
3364

diff
changeset




    43


 <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




    44


 <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




    45


</tr>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    46


{parent%filecompparent}













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    47


{child%filecompchild}








3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    48


</table>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    49









4467






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



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


parents: 
3364

diff
changeset




    50


<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




    51









3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    52


<div class="page_body">








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    53














1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    54


<div class="legend">













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    55


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    56


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    57


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    58


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













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    59


</div>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    60














1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    61


<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




    62


  <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




    63


    <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




    64


      <tr>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    65


        <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




    66


        <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




    67


      </tr>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    68


    </thead>













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    69


    {comparison}













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



wujek srujek <wujek.srujek@googlemail.com>


parents: 
17202

diff
changeset




    70


  </table>








17202






1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    71


</div>













1ae119269ddc
hgweb: side-by-side comparison functionality



wujek srujek


parents: 
16844

diff
changeset




    72









3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    73


</div>













2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    74














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    75


{footer}















Mercurial