Patchwork hgweb: link to raw-file on annotation page (BC)

login
register
mail settings
Submitter Gregory Szorc
Date Dec. 28, 2016, 10:53 p.m.
Message ID <4a560014d6d64edcefb1.1482965617@gps-mbp.local>
Download mbox | patch
Permalink /patch/18055/
State Accepted
Headers show

Comments

Gregory Szorc - Dec. 28, 2016, 10:53 p.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1482965297 25200
#      Wed Dec 28 15:48:17 2016 -0700
# Node ID 4a560014d6d64edcefb1d431e882824771c5ae15
# Parent  dc5b594f41e9be5820ce3f197d3817379b2d3af5
hgweb: link to raw-file on annotation page (BC)

Every other template has the "raw" link load "raw-file." However,
fileannotate.tmpl's "raw" link loads "raw-annotate." This feels
inconsistent and wrong.

As far as I can tell, linking to the "raw annotate" view has occurred
since 2006.
Pierre-Yves David - Jan. 4, 2017, 3:37 p.m.
On 12/28/2016 11:53 PM, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1482965297 25200
> #      Wed Dec 28 15:48:17 2016 -0700
> # Node ID 4a560014d6d64edcefb1d431e882824771c5ae15
> # Parent  dc5b594f41e9be5820ce3f197d3817379b2d3af5
> hgweb: link to raw-file on annotation page (BC)
>
> Every other template has the "raw" link load "raw-file." However,
> fileannotate.tmpl's "raw" link loads "raw-annotate." This feels
> inconsistent and wrong.

Hum, yeah not being served the raw file content when clicking on raw is 
definitely surprising. So I'm leaning toward taking this.

Is there another way to access the raw-annotate (beside url writing) 
after your change? (that page looks like a strange thing people would 
not use, but who can predict users in the wild).

