upstream/mercurial-mirror Files · mercurial/templates/paper/filecomparison.tmpl

hgweb: refactor the request draining code...

hgweb: refactor the request draining code The previous code for draining was only invoked in a few places in the wire protocol. Behavior wasn't consist. Furthermore, it was difficult to reason about. With us converting the input stream to a capped reader, it is now safe to always drain the input stream when its size is known because we can never overrun the input and read into the next HTTP request. The only question is "should we?" This commit changes the draining code so every request is examined. Draining now kicks in for a few requests where it wouldn't before. But I think the code is sufficiently restricted so the behavior is safe. Possibly the most dangerous part of this code is the issuing of Connection: close for POST and PUT requests that don't have a Content-Length. I don't think there are any such uses in our WSGI application, so this should be safe. In the near future, I plan to significantly refactor the WSGI response handling. I anticipate this code evolving a bit. So any minor regressions around draining or connection closing behavior might be fixed as a result of that work. All tests pass with this change. That scares me a bit because it means we are lacking low-level tests for the HTTP protocol. Differential Revision: https://phab.mercurial-scm.org/D2769

av6 - - Load All Authors

File last commit:

r35055:9acc0360 default


                r36871:2cdf47e1

default

Download file

             filecomparison.tmpl
        
                    90 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filecomparison.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      {header}

      <title>{repo|escape}: {file|escape} comparison</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </div>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      <li class="active">comparison</li>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </ul>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </ul>

      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      <h3>

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

        av6
    
hgweb: move changeset "tags" to a template in map file (paper and coal)...

              r35055
            
       {alltags}

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      </h3>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

              r18628
            
      <div class="description">{desc|strip|escape|websub|nonempty}</div>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      <table id="changesetEntry">

      <tr>

       <th>author</th>

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

      </tr>

      <tr>

       <th>date</th>

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

      </tr>

      <tr>

       <th>parents</th>

       <td>{parent%filerevparent}</td>

      </tr>

      <tr>

       <th>children</th>

       <td>{child%filerevchild}</td>

      </tr>

      </table>

      <div class="overflow">

      <div class="sourcefirst">   comparison</div>

      <div class="legend">

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

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

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

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

      </div>

        wujek srujek
    
hgweb: fixes traceback for invalid files by removing top-level template...

              r17302
            
      <table class="bigtable">

        <thead class="header">

          <tr>

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

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

          </tr>

        </thead>

        {comparison}

      </table>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </div>

      </div>

      </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

wujek srujek hgweb: side-by-side comparison functionality...	r17202	{header}
		<title>{repo\|escape}: {file\|escape} comparison</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
		<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</div>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
		<li><a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">browse</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	<li class="active">comparison</li>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li><a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file log</a></li>
		<li><a href="{url\|urlescape}raw-file/{symrev}/{file\|urlescape}">raw</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</ul>
		</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
av6 hgweb: link to revision by node hash in paper & coal...	r25617	<h3>
		comparison {file\|escape} @ {rev}:<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}
av6 hgweb: link to revision by node hash in paper & coal...	r25617	</h3>
wujek srujek hgweb: side-by-side comparison functionality...	r17202
Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
wujek srujek hgweb: side-by-side comparison functionality...	r17202
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<div class="description">{desc\|strip\|escape\|websub\|nonempty}</div>
wujek srujek hgweb: side-by-side comparison functionality...	r17202
		<table id="changesetEntry">
		<tr>
		<th>author</th>
		<td>{author\|obfuscate}</td>
		</tr>
		<tr>
		<th>date</th>
		<td class="date age">{date\|rfc822date}</td>
		</tr>
		<tr>
		<th>parents</th>
		<td>{parent%filerevparent}</td>
		</tr>
		<tr>
		<th>children</th>
		<td>{child%filerevchild}</td>
		</tr>
		</table>

		<div class="overflow">
		<div class="sourcefirst"> comparison</div>
		<div class="legend">
		<span class="legendinfo equal">equal</span>
		<span class="legendinfo delete">deleted</span>
		<span class="legendinfo insert">inserted</span>
		<span class="legendinfo replace">replaced</span>
		</div>

wujek srujek hgweb: fixes traceback for invalid files by removing top-level template...	r17302	<table class="bigtable">
		<thead class="header">
		<tr>
		<th>{leftrev}:{leftnode\|short}</th>
		<th>{rightrev}:{rightnode\|short}</th>
		</tr>
		</thead>
		{comparison}
		</table>
wujek srujek hgweb: side-by-side comparison functionality...	r17202
		</div>
		</div>
		</div>

		{footer}