From 2f9a035003014be583b756906b4f9fabaa795648 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 5 Nov 2009 14:44:29 +0100
Subject: [PATCH] templater: put 'ago' inside the age template filter

---
 mercurial/templatefilters.py           |  2 +-
 templates/gitweb/changelogentry.tmpl   |  2 +-
 templates/gitweb/changeset.tmpl        |  2 +-
 templates/gitweb/fileannotate.tmpl     |  2 +-
 templates/gitweb/filerevision.tmpl     |  2 +-
 templates/gitweb/map                   | 10 +++++-----
 templates/monoblue/changelogentry.tmpl |  2 +-
 templates/monoblue/changeset.tmpl      |  2 +-
 templates/monoblue/fileannotate.tmpl   |  2 +-
 templates/monoblue/filerevision.tmpl   |  2 +-
 templates/monoblue/map                 | 10 +++++-----
 templates/paper/changeset.tmpl         |  2 +-
 templates/paper/fileannotate.tmpl      |  2 +-
 templates/paper/filediff.tmpl          |  2 +-
 templates/paper/filerevision.tmpl      |  2 +-
 templates/paper/map                    |  2 +-
 templates/spartan/changelogentry.tmpl  |  2 +-
 templates/spartan/changeset.tmpl       |  2 +-
 templates/spartan/fileannotate.tmpl    |  2 +-
 templates/spartan/filelogentry.tmpl    |  2 +-
 templates/spartan/filerevision.tmpl    |  2 +-
 templates/static/style-paper.css       |  2 +-
 tests/test-hgweb-commands.out          |  8 ++++----
 tests/test-hgweb-filelog.out           | 12 ++++++------
 24 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
index 7d60209462..454c5836de 100644
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -43,7 +43,7 @@ def age(date):
     for t, s in agescales:
         n = delta // s
         if n >= 2 or s == 1:
-            return fmt(t, n)
+            return '%s ago' % fmt(t, n)
 
 para_re = None
 space_re = None
diff --git a/templates/gitweb/changelogentry.tmpl b/templates/gitweb/changelogentry.tmpl
index 2a7c3cb253..bb11704530 100644
--- a/templates/gitweb/changelogentry.tmpl
+++ b/templates/gitweb/changelogentry.tmpl
@@ -1,5 +1,5 @@
 <div>
-<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age} ago</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
+<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
 </div>
 <div class="title_text">
 <div class="log_link">
diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl
index 2487dd66ef..3928a3fc68 100644
--- a/templates/gitweb/changeset.tmpl
+++ b/templates/gitweb/changeset.tmpl
@@ -29,7 +29,7 @@ changeset |
 <div class="title_text">
 <table cellspacing="0">
 <tr><td>author</td><td>{author|obfuscate}</td></tr>
-<tr><td></td><td>{date|date} ({date|age} ago)</td></tr>
+<tr><td></td><td>{date|date} ({date|age})</td></tr>
 {branch%changesetbranch}
 <tr><td>changeset {rev}</td><td style="font-family:monospace">{node|short}</td></tr>
 {parent%changesetparent}
diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl
index 87e8cc3168..badb75c242 100644
--- a/templates/gitweb/fileannotate.tmpl
+++ b/templates/gitweb/fileannotate.tmpl
@@ -36,7 +36,7 @@ annotate |
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td></td>
- <td>{date|date} ({date|age} ago)</td></tr>
+ <td>{date|date} ({date|age})</td></tr>
 {branch%filerevbranch}
 <tr>
  <td>changeset {rev}</td>
diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl
index d64c632afd..afe041ed92 100644
--- a/templates/gitweb/filerevision.tmpl
+++ b/templates/gitweb/filerevision.tmpl
@@ -36,7 +36,7 @@ file |
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td></td>
- <td>{date|date} ({date|age} ago)</td></tr>
+ <td>{date|date} ({date|age})</td></tr>
 {branch%filerevbranch}
 <tr>
  <td>changeset {rev}</td>
diff --git a/templates/gitweb/map b/templates/gitweb/map
index fc0fedd577..759d0bc625 100644
--- a/templates/gitweb/map
+++ b/templates/gitweb/map
@@ -150,7 +150,7 @@ fileannotatechild = '
 tags = tags.tmpl
 tagentry = '
   <tr class="parity{parity}">
-    <td class="age"><i>{date|age} ago</i></td>
+    <td class="age"><i>{date|age}</i></td>
     <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td>
     <td class="link">
       <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -161,7 +161,7 @@ tagentry = '
 branches = branches.tmpl
 branchentry = '
   <tr class="parity{parity}">
-    <td class="age"><i>{date|age} ago</i></td>
+    <td class="age"><i>{date|age}</i></td>
     <td><a class="list" href="{url}shortlog/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td>
     <td class="{status}">{branch|escape}</td>
     <td class="link">
@@ -204,7 +204,7 @@ branchtag = '<span class="branchtag" title="{name}">{name}</span> '
 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
 shortlogentry = '
   <tr class="parity{parity}">
-    <td class="age"><i>{date|age} ago</i></td>
+    <td class="age"><i>{date|age}</i></td>
     <td><i>{author|person}</i></td>
     <td>
       <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
@@ -219,7 +219,7 @@ shortlogentry = '
   </tr>'
 filelogentry = '
   <tr class="parity{parity}">
-    <td class="age"><i>{date|age} ago</i></td>
+    <td class="age"><i>{date|age}</i></td>
     <td>
       <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
         <b>{desc|strip|firstline|escape|nonempty}</b>
@@ -238,7 +238,7 @@ indexentry = '
     </td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td class="age">{lastchange|age} ago</td>
+    <td class="age">{lastchange|age}</td>
     <td class="indexlinks">{archives%indexarchiveentry}</td>
     <td><div class="rss_logo"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a></div></td>
   </tr>\n'
diff --git a/templates/monoblue/changelogentry.tmpl b/templates/monoblue/changelogentry.tmpl
index df03c97581..690662951d 100644
--- a/templates/monoblue/changelogentry.tmpl
+++ b/templates/monoblue/changelogentry.tmpl
@@ -1,6 +1,6 @@
 <h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
 <ul class="changelog-entry">
-    <li class="age">{date|age} ago</li>
+    <li class="age">{date|age}</li>
     <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
     <li class="description">{desc|strip|escape|addbreaks|nonempty}</li>
 </ul>
diff --git a/templates/monoblue/changeset.tmpl b/templates/monoblue/changeset.tmpl
index 8919778f2c..6a0ec71870 100644
--- a/templates/monoblue/changeset.tmpl
+++ b/templates/monoblue/changeset.tmpl
@@ -36,7 +36,7 @@
     <h2 class="no-link no-border">changeset</h2>
 
     <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
-    <p class="changeset-age"><span>{date|age} ago</span></p>
+    <p class="changeset-age"><span>{date|age}</span></p>
 
     <dl class="overview">
         <dt>author</dt>
diff --git a/templates/monoblue/fileannotate.tmpl b/templates/monoblue/fileannotate.tmpl
index 13094f6998..c32cd0631c 100644
--- a/templates/monoblue/fileannotate.tmpl
+++ b/templates/monoblue/fileannotate.tmpl
@@ -38,7 +38,7 @@
 
     <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>
     <h3 class="changeset">{file|escape}</h3>
-    <p class="changeset-age"><span>{date|age} ago</span></p>
+    <p class="changeset-age"><span>{date|age}</span></p>
 
     <dl class="overview">
         <dt>author</dt>
diff --git a/templates/monoblue/filerevision.tmpl b/templates/monoblue/filerevision.tmpl
index f58c633243..5904e78290 100644
--- a/templates/monoblue/filerevision.tmpl
+++ b/templates/monoblue/filerevision.tmpl
@@ -38,7 +38,7 @@
 
     <h2 class="no-link no-border">{file|escape}@{node|short}</h2>
     <h3 class="changeset">{file|escape}</h3>
-    <p class="changeset-age"><span>{date|age} ago</span></p>
+    <p class="changeset-age"><span>{date|age}</span></p>
 
     <dl class="overview">
         <dt>author</dt>
diff --git a/templates/monoblue/map b/templates/monoblue/map
index 146e3f62f1..3fc73ad0bb 100644
--- a/templates/monoblue/map
+++ b/templates/monoblue/map
@@ -127,7 +127,7 @@ fileannotatechild = '
 tags = tags.tmpl
 tagentry = '
   <tr class="parity{parity}">
-    <td class="nowrap">{date|age} ago</td>
+    <td class="nowrap">{date|age}</td>
     <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td>
     <td class="nowrap">
       <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -138,7 +138,7 @@ tagentry = '
 branches = branches.tmpl
 branchentry = '
   <tr class="parity{parity}">
-    <td class="nowrap">{date|age} ago</td>
+    <td class="nowrap">{date|age}</td>
     <td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
     <td class="{status}">{branch|escape}</td>
     <td class="nowrap">
@@ -170,7 +170,7 @@ branchtag = '<span class="branchtag" title="{name}">{name}</span> '
 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
 shortlogentry = '
   <tr class="parity{parity}">
-    <td class="nowrap">{date|age} ago</td>
+    <td class="nowrap">{date|age}</td>
     <td>{author|person}</td>
     <td>
       <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
@@ -185,7 +185,7 @@ shortlogentry = '
   </tr>'
 filelogentry = '
   <tr class="parity{parity}">
-    <td class="nowrap">{date|age} ago</td>
+    <td class="nowrap">{date|age}</td>
     <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
     <td class="nowrap">
       <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a>&nbsp;|&nbsp;<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>&nbsp;|&nbsp;<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
@@ -198,7 +198,7 @@ indexentry = '
     <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td>{lastchange|age} ago</td>
+    <td>{lastchange|age}</td>
     <td class="indexlinks">{archives%indexarchiveentry}</td>
     <td>
       <div class="rss_logo">
diff --git a/templates/paper/changeset.tmpl b/templates/paper/changeset.tmpl
index cce7aaee7a..3e18978e82 100644
--- a/templates/paper/changeset.tmpl
+++ b/templates/paper/changeset.tmpl
@@ -45,7 +45,7 @@ files, or words in the commit message</div>
 </tr>
 <tr>
  <th class="date">date</th>
- <td class="date">{date|date} ({date|age} ago)</td></tr>
+ <td class="date">{date|date} ({date|age})</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author">{parent%changesetparent}</td>
diff --git a/templates/paper/fileannotate.tmpl b/templates/paper/fileannotate.tmpl
index 10ac91c613..e342063313 100644
--- a/templates/paper/fileannotate.tmpl
+++ b/templates/paper/fileannotate.tmpl
@@ -50,7 +50,7 @@ files, or words in the commit message</div>
 </tr>
 <tr>
  <th class="date">date</th>
- <td class="date">{date|date} ({date|age} ago)</td>
+ <td class="date">{date|date} ({date|age})</td>
 </tr>
 <tr>
  <th class="author">parents</th>
diff --git a/templates/paper/filediff.tmpl b/templates/paper/filediff.tmpl
index 13987d5bdc..2e8077e0e4 100644
--- a/templates/paper/filediff.tmpl
+++ b/templates/paper/filediff.tmpl
@@ -49,7 +49,7 @@ files, or words in the commit message</div>
 </tr>
 <tr>
  <th>date</th>
- <td>{date|date} ({date|age} ago)</td>
+ <td>{date|date} ({date|age})</td>
 </tr>
 <tr>
  <th>parents</th>
diff --git a/templates/paper/filerevision.tmpl b/templates/paper/filerevision.tmpl
index 1671aeb880..6aebfe70d5 100644
--- a/templates/paper/filerevision.tmpl
+++ b/templates/paper/filerevision.tmpl
@@ -49,7 +49,7 @@ files, or words in the commit message</div>
 </tr>
 <tr>
  <th class="date">date</th>
- <td class="date">{date|date} ({date|age} ago)</td>
+ <td class="date">{date|date} ({date|age})</td>
 </tr>
 <tr>
  <th class="author">parents</th>
diff --git a/templates/paper/map b/templates/paper/map
index 96b8a82e65..d064de9928 100644
--- a/templates/paper/map
+++ b/templates/paper/map
@@ -176,7 +176,7 @@ indexentry = '
     <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td class="age">{lastchange|age} ago</td>
+    <td class="age">{lastchange|age}</td>
     <td class="indexlinks">{archives%indexarchiveentry}</td>
   </tr>\n'
 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
diff --git a/templates/spartan/changelogentry.tmpl b/templates/spartan/changelogentry.tmpl
index e4d2c0ef5d..e9247226d8 100644
--- a/templates/spartan/changelogentry.tmpl
+++ b/templates/spartan/changelogentry.tmpl
@@ -1,6 +1,6 @@
 <table class="logEntry parity{parity}">
  <tr>
-  <th class="age">{date|age} ago:</th>
+  <th class="age">{date|age}:</th>
   <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
  </tr>
  <tr>
