[PATCH STABLE] hgweb: remove baseline info from paper template

[Mads Kiilerich]

On 02/01/2013 05:43 AM, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1359693606 -3600
> # Branch stable
> # Node ID 80f3dd3aa40280e97289153455b493c727ef0a52
> # Parent  2a1fac3650a5b4d650198604c82ab59969500374
> hgweb: remove baseline info from paper template
>
> The user interface is not considered ready for prime time yet. The internal code stay in
> place custom template usage. The feature is ultimatly wished and will be
> reenabled soon. The current issue is only related to the visual of the current
> interface.

A reference to the revision that introduced the feature, please.

The template keyword 'currentbaseline' is also very strange - there is 
no 'baseline' concept anywhere in Mercurial. In 'changeset' it should be 
something like 'diffparent'. Diff between arbitrary revisions belongs 
elsewhere - and then it would be more descriptive to call the two nodes 
'anode' and 'bnode'.

So I suggest removing the keyword too so we can change it without 
breaking backward compatibility. Actually I suggest backing out the full 
feature until it is ready.

/Mads

>
> diff --git a/mercurial/templates/paper/changeset.tmpl b/mercurial/templates/paper/changeset.tmpl
> --- a/mercurial/templates/paper/changeset.tmpl
> +++ b/mercurial/templates/paper/changeset.tmpl
> @@ -72,18 +72,10 @@ files, or words in the commit message</d
>         <p>
>         <table>{diffstat}</table>
>       </div>
>     </td>
>   </tr>
> -<tr>
> - <th class="author">change baseline</th>
> - <td class="author">{parent%changesetbaseline}</td>
> -</tr>
> -<tr>
> - <th class="author">current baseline</th>
> - <td class="author"><a href="{url}rev/{currentbaseline|short}{sessionvars%urlparameter}">{currentbaseline|short}</a></td>
> -</tr>
>   </table>
>   
>   <div class="overflow">
>   <div class="sourcefirst">   line diff</div>
>   
> diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
> --- a/tests/test-hgweb-commands.t
> +++ b/tests/test-hgweb-commands.t
> @@ -445,18 +445,10 @@ Logs and changes
>       </tr>
>     </table>
>         </div>
>       </td>
>     </tr>
> -  <tr>
> -   <th class="author">change baseline</th>
> -   <td class="author"></td>
> -  </tr>
> -  <tr>
> -   <th class="author">current baseline</th>
> -   <td class="author"><a href="/rev/000000000000">000000000000</a></td>
> -  </tr>
>     </table>
>     
>     <div class="overflow">
>     <div class="sourcefirst">   line diff</div>
>     
> diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t
> --- a/tests/test-hgweb-diffs.t
> +++ b/tests/test-hgweb-diffs.t
> @@ -137,18 +137,10 @@ revision
>       </tr>
>     </table>
>         </div>
>       </td>
>     </tr>
> -  <tr>
> -   <th class="author">change baseline</th>
> -   <td class="author"></td>
> -  </tr>
> -  <tr>
> -   <th class="author">current baseline</th>
> -   <td class="author"><a href="/rev/000000000000">000000000000</a></td>
> -  </tr>
>     </table>
>     
>     <div class="overflow">
>     <div class="sourcefirst">   line diff</div>
>     
> @@ -406,18 +398,10 @@ revision
>       </tr>
>     </table>
>         </div>
>       </td>
>     </tr>
> -  <tr>
> -   <th class="author">change baseline</th>
> -   <td class="author"></td>
> -  </tr>
> -  <tr>
> -   <th class="author">current baseline</th>
> -   <td class="author"><a href="/rev/000000000000">000000000000</a></td>
> -  </tr>
>     </table>
>     
>     <div class="overflow">
>     <div class="sourcefirst">   line diff</div>
>     
> diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t
> --- a/tests/test-hgweb-removed.t
> +++ b/tests/test-hgweb-removed.t
> @@ -110,18 +110,10 @@ revision
>       </tr>
>     </table>
>         </div>
>       </td>
>     </tr>
> -  <tr>
> -   <th class="author">change baseline</th>
> -   <td class="author"><a href="/rev/cb9a9f314b8b:c78f6c5cbea9">cb9a9f314b8b</a> </td>
> -  </tr>
> -  <tr>
> -   <th class="author">current baseline</th>
> -   <td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a></td>
> -  </tr>
>     </table>
>     
>     <div class="overflow">
>     <div class="sourcefirst">   line diff</div>
>     
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel