Patchwork [3,of,4,v2] hgweb: rename desc keyword in the summary page to repodesc

login
register
mail settings
Submitter Steven Brown
Date May 16, 2014, 2:47 p.m.
Message ID <047159d0c841fe008d1b.1400251634@steve-debian.home>
Download mbox | patch
Permalink /patch/4785/
State Changes Requested
Headers show

Comments

Steven Brown - May 16, 2014, 2:47 p.m.
# HG changeset patch
# User Steven Brown <StevenGBrown@gmail.com>
# Date 1400245446 -28800
#      Fri May 16 21:04:06 2014 +0800
# Node ID 047159d0c841fe008d1bf7f5d99837f107e974cc
# Parent  8515c010d3452015f92fd37693fd53be93eeb849
hgweb: rename desc keyword in the summary page to repodesc

This allows the check-code script to know the difference between the repository
description and the changeset description, and apply different checks to each.
Pierre-Yves David - May 16, 2014, 5:59 p.m.
On 05/16/2014 07:47 AM, Steven Brown wrote:
> # HG changeset patch
> # User Steven Brown <StevenGBrown@gmail.com>
> # Date 1400245446 -28800
> #      Fri May 16 21:04:06 2014 +0800
> # Node ID 047159d0c841fe008d1bf7f5d99837f107e974cc
> # Parent  8515c010d3452015f92fd37693fd53be93eeb849
> hgweb: rename desc keyword in the summary page to repodesc
>
> This allows the check-code script to know the difference between the repository
> description and the changeset description, and apply different checks to each.

Is this a global change to the templating format? If so I'm not sure 
it's a good idea and certainly deserve a "(BC)" flag in the commit 
message to tag it as backward incompatible.

If it is not a global change, I'm curious about what is actually changed 
here.

Patch

diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -639,7 +639,7 @@ 
     end = min(count, start + web.maxchanges)
 
     return tmpl("summary",
-                desc=web.config("web", "description", "unknown"),
+                repodesc=web.config("web", "description", "unknown"),
                 owner=get_contact(web.config) or "unknown",
                 lastchange=tip.date(),
                 tags=tagentries,
diff --git a/mercurial/templates/gitweb/summary.tmpl b/mercurial/templates/gitweb/summary.tmpl
--- a/mercurial/templates/gitweb/summary.tmpl
+++ b/mercurial/templates/gitweb/summary.tmpl
@@ -33,7 +33,7 @@ 
 
 <div class="title">&nbsp;</div>
 <table cellspacing="0">
-<tr><td>description</td><td>{desc}</td></tr>
+<tr><td>description</td><td>{repodesc}</td></tr>
 <tr><td>owner</td><td>{owner|obfuscate}</td></tr>
 <tr><td>last change</td><td>{lastchange|rfc822date}</td></tr>
 </table>
diff --git a/mercurial/templates/monoblue/summary.tmpl b/mercurial/templates/monoblue/summary.tmpl
--- a/mercurial/templates/monoblue/summary.tmpl
+++ b/mercurial/templates/monoblue/summary.tmpl
@@ -35,7 +35,7 @@ 
         <dt>name</dt>
         <dd>{repo|escape}</dd>
         <dt>description</dt>
-        <dd>{desc}</dd>
+        <dd>{repodesc}</dd>
         <dt>owner</dt>
         <dd>{owner|obfuscate}</dd>
         <dt>last change</dt>