> As far as I can tell, linking to the "raw annotate" view has occurred
> since 2006.
>
> diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl
> --- a/mercurial/templates/gitweb/fileannotate.tmpl
> +++ b/mercurial/templates/gitweb/fileannotate.tmpl
> @@ -27,9 +27,9 @@
>  <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
>  annotate |
>  <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
>  <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
> -<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a> |
> +<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
>  <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
>  <br/>
>  </div>
>
> diff --git a/mercurial/templates/monoblue/fileannotate.tmpl b/mercurial/templates/monoblue/fileannotate.tmpl
> --- a/mercurial/templates/monoblue/fileannotate.tmpl
> +++ b/mercurial/templates/monoblue/fileannotate.tmpl
> @@ -36,9 +36,9 @@
>          <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
>          <li class="current">annotate</li>
>          <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
>          <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
> -        <li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
> +        <li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
>      </ul>
>
>      <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>
>      <h3 class="changeset">{file|escape}</h3>
> diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl
> --- a/mercurial/templates/paper/fileannotate.tmpl
> +++ b/mercurial/templates/paper/fileannotate.tmpl
> @@ -27,9 +27,9 @@
>  <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
>  <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
>  <li class="active">annotate</li>
>  <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
> -<li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
> +<li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
>  </ul>
>  <ul>
>  <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
>  </ul>
> diff --git a/mercurial/templates/spartan/fileannotate.tmpl b/mercurial/templates/spartan/fileannotate.tmpl
> --- a/mercurial/templates/spartan/fileannotate.tmpl
> +++ b/mercurial/templates/spartan/fileannotate.tmpl
> @@ -12,9 +12,9 @@
>  <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
>  <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>
>  <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a>
>  <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
> -<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a>
> +<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a>
>  <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
>  </div>
>
>  <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file|escape}</h2>
> diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t
> --- a/tests/test-hgweb-symrev.t
> +++ b/tests/test-hgweb-symrev.t
> @@ -185,9 +185,9 @@ Set up the repo
>    <li><a href="/file/tip/foo?style=paper">latest</a></li>
>    <li><a href="/diff/xyzzy/foo?style=paper">diff</a></li>
>    <li><a href="/comparison/xyzzy/foo?style=paper">comparison</a></li>
>    <li><a href="/log/xyzzy/foo?style=paper">file log</a></li>
> -  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
> +  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>     annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=paper">a7c1559b7bba</a>
>     <td class="author"><a href="/file/43c799df6e75/foo?style=paper">43c799df6e75</a> </td>
>     <td class="author"><a href="/file/9d8c40cba617/foo?style=paper">9d8c40cba617</a> </td>
>    <a href="/annotate/43c799df6e75/foo?style=paper#l1">
> @@ -380,9 +380,9 @@ Set up the repo
>    <li><a href="/file/tip/foo?style=coal">latest</a></li>
>    <li><a href="/diff/xyzzy/foo?style=coal">diff</a></li>
>    <li><a href="/comparison/xyzzy/foo?style=coal">comparison</a></li>
>    <li><a href="/log/xyzzy/foo?style=coal">file log</a></li>
> -  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
> +  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>     annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=coal">a7c1559b7bba</a>
>     <td class="author"><a href="/file/43c799df6e75/foo?style=coal">43c799df6e75</a> </td>
>     <td class="author"><a href="/file/9d8c40cba617/foo?style=coal">9d8c40cba617</a> </td>
>    <a href="/annotate/43c799df6e75/foo?style=coal#l1">
> @@ -625,9 +625,9 @@ Set up the repo
>    <a href="/file/tip/foo?style=gitweb">latest</a> |
>    <a href="/log/xyzzy/foo?style=gitweb">revisions</a> |
>    <a href="/diff/xyzzy/foo?style=gitweb">diff</a> |
>    <a href="/comparison/xyzzy/foo?style=gitweb">comparison</a> |
> -  <a href="/raw-annotate/xyzzy/foo">raw</a> |
> +  <a href="/raw-file/xyzzy/foo">raw</a> |
>     <td style="font-family:monospace"><a class="list" href="/rev/a7c1559b7bba?style=gitweb">a7c1559b7bba</a></td>
>    <a class="list" href="/annotate/43c799df6e75/foo?style=gitweb">
>    <a class="list" href="/annotate/9d8c40cba617/foo?style=gitweb">9d8c40cba617</a></td>
>    <a href="/annotate/43c799df6e75/foo?style=gitweb#l1">
> @@ -848,9 +848,9 @@ Set up the repo
>            <li><a href="/file/tip/foo?style=monoblue">latest</a></li>
>            <li><a href="/log/xyzzy/foo?style=monoblue">revisions</a></li>
>            <li><a href="/diff/xyzzy/foo?style=monoblue">diff</a></li>
>            <li><a href="/comparison/xyzzy/foo?style=monoblue">comparison</a></li>
> -          <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
> +          <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>            <dd><a href="/rev/a7c1559b7bba?style=monoblue">a7c1559b7bba</a></dd>
>    <a href="/annotate/43c799df6e75/foo?style=monoblue">
>    <a href="/annotate/9d8c40cba617/foo?style=monoblue">9d8c40cba617</a>
>    <a href="/annotate/43c799df6e75/foo?style=monoblue#l1">
> @@ -1052,9 +1052,9 @@ Set up the repo
>    <a href="/rev/xyzzy?style=spartan">changeset</a>
>    <a href="/file/xyzzy/?style=spartan">files</a>
>    <a href="/file/xyzzy/foo?style=spartan">file</a>
>    <a href="/log/xyzzy/foo?style=spartan">revisions</a>
> -  <a href="/raw-annotate/xyzzy/foo">raw</a>
> +  <a href="/raw-file/xyzzy/foo">raw</a>
>     <td><a href="/rev/a7c1559b7bba?style=spartan">a7c1559b7bba</a></td>
>    <a href="/annotate/43c799df6e75/foo?style=spartan">
>    <td><a href="/annotate/9d8c40cba617/foo?style=spartan">9d8c40cba617</a></td>
>    <a href="/annotate/43c799df6e75/foo?style=spartan#l1">
> diff --git a/tests/test-highlight.t b/tests/test-highlight.t
> --- a/tests/test-highlight.t
> +++ b/tests/test-highlight.t
> @@ -235,9 +235,9 @@ hgweb fileannotate, html
>    <li><a href="/diff/tip/primes.py">diff</a></li>
>    <li><a href="/comparison/tip/primes.py">comparison</a></li>
>    <li class="active">annotate</li>
>    <li><a href="/log/tip/primes.py">file log</a></li>
> -  <li><a href="/raw-annotate/tip/primes.py">raw</a></li>
> +  <li><a href="/raw-file/tip/primes.py">raw</a></li>
>    </ul>
>    <ul>
>    <li><a href="/help">help</a></li>
>    </ul>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Gregory Szorc - Jan. 4, 2017, 6:06 p.m.
> On Jan 4, 2017, at 07:37, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
> 
> 
> 
>> On 12/28/2016 11:53 PM, Gregory Szorc wrote:
>> # HG changeset patch
>> # User Gregory Szorc <gregory.szorc@gmail.com>
>> # Date 1482965297 25200
>> #      Wed Dec 28 15:48:17 2016 -0700
>> # Node ID 4a560014d6d64edcefb1d431e882824771c5ae15
>> # Parent  dc5b594f41e9be5820ce3f197d3817379b2d3af5
>> hgweb: link to raw-file on annotation page (BC)
>> 
>> Every other template has the "raw" link load "raw-file." However,
>> fileannotate.tmpl's "raw" link loads "raw-annotate." This feels
>> inconsistent and wrong.
> 
> Hum, yeah not being served the raw file content when clicking on raw is definitely surprising. So I'm leaning toward taking this.
> 
> Is there another way to access the raw-annotate (beside url writing) after your change? (that page looks like a strange thing people would not use, but who can predict users in the wild).

No. But it would be trivial to add if users complain. I feel this has been an accidental link for years and nobody has noticed until now. That's why I dropped the link completely.

> 
>> As far as I can tell, linking to the "raw annotate" view has occurred
>> since 2006.
>> 
>> diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl
>> --- a/mercurial/templates/gitweb/fileannotate.tmpl
>> +++ b/mercurial/templates/gitweb/fileannotate.tmpl
>> @@ -27,9 +27,9 @@
>> <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
>> annotate |
>> <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
>> <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
>> -<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a> |
>> +<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
>> <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
>> <br/>
>> </div>
>> 
>> diff --git a/mercurial/templates/monoblue/fileannotate.tmpl b/mercurial/templates/monoblue/fileannotate.tmpl
>> --- a/mercurial/templates/monoblue/fileannotate.tmpl
>> +++ b/mercurial/templates/monoblue/fileannotate.tmpl
>> @@ -36,9 +36,9 @@
>>         <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
>>         <li class="current">annotate</li>
>>         <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
>>         <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
>> -        <li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
>> +        <li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
>>     </ul>
>> 
>>     <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>
>>     <h3 class="changeset">{file|escape}</h3>
>> diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl
>> --- a/mercurial/templates/paper/fileannotate.tmpl
>> +++ b/mercurial/templates/paper/fileannotate.tmpl
>> @@ -27,9 +27,9 @@
>> <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
>> <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
>> <li class="active">annotate</li>
>> <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
>> -<li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
>> +<li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
>> </ul>
>> <ul>
>> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
>> </ul>
>> diff --git a/mercurial/templates/spartan/fileannotate.tmpl b/mercurial/templates/spartan/fileannotate.tmpl
>> --- a/mercurial/templates/spartan/fileannotate.tmpl
>> +++ b/mercurial/templates/spartan/fileannotate.tmpl
>> @@ -12,9 +12,9 @@
>> <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
>> <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>
>> <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a>
>> <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
>> -<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a>
>> +<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a>
>> <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
>> </div>
>> 
>> <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file|escape}</h2>
>> diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t
>> --- a/tests/test-hgweb-symrev.t
>> +++ b/tests/test-hgweb-symrev.t
>> @@ -185,9 +185,9 @@ Set up the repo
>>   <li><a href="/file/tip/foo?style=paper">latest</a></li>
>>   <li><a href="/diff/xyzzy/foo?style=paper">diff</a></li>
>>   <li><a href="/comparison/xyzzy/foo?style=paper">comparison</a></li>
>>   <li><a href="/log/xyzzy/foo?style=paper">file log</a></li>
>> -  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
>> +  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>>    annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=paper">a7c1559b7bba</a>
>>    <td class="author"><a href="/file/43c799df6e75/foo?style=paper">43c799df6e75</a> </td>
>>    <td class="author"><a href="/file/9d8c40cba617/foo?style=paper">9d8c40cba617</a> </td>
>>   <a href="/annotate/43c799df6e75/foo?style=paper#l1">
>> @@ -380,9 +380,9 @@ Set up the repo
>>   <li><a href="/file/tip/foo?style=coal">latest</a></li>
>>   <li><a href="/diff/xyzzy/foo?style=coal">diff</a></li>
>>   <li><a href="/comparison/xyzzy/foo?style=coal">comparison</a></li>
>>   <li><a href="/log/xyzzy/foo?style=coal">file log</a></li>
>> -  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
>> +  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>>    annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=coal">a7c1559b7bba</a>
>>    <td class="author"><a href="/file/43c799df6e75/foo?style=coal">43c799df6e75</a> </td>
>>    <td class="author"><a href="/file/9d8c40cba617/foo?style=coal">9d8c40cba617</a> </td>
>>   <a href="/annotate/43c799df6e75/foo?style=coal#l1">
>> @@ -625,9 +625,9 @@ Set up the repo
>>   <a href="/file/tip/foo?style=gitweb">latest</a> |
>>   <a href="/log/xyzzy/foo?style=gitweb">revisions</a> |
>>   <a href="/diff/xyzzy/foo?style=gitweb">diff</a> |
>>   <a href="/comparison/xyzzy/foo?style=gitweb">comparison</a> |
>> -  <a href="/raw-annotate/xyzzy/foo">raw</a> |
>> +  <a href="/raw-file/xyzzy/foo">raw</a> |
>>    <td style="font-family:monospace"><a class="list" href="/rev/a7c1559b7bba?style=gitweb">a7c1559b7bba</a></td>
>>   <a class="list" href="/annotate/43c799df6e75/foo?style=gitweb">
>>   <a class="list" href="/annotate/9d8c40cba617/foo?style=gitweb">9d8c40cba617</a></td>
>>   <a href="/annotate/43c799df6e75/foo?style=gitweb#l1">
>> @@ -848,9 +848,9 @@ Set up the repo
>>           <li><a href="/file/tip/foo?style=monoblue">latest</a></li>
>>           <li><a href="/log/xyzzy/foo?style=monoblue">revisions</a></li>
>>           <li><a href="/diff/xyzzy/foo?style=monoblue">diff</a></li>
>>           <li><a href="/comparison/xyzzy/foo?style=monoblue">comparison</a></li>
>> -          <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
>> +          <li><a href="/raw-file/xyzzy/foo">raw</a></li>
>>           <dd><a href="/rev/a7c1559b7bba?style=monoblue">a7c1559b7bba</a></dd>
>>   <a href="/annotate/43c799df6e75/foo?style=monoblue">
>>   <a href="/annotate/9d8c40cba617/foo?style=monoblue">9d8c40cba617</a>
>>   <a href="/annotate/43c799df6e75/foo?style=monoblue#l1">
>> @@ -1052,9 +1052,9 @@ Set up the repo
>>   <a href="/rev/xyzzy?style=spartan">changeset</a>
>>   <a href="/file/xyzzy/?style=spartan">files</a>
>>   <a href="/file/xyzzy/foo?style=spartan">file</a>
>>   <a href="/log/xyzzy/foo?style=spartan">revisions</a>
>> -  <a href="/raw-annotate/xyzzy/foo">raw</a>
>> +  <a href="/raw-file/xyzzy/foo">raw</a>
>>    <td><a href="/rev/a7c1559b7bba?style=spartan">a7c1559b7bba</a></td>
>>   <a href="/annotate/43c799df6e75/foo?style=spartan">
>>   <td><a href="/annotate/9d8c40cba617/foo?style=spartan">9d8c40cba617</a></td>
>>   <a href="/annotate/43c799df6e75/foo?style=spartan#l1">
>> diff --git a/tests/test-highlight.t b/tests/test-highlight.t
>> --- a/tests/test-highlight.t
>> +++ b/tests/test-highlight.t
>> @@ -235,9 +235,9 @@ hgweb fileannotate, html
>>   <li><a href="/diff/tip/primes.py">diff</a></li>
>>   <li><a href="/comparison/tip/primes.py">comparison</a></li>
>>   <li class="active">annotate</li>
>>   <li><a href="/log/tip/primes.py">file log</a></li>
>> -  <li><a href="/raw-annotate/tip/primes.py">raw</a></li>
>> +  <li><a href="/raw-file/tip/primes.py">raw</a></li>
>>   </ul>
>>   <ul>
>>   <li><a href="/help">help</a></li>
>>   </ul>
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>> 
> 
> -- 
> Pierre-Yves David
Pierre-Yves David - Jan. 6, 2017, 8:21 a.m.
On 01/04/2017 07:06 PM, Gregory Szorc wrote:
>
>> On Jan 4, 2017, at 07:37, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
>>
>>> On 12/28/2016 11:53 PM, Gregory Szorc wrote:
>>> # HG changeset patch
>>> # User Gregory Szorc <gregory.szorc@gmail.com>
>>> # Date 1482965297 25200
>>> #      Wed Dec 28 15:48:17 2016 -0700
>>> # Node ID 4a560014d6d64edcefb1d431e882824771c5ae15
>>> # Parent  dc5b594f41e9be5820ce3f197d3817379b2d3af5
>>> hgweb: link to raw-file on annotation page (BC)
>>>
>>> Every other template has the "raw" link load "raw-file." However,
>>> fileannotate.tmpl's "raw" link loads "raw-annotate." This feels
>>> inconsistent and wrong.
>>
>> Hum, yeah not being served the raw file content when clicking on raw is definitely surprising. So I'm leaning toward taking this.
>>
>> Is there another way to access the raw-annotate (beside url writing) after your change? (that page looks like a strange thing people would not use, but who can predict users in the wild).
>
> No. But it would be trivial to add if users complain. I feel this has been an accidental link for years and nobody has noticed until now. That's why I dropped the link completely.

