Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph

This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.

We also undo the setup.py change because python now supports bz2

9 files changed, 20 insertions, 10 deletions

diff --git a/mercurial/templates/spartan/changelogentry.tmpl b/mercurial/templates/spartan/changelogentry.tmpl
index f506b94..52dd3fd 100644
--- a/mercurial/templates/spartan/changelogentry.tmpl
+++ b/mercurial/templates/spartan/changelogentry.tmpl
@@ -1,6 +1,6 @@
 <table class="logEntry parity{parity}">
  <tr>
-  <th><span class="age">{date|rfc822date}</span>:</th>
+  <th><span class="age">{date|date}</span>:</th>
   <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
  </tr>
  <tr>
@@ -16,7 +16,7 @@
  </tr>
  <tr>
   <th class="date">date:</th>
-  <td class="date">{date|rfc822date}</td>
+  <td class="date">{date|date}</td>
  </tr>
  <tr>
   <th class="files"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>
diff --git a/mercurial/templates/spartan/changeset.tmpl b/mercurial/templates/spartan/changeset.tmpl
index b357126..51944ca 100644
--- a/mercurial/templates/spartan/changeset.tmpl
+++ b/mercurial/templates/spartan/changeset.tmpl
@@ -31,7 +31,7 @@
 </tr>
 <tr>
  <th class="date">date:</th>
- <td class="date age">{date|rfc822date}</td>
+ <td class="date age">{date|date}</td>
 </tr>
 <tr>
  <th class="files">files:</th>
diff --git a/mercurial/templates/spartan/fileannotate.tmpl b/mercurial/templates/spartan/fileannotate.tmpl
index 5d6a72b..6648103 100644
--- a/mercurial/templates/spartan/fileannotate.tmpl
+++ b/mercurial/templates/spartan/fileannotate.tmpl
@@ -30,7 +30,7 @@
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td class="metatag">date:</td>
- <td class="date age">{date|rfc822date}</td>
+ <td class="date age">{date|date}</td>
 </tr>
 <tr>
  <td class="metatag">permissions:</td>
diff --git a/mercurial/templates/spartan/filelogentry.tmpl b/mercurial/templates/spartan/filelogentry.tmpl
index baff52d..63dd686 100644
--- a/mercurial/templates/spartan/filelogentry.tmpl
+++ b/mercurial/templates/spartan/filelogentry.tmpl
@@ -1,6 +1,6 @@
 <table class="logEntry parity{parity}">
  <tr>
-  <th><span class="age">{date|rfc822date}</span>:</th>
+  <th><span class="age">{date|date}</span>:</th>
   <th class="firstline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
  </tr>
  <tr>
@@ -18,7 +18,7 @@
  </tr>
  <tr>
   <th class="date">date:</th>
-  <td class="date">{date|rfc822date}</td>
+  <td class="date">{date|date}</td>
  </tr>
 </table>
 
diff --git a/mercurial/templates/spartan/filerevision.tmpl b/mercurial/templates/spartan/filerevision.tmpl
index 548d3c6..eb46a10 100644
--- a/mercurial/templates/spartan/filerevision.tmpl
+++ b/mercurial/templates/spartan/filerevision.tmpl
@@ -30,7 +30,7 @@
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td class="metatag">date:</td>
- <td class="date age">{date|rfc822date}</td></tr>
+ <td class="date age">{date|date}</td></tr>
 <tr>
  <td class="metatag">permissions:</td>
  <td>{permissions|permissions}</td></tr>
diff --git a/mercurial/templates/spartan/footer.tmpl b/mercurial/templates/spartan/footer.tmpl
index 665bdb2..851c758 100644
--- a/mercurial/templates/spartan/footer.tmpl
+++ b/mercurial/templates/spartan/footer.tmpl
@@ -2,7 +2,7 @@
 {motd}
 <div class="logo">
 <a href="{logourl}">
-<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
+<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
 
 </body>
diff --git a/mercurial/templates/spartan/graph.tmpl b/mercurial/templates/spartan/graph.tmpl
index 054bc42..67736e0 100644
--- a/mercurial/templates/spartan/graph.tmpl
+++ b/mercurial/templates/spartan/graph.tmpl
@@ -43,6 +43,16 @@ var data = {jsdata|json};
 var graph = new Graph();
 graph.scale({bg_height});
 
+graph.edge = function(x0, y0, x1, y1, color) \{
+	
+	this.setColor(color, 0.0, 0.65);
+	this.ctx.beginPath();
+	this.ctx.moveTo(x0, y0);
+	this.ctx.lineTo(x1, y1);
+	this.ctx.stroke();
+	
+}
+
 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, by _USER</span></li>';
diff --git a/mercurial/templates/spartan/map b/mercurial/templates/spartan/map
index 8280723..8aaacae 100644
--- a/mercurial/templates/spartan/map
+++ b/mercurial/templates/spartan/map
@@ -168,7 +168,7 @@ indexentry = '
     <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td class="age">{lastchange|rfc822date}</td>
+    <td class="age">{lastchange|date}</td>
     <td class="indexlinks">
       <a href="{url}rss-log">RSS</a>
       <a href="{url}atom-log">Atom</a>
diff --git a/mercurial/templates/spartan/shortlogentry.tmpl b/mercurial/templates/spartan/shortlogentry.tmpl
index d104753..670c786 100644
--- a/mercurial/templates/spartan/shortlogentry.tmpl
+++ b/mercurial/templates/spartan/shortlogentry.tmpl
@@ -1,6 +1,6 @@
 <table class="slogEntry parity{parity}">
  <tr>
-  <td class="age">{date|rfc822date}</td>
+  <td class="age">{date|date}</td>
   <td class="author">{author|person}</td>
   <td class="node"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
  </tr>