# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1160864925 25200
# Node ID defadc26e674b3a3afbb2d0d577a59c47e21abc5
# Parent  a74addddd0926ee0c185475fc6bfe97700876620
hgweb: add changeset description to annotate page

diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -393,6 +393,7 @@ class hgweb(object):
                      node=hex(fctx.node()),
                      author=fctx.user(),
                      date=fctx.date(),
+                     desc=fctx.description(),
                      rename=self.renamelink(fl, n),
                      parent=self.siblings(fctx.parents(), file=f),
                      child=self.siblings(fctx.children(), file=f),
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -32,6 +32,10 @@
 <tr>
  <td class="metatag">permissions:</td>
  <td>#permissions|permissions#</td></tr>
+<tr>
+  <td class="metatag">description:</td>
+  <td>{desc|strip|escape|addbreaks}</td>
+</tr>
 </table>
 
 <br/>
diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl
--- a/templates/gitweb/fileannotate.tmpl
+++ b/templates/gitweb/fileannotate.tmpl
@@ -25,6 +25,7 @@ annotate |
 
 <div class="title">#file|escape#</div>
 
+<div class="title_text">
 <table>
 <tr>
  <td class="metatag">changeset #rev#:</td>
@@ -45,7 +46,11 @@ annotate |
  <td class="metatag">permissions:</td>
  <td>#permissions|permissions#</td></tr>
 </table>
+</div>
 
+<div class="page_path">
+{desc|strip|escape|addbreaks}
+</div>
 <div class="page_body">
 <table>
 #annotate%annotateline#