I lean to agree here. I've pushed it with an extra ping to other 
reviewers to increase the chance of someone complaining if he disagree.

Thanks,

Patch

diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl
--- a/mercurial/templates/gitweb/fileannotate.tmpl
+++ b/mercurial/templates/gitweb/fileannotate.tmpl
@@ -27,9 +27,9 @@ 
 <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
 annotate |
 <a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
 <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
-<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a> |
+<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> |
 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
 <br/>
 </div>
 
diff --git a/mercurial/templates/monoblue/fileannotate.tmpl b/mercurial/templates/monoblue/fileannotate.tmpl
--- a/mercurial/templates/monoblue/fileannotate.tmpl
+++ b/mercurial/templates/monoblue/fileannotate.tmpl
@@ -36,9 +36,9 @@ 
         <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
         <li class="current">annotate</li>
         <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
         <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
-        <li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
+        <li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
     </ul>
 
     <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>
     <h3 class="changeset">{file|escape}</h3>
diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl
--- a/mercurial/templates/paper/fileannotate.tmpl
+++ b/mercurial/templates/paper/fileannotate.tmpl
@@ -27,9 +27,9 @@ 
 <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
 <li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
 <li class="active">annotate</li>
 <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
-<li><a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a></li>
+<li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
 </ul>
 <ul>
 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