diff --git a/templates/spartan/changeset.tmpl b/templates/spartan/changeset.tmpl
index 4826c08a1f..69661556ef 100644
--- a/templates/spartan/changeset.tmpl
+++ b/templates/spartan/changeset.tmpl
@@ -30,7 +30,7 @@
 </tr>
 <tr>
  <th class="date">date:</th>
- <td class="date">{date|date} ({date|age} ago)</td>
+ <td class="date">{date|date} ({date|age})</td>
 </tr>
 <tr>
  <th class="files">files:</th>
diff --git a/templates/spartan/fileannotate.tmpl b/templates/spartan/fileannotate.tmpl
index 2631fbe974..6cc42c3486 100644
--- a/templates/spartan/fileannotate.tmpl
+++ b/templates/spartan/fileannotate.tmpl
@@ -29,7 +29,7 @@
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td class="metatag">date:</td>
- <td>{date|date} ({date|age} ago)</td>
+ <td>{date|date} ({date|age})</td>
 </tr>
 <tr>
  <td class="metatag">permissions:</td>
diff --git a/templates/spartan/filelogentry.tmpl b/templates/spartan/filelogentry.tmpl
index 526016b847..dcbdca80b5 100644
--- a/templates/spartan/filelogentry.tmpl
+++ b/templates/spartan/filelogentry.tmpl
@@ -1,6 +1,6 @@
 <table class="logEntry parity{parity}">
  <tr>
-  <th class="age">{date|age} ago:</th>
+  <th class="age">{date|age}:</th>
   <th class="firstline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
  </tr>
  <tr>
diff --git a/templates/spartan/filerevision.tmpl b/templates/spartan/filerevision.tmpl
index b13695d237..c298a485e3 100644
--- a/templates/spartan/filerevision.tmpl
+++ b/templates/spartan/filerevision.tmpl
@@ -29,7 +29,7 @@
  <td>{author|obfuscate}</td></tr>
 <tr>
  <td class="metatag">date:</td>
- <td>{date|date} ({date|age} ago)</td></tr>
+ <td>{date|date} ({date|age})</td></tr>
 <tr>
  <td class="metatag">permissions:</td>
  <td>{permissions|permissions}</td></tr>
diff --git a/templates/static/style-paper.css b/templates/static/style-paper.css
index edb9beab6e..e651ba3299 100644
--- a/templates/static/style-paper.css
+++ b/templates/static/style-paper.css
@@ -161,7 +161,7 @@ h3 {
   border-bottom: 1px solid #999;
 }
 .bigtable tr { border: none; }
-.bigtable .age { width: 6em; }
+.bigtable .age { width: 7em; }
 .bigtable .author { width: 12em; }
 .bigtable .description { }
 .bigtable .node { width: 5em; font-family: monospace;}
diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out
index 708a180979..4037c1507f 100644
--- a/tests/test-hgweb-commands.out
+++ b/tests/test-hgweb-commands.out
@@ -210,17 +210,17 @@ files, or words in the commit message</div>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/1d22e65f027e">branch</a><span class="branchhead">stable</span> <span class="tag">tip</span> </td>
  </tr>
  <tr class="parity1">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/a4f92ed23982">Added tag 1.0 for changeset 2ef0ac749a14</a><span class="branchhead">default</span> </td>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> </td>
  </tr>
@@ -764,7 +764,7 @@ graph |
 <script>
 <!-- hide script content
 
-var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "many years", ["stable", true], ["tip"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "many years", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "many years", ["default", false], ["1.0"]]];
+var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "many years ago", ["stable", true], ["tip"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "many years ago", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "many years ago", ["default", false], ["1.0"]]];
 var graph = new Graph();
 graph.scale(39);
 
diff --git a/tests/test-hgweb-filelog.out b/tests/test-hgweb-filelog.out
index 576ab99f55..0b5b276add 100644
--- a/tests/test-hgweb-filelog.out
+++ b/tests/test-hgweb-filelog.out
@@ -148,12 +148,12 @@ files, or words in the commit message</div>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
  </tr>
  <tr class="parity1">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
@@ -231,12 +231,12 @@ files, or words in the commit message</div>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
  </tr>
  <tr class="parity1">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
@@ -314,7 +314,7 @@ files, or words in the commit message</div>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
@@ -392,7 +392,7 @@ files, or words in the commit message</div>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
-  <td class="age">many years</td>
+  <td class="age">many years ago</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>