[PATCH] hgweb: display branch names

Benoît Allard benoit at aeteurope.nl
Tue Oct 21 02:44:30 CDT 2008


that patch adds the branch name to the webpage in the graph view and the 
changelog view for coal/paper and monoblue.

# HG changeset patch
# User Benoit Allard <benoit at aeteurope.nl>
# Date 1224520062 -7200
# Node ID 5c0f533d160cf74368d6d030589393d06717629d
# Parent  8bbbba2a1a9c035d0b600daff822ba2811457b04
hgweb: display branch name

diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/coal/graph.tmpl
--- a/templates/coal/graph.tmpl        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/coal/graph.tmpl        Mon Oct 20 18:27:42 2008 +0200
@@ -68,8 +68,7 @@

  var revlink = '<li style="_STYLE"><span class="desc">';
  revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" 
title="_NODEID">_DESC</a>';
-revlink += '</span><span class="tag">_TAGS</span>';
-revlink += '<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '</span>_TAGS<span class="info">_DATE ago, by 
_USER</span></li>';

  graph.vertex = function(x, y, color, parity, cur) {

@@ -88,10 +87,30 @@
          item = item.replace(/_DESC/, cur[3]);
          item = item.replace(/_USER/, cur[4]);
          item = item.replace(/_DATE/, cur[5]);
-        item = item.replace(/_TAGS/, cur[7].join('&nbsp; '));
-
+
+        var tagspan = '';
+        if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+                tagspan = '<span class="logtags">';
+                if (cur[6][1]) {
+                        tagspan += '<span class="branchhead" title="' + 
cur[6][0] + '">';
+                        tagspan += cur[6][0] + '</span> ';
+                } else if (!cur[6][1] && cur[6][0] != 'default') {
+                        tagspan += '<span class="branchname" title="' + 
cur[6][0] + '">';
+                        tagspan += cur[6][0] + '</span> ';
+                }
+                if (cur[7].length) {
+                        for (var t in cur[7]) {
+                                var tag = cur[7][t];
+                                tagspan += '<span class="tag">' + tag + 
'</span> ';
+                        }
+                }
+                tagspan += '</span>';
+        }
+
+        item = item.replace(/_TAGS/, tagspan);
+
          return [bg, item];
-
+
  }

  graph.render(data);
diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/coal/map
--- a/templates/coal/map        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/coal/map        Mon Oct 20 18:27:42 2008 +0200
@@ -57,6 +57,8 @@
  tags = tags.tmpl
  tagentry = '<tr class="tagEntry parity{parity}"><td><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td 
class="node">{node|short}</td></tr>'
  changelogtag = '<span class="tag">{name|escape}</span> '
+changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
+changelogbranchname = '<span class="branchname">{name|escape}</span> '
  changesettag = '<span class="tag">{tag|escape}</span> '
  filediffparent = '<tr><th class="parent">parent {rev}:</th><td 
class="parent"><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
  filelogparent = '<tr><th>parent {rev}:</th><td><a 
href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/coal/shortlogentry.tmpl
--- a/templates/coal/shortlogentry.tmpl        Mon Oct 20 14:58:49 2008 
+0200
+++ b/templates/coal/shortlogentry.tmpl        Mon Oct 20 18:27:42 2008 
+0200
@@ -1,5 +1,5 @@
   <tr class="parity{parity}">
    <td class="age">{date|age}</td>
    <td class="author">{author|person}</td>
-  <td class="description"><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a>{tags%changelogtag}</td>
+  <td class="description"><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}</td>
   </tr>
diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/monoblue/graph.tmpl
--- a/templates/monoblue/graph.tmpl        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/monoblue/graph.tmpl        Mon Oct 20 18:27:42 2008 +0200
@@ -59,7 +59,7 @@

      var revlink = '<li style="_STYLE"><span class="desc">';
      revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" 
title="_NODEID">_DESC</a>';
-    revlink += '</span><span class="info">_DATE ago, by _USER</span></li>';
+    revlink += '</span>_TAGS<span class="info">_DATE ago, by 
_USER</span></li>';

      graph.vertex = function(x, y, color, parity, cur) {

@@ -78,6 +78,27 @@
          item = item.replace(/_DESC/, cur[3]);
          item = item.replace(/_USER/, cur[4]);
          item = item.replace(/_DATE/, cur[5]);
+
+        var tagspan = '';
+        if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+                tagspan = '<span class="logtags">';
+                if (cur[6][1]) {
+                        tagspan += '<span class="branchtag" title="' + 
cur[6][0] + '">';
+                        tagspan += cur[6][0] + '</span> ';
+                } else if (!cur[6][1] && cur[6][0] != 'default') {
+                        tagspan += '<span class="inbranchtag" title="' 
+ cur[6][0] + '">';
+                        tagspan += cur[6][0] + '</span> ';
+                }
+                if (cur[7].length) {
+                        for (var t in cur[7]) {
+                                var tag = cur[7][t];
+                                tagspan += '<span class="tagtag">' + 
tag + '</span> ';
+                        }
+                }
+                tagspan += '</span>';
+        }
+
+        item = item.replace(/_TAGS/, tagspan);

          return [bg, item];

diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/paper/map
--- a/templates/paper/map        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/paper/map        Mon Oct 20 18:27:42 2008 +0200
@@ -56,8 +56,9 @@
  fileannotatechild = '<tr><td class="metatag">child:</td><td><a 
href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
  tags = ../coal/tags.tmpl
  tagentry = '<tr class="tagEntry parity{parity}"><td><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td 
class="node">{node|short}</td></tr>'
-changelogtag = '<tr><th class="tag">tag:</th><td 
class="tag">{tag|escape}</td></tr>'
  changelogtag = '<span class="tag">{name|escape}</span> '
+changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
+changelogbranchname = '<span class="branchname">{name|escape}</span> '
  changesettag = '<span class="tag">{tag|escape}</span> '
  filediffparent = '<tr><th class="parent">parent {rev}:</th><td 
class="parent"><a 
href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
  filelogparent = '<tr><th>parent {rev}:</th><td><a 
href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/static/style-coal.css
--- a/templates/static/style-coal.css        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/static/style-coal.css        Mon Oct 20 18:27:42 2008 +0200
@@ -90,6 +90,22 @@
  .tag {
    color: #999;
    font-size: 70%;
+  font-weight: normal;
+  margin-left: .5em;
+  vertical-align: baseline;
+}
+
+.branchhead {
+  color: #cc0066;
+  font-size: 80%;
+  font-weight: normal;
+  margin-left: .5em;
+  vertical-align: baseline;
+}
+
+.branchname {
+  color: #ee8800;
+  font-size: 60%;
    font-weight: normal;
    margin-left: .5em;
    vertical-align: baseline;
diff -r 8bbbba2a1a9c -r 5c0f533d160c templates/static/style-paper.css
--- a/templates/static/style-paper.css        Mon Oct 20 14:58:49 2008 +0200
+++ b/templates/static/style-paper.css        Mon Oct 20 18:27:42 2008 +0200
@@ -86,6 +86,22 @@
  .tag {
    color: #999;
    font-size: 70%;
+  font-weight: normal;
+  margin-left: .5em;
+  vertical-align: baseline;
+}
+
+.branchhead {
+  color: #cc0066;
+  font-size: 80%;
+  font-weight: normal;
+  margin-left: .5em;
+  vertical-align: baseline;
+}
+
+.branchname {
+  color: #ee8800;
+  font-size: 60%;
    font-weight: normal;
    margin-left: .5em;
    vertical-align: baseline;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4197 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20081021/03ac9026/attachment.bin 


More information about the Mercurial-devel mailing list