diff --git a/mercurial/templates/spartan/fileannotate.tmpl b/mercurial/templates/spartan/fileannotate.tmpl
--- a/mercurial/templates/spartan/fileannotate.tmpl
+++ b/mercurial/templates/spartan/fileannotate.tmpl
@@ -12,9 +12,9 @@ 
 <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>
 <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a>
 <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
-<a href="{url|urlescape}raw-annotate/{symrev}/{file|urlescape}">raw</a>
+<a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a>
 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
 </div>
 
 <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file|escape}</h2>
diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t
--- a/tests/test-hgweb-symrev.t
+++ b/tests/test-hgweb-symrev.t
@@ -185,9 +185,9 @@  Set up the repo
   <li><a href="/file/tip/foo?style=paper">latest</a></li>
   <li><a href="/diff/xyzzy/foo?style=paper">diff</a></li>
   <li><a href="/comparison/xyzzy/foo?style=paper">comparison</a></li>
   <li><a href="/log/xyzzy/foo?style=paper">file log</a></li>
-  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
+  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
    annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=paper">a7c1559b7bba</a>
    <td class="author"><a href="/file/43c799df6e75/foo?style=paper">43c799df6e75</a> </td>
    <td class="author"><a href="/file/9d8c40cba617/foo?style=paper">9d8c40cba617</a> </td>
   <a href="/annotate/43c799df6e75/foo?style=paper#l1">
