diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- 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 --- a/templates/gitweb/changelogentry.tmpl +++ b/templates/gitweb/changelogentry.tmpl @@ -1,5 +1,5 @@
author | {author|obfuscate} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
{date|date} ({date|age} ago) | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
{date|date} ({date|age}) | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
changeset {rev} | {node|short} | {author|obfuscate} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- | {date|date} ({date|age} ago) | {date|date} ({date|age}) | {branch%filerevbranch}|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
changeset {rev} | diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -36,7 +36,7 @@ file |{author|obfuscate} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- | {date|date} ({date|age} ago) | {date|date} ({date|age}) | {branch%filerevbranch}|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
changeset {rev} | diff --git a/templates/gitweb/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -150,7 +150,7 @@ fileannotatechild = ' tags = tags.tmpl tagentry = '|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
{date|age} ago | +{date|age} | {tag|escape} | changeset | @@ -161,7 +161,7 @@ tagentry = ' branches = branches.tmpl branchentry = ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
{date|age} ago | +{date|age} | {node|short} | {branch|escape} |
@@ -204,7 +204,7 @@ branchtag = ''
filelogentry = '
{date|age} ago |
+ {date|age} |
{desc|strip|firstline|escape|nonempty}
@@ -238,7 +238,7 @@ indexentry = '
|
{description} |
{contact|obfuscate} |
- {lastchange|age} ago |
+ {lastchange|age} |
{archives%indexarchiveentry} |
| {desc|strip|firstline|escape|nonempty}
changeset{desc|strip|escape|firstline|nonempty}-{date|age} ago +{date|age}
{file|escape}@{node|short} (annotated){file|escape}-{date|age} ago +{date|age} {file|escape}@{node|short}{file|escape}-{date|age} ago +{date|age} {date|age} ago |
+ {date|age} |
{tag|escape} |
changeset |
@@ -138,7 +138,7 @@ tagentry = '
branches = branches.tmpl
branchentry = '
| {date|age} ago |
+ {date|age} |
{node|short} |
{branch|escape} |
@@ -170,7 +170,7 @@ branchtag = ''
filelogentry = '
| {date|age} ago |
+ {date|age} |
{desc|strip|firstline|escape|nonempty} |
file | diff | annotate
@@ -198,7 +198,7 @@ indexentry = '
| {name|escape} |
{description} |
{contact|obfuscate} |
- {lastchange|age} ago |
+ {lastchange|age} |
{archives%indexarchiveentry} |
|
diff --git a/templates/paper/changeset.tmpl b/templates/paper/changeset.tmpl
--- a/templates/paper/changeset.tmpl
+++ b/templates/paper/changeset.tmpl
@@ -45,7 +45,7 @@ files, or words in the commit message
date |
- {date|date} ({date|age} ago) | {date|date} ({date|age}) | parents |
{parent%changesetparent} |
diff --git a/templates/paper/fileannotate.tmpl b/templates/paper/fileannotate.tmpl
--- a/templates/paper/fileannotate.tmpl
+++ b/templates/paper/fileannotate.tmpl
@@ -50,7 +50,7 @@ files, or words in the commit message
date |
- {date|date} ({date|age} ago) |
+ {date|date} ({date|age}) |
parents |
diff --git a/templates/paper/filediff.tmpl b/templates/paper/filediff.tmpl
--- a/templates/paper/filediff.tmpl
+++ b/templates/paper/filediff.tmpl
@@ -49,7 +49,7 @@ files, or words in the commit message
date |
- {date|date} ({date|age} ago) |
+ {date|date} ({date|age}) |
parents |
diff --git a/templates/paper/filerevision.tmpl b/templates/paper/filerevision.tmpl
--- a/templates/paper/filerevision.tmpl
+++ b/templates/paper/filerevision.tmpl
@@ -49,7 +49,7 @@ files, or words in the commit message
date |
- {date|date} ({date|age} ago) |
+ {date|date} ({date|age}) |
parents |
diff --git a/templates/paper/map b/templates/paper/map
--- a/templates/paper/map
+++ b/templates/paper/map
@@ -176,7 +176,7 @@ indexentry = '
{name|escape} |
{description} |
{contact|obfuscate} |
- {lastchange|age} ago |
+ {lastchange|age} |
{archives%indexarchiveentry} |
|