@@ -380,9 +380,9 @@  Set up the repo
   <li><a href="/file/tip/foo?style=coal">latest</a></li>
   <li><a href="/diff/xyzzy/foo?style=coal">diff</a></li>
   <li><a href="/comparison/xyzzy/foo?style=coal">comparison</a></li>
   <li><a href="/log/xyzzy/foo?style=coal">file log</a></li>
-  <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
+  <li><a href="/raw-file/xyzzy/foo">raw</a></li>
    annotate foo @ 1:<a href="/rev/a7c1559b7bba?style=coal">a7c1559b7bba</a>
    <td class="author"><a href="/file/43c799df6e75/foo?style=coal">43c799df6e75</a> </td>
    <td class="author"><a href="/file/9d8c40cba617/foo?style=coal">9d8c40cba617</a> </td>
   <a href="/annotate/43c799df6e75/foo?style=coal#l1">
@@ -625,9 +625,9 @@  Set up the repo
   <a href="/file/tip/foo?style=gitweb">latest</a> |
   <a href="/log/xyzzy/foo?style=gitweb">revisions</a> |
   <a href="/diff/xyzzy/foo?style=gitweb">diff</a> |
   <a href="/comparison/xyzzy/foo?style=gitweb">comparison</a> |
-  <a href="/raw-annotate/xyzzy/foo">raw</a> |
+  <a href="/raw-file/xyzzy/foo">raw</a> |
    <td style="font-family:monospace"><a class="list" href="/rev/a7c1559b7bba?style=gitweb">a7c1559b7bba</a></td>
   <a class="list" href="/annotate/43c799df6e75/foo?style=gitweb">
   <a class="list" href="/annotate/9d8c40cba617/foo?style=gitweb">9d8c40cba617</a></td>
   <a href="/annotate/43c799df6e75/foo?style=gitweb#l1">
@@ -848,9 +848,9 @@  Set up the repo
           <li><a href="/file/tip/foo?style=monoblue">latest</a></li>
           <li><a href="/log/xyzzy/foo?style=monoblue">revisions</a></li>
           <li><a href="/diff/xyzzy/foo?style=monoblue">diff</a></li>
           <li><a href="/comparison/xyzzy/foo?style=monoblue">comparison</a></li>
-          <li><a href="/raw-annotate/xyzzy/foo">raw</a></li>
+          <li><a href="/raw-file/xyzzy/foo">raw</a></li>
           <dd><a href="/rev/a7c1559b7bba?style=monoblue">a7c1559b7bba</a></dd>
   <a href="/annotate/43c799df6e75/foo?style=monoblue">
   <a href="/annotate/9d8c40cba617/foo?style=monoblue">9d8c40cba617</a>
   <a href="/annotate/43c799df6e75/foo?style=monoblue#l1">
@@ -1052,9 +1052,9 @@  Set up the repo
   <a href="/rev/xyzzy?style=spartan">changeset</a>
   <a href="/file/xyzzy/?style=spartan">files</a>
   <a href="/file/xyzzy/foo?style=spartan">file</a>
   <a href="/log/xyzzy/foo?style=spartan">revisions</a>
-  <a href="/raw-annotate/xyzzy/foo">raw</a>
+  <a href="/raw-file/xyzzy/foo">raw</a>
    <td><a href="/rev/a7c1559b7bba?style=spartan">a7c1559b7bba</a></td>
   <a href="/annotate/43c799df6e75/foo?style=spartan">
   <td><a href="/annotate/9d8c40cba617/foo?style=spartan">9d8c40cba617</a></td>
   <a href="/annotate/43c799df6e75/foo?style=spartan#l1">
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -235,9 +235,9 @@  hgweb fileannotate, html
   <li><a href="/diff/tip/primes.py">diff</a></li>
   <li><a href="/comparison/tip/primes.py">comparison</a></li>
   <li class="active">annotate</li>
   <li><a href="/log/tip/primes.py">file log</a></li>
-  <li><a href="/raw-annotate/tip/primes.py">raw</a></li>
+  <li><a href="/raw-file/tip/primes.py">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>