# HG changeset patch # User Brodie Rao # Date 1319741828 25200 # Node ID fe9d36a6853e76947ce1fcf16249302efaffcd7f # Parent 6cb8b46ea90ac07339a7869735a6ff6d39f1a681 hgweb: fix dynamic date calculation not working under Safari While Chrome, Firefox, and IE 6+ support the current date format being passed to Date(), Safari doesn't: > new Date('Mon Oct 24 13:58:01 2011 +0200') Invalid Date However, the rfc822date format--officially supported by ECMAScript[1]--does work: > new Date('Mon, 24 Oct 2011 13:58:01 +0200') Mon Oct 24 2011 04:58:01 GMT-0700 (PDT) This change replaces all instances of {date|date} in HTML with {date|rfc822date}. For elements that only have the "age" class, there's no outward change for users with JavaScript enabled. For elements with both the "age" and "date" classes, the full date displayed uses the new format. Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1. [1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/coal/map --- a/mercurial/templates/coal/map Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/coal/map Thu Oct 27 11:57:08 2011 -0700 @@ -199,7 +199,7 @@ {name|escape} {description} {contact|obfuscate} - {lastchange|date} + {lastchange|rfc822date} {archives%indexarchiveentry} \n' indexarchiveentry = ' ↓{type|escape}' diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/gitweb/changelogentry.tmpl --- a/mercurial/templates/gitweb/changelogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/gitweb/changelogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,5 +1,5 @@
-{date|date}{desc|strip|firstline|escape|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag} +{date|rfc822date}{desc|strip|firstline|escape|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/gitweb/changeset.tmpl --- a/mercurial/templates/gitweb/changeset.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/gitweb/changeset.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -32,7 +32,7 @@
- + {branch%changesetbranch} {parent%changesetparent} diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/gitweb/fileannotate.tmpl --- a/mercurial/templates/gitweb/fileannotate.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/gitweb/fileannotate.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -40,7 +40,7 @@ - + {branch%filerevbranch} diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/gitweb/filerevision.tmpl --- a/mercurial/templates/gitweb/filerevision.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/gitweb/filerevision.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -40,7 +40,7 @@ - + {branch%filerevbranch} diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/gitweb/map Thu Oct 27 11:57:08 2011 -0700 @@ -162,7 +162,7 @@ tags = tags.tmpl tagentry = ' - + - + - + - + ' filelogentry = ' - + - + \n' diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/monoblue/changelogentry.tmpl --- a/mercurial/templates/monoblue/changelogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/monoblue/changelogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,6 +1,6 @@

{desc|strip|firstline|escape|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}

    -
  • {date|date}
    • +
  • {date|rfc822date}
  • by {author|obfuscate} [{date|rfc822date}] rev {rev}
  • {desc|strip|escape|addbreaks|nonempty}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/monoblue/changeset.tmpl --- a/mercurial/templates/monoblue/changeset.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/monoblue/changeset.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -38,13 +38,13 @@

changeset

{desc|strip|escape|firstline|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}

-

{date|date}

+

{date|rfc822date}

author
{author|obfuscate}
date
-
{date|date}
+
{date|rfc822date}
{branch%changesetbranch}
changeset {rev}
{node|short}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/monoblue/fileannotate.tmpl --- a/mercurial/templates/monoblue/fileannotate.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/monoblue/fileannotate.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -40,13 +40,13 @@

{file|escape}@{node|short} (annotated)

{file|escape}

-

{date|date}

+

{date|rfc822date}

author
{author|obfuscate}
date
-
{date|date}
+
{date|rfc822date}
{branch%filerevbranch}
changeset {rev}
{node|short}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/monoblue/filerevision.tmpl --- a/mercurial/templates/monoblue/filerevision.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/monoblue/filerevision.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -40,13 +40,13 @@

{file|escape}@{node|short}

{file|escape}

-

{date|date}

+

{date|rfc822date}

author
{author|obfuscate}
date
-
{date|date}
+
{date|rfc822date}
{branch%filerevbranch}
changeset {rev}
{node|short}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/monoblue/map Thu Oct 27 11:57:08 2011 -0700 @@ -141,7 +141,7 @@ tags = tags.tmpl tagentry = '
- + - + - + - + ' filelogentry = ' - + - + - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/fileannotate.tmpl --- a/mercurial/templates/paper/fileannotate.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/fileannotate.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -54,7 +54,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/filediff.tmpl --- a/mercurial/templates/paper/filediff.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/filediff.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -53,7 +53,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/filelogentry.tmpl --- a/mercurial/templates/paper/filelogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/filelogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,5 +1,5 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/filerevision.tmpl --- a/mercurial/templates/paper/filerevision.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/filerevision.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -52,7 +52,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/map --- a/mercurial/templates/paper/map Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/map Thu Oct 27 11:57:08 2011 -0700 @@ -198,7 +198,7 @@ - + \n' indexarchiveentry = ' ↓{type|escape}' diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/paper/shortlogentry.tmpl --- a/mercurial/templates/paper/shortlogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/paper/shortlogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,5 +1,5 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/changelogentry.tmpl --- a/mercurial/templates/spartan/changelogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/changelogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,6 +1,6 @@
author{author|obfuscate}
{date|date}
{date|rfc822date}
changeset {rev}{node|short}
{author|obfuscate}
{date|date}
{date|rfc822date}
changeset {rev}{author|obfuscate}
{date|date}
{date|rfc822date}
changeset {rev}
{date|date}{date|rfc822date} {tag|escape} changeset | @@ -173,7 +173,7 @@ bookmarks = bookmarks.tmpl bookmarkentry = '
{date|date}{date|rfc822date} {bookmark|escape} changeset | @@ -184,7 +184,7 @@ branches = branches.tmpl branchentry = '
{date|date}{date|rfc822date} {node|short} {branch|escape} @@ -228,7 +228,7 @@ bookmarktag = '{name} ' shortlogentry = '
{date|date}{date|rfc822date} {author|person} @@ -243,7 +243,7 @@
{date|date}{date|rfc822date} {desc|strip|firstline|escape|nonempty} @@ -262,7 +262,7 @@ {description} {contact|obfuscate}{lastchange|date}{lastchange|rfc822date} {archives%indexarchiveentry}
{date|date}{date|rfc822date} {tag|escape} changeset | @@ -152,7 +152,7 @@ bookmarks = bookmarks.tmpl bookmarkentry = '
{date|date}{date|rfc822date} {bookmark|escape} changeset | @@ -163,7 +163,7 @@ branches = branches.tmpl branchentry = '
{date|date}{date|rfc822date} {node|short} {branch|escape} @@ -196,7 +196,7 @@ bookmarktag = '{name} ' shortlogentry = '
{date|date}{date|rfc822date} {author|person} @@ -211,7 +211,7 @@
{date|date}{date|rfc822date} {desc|strip|firstline|escape|nonempty} file | diff | annotate @@ -224,7 +224,7 @@ {name|escape} {description} {contact|obfuscate}{lastchange|date}{lastchange|rfc822date} {archives%indexarchiveentry}
date{date|date}
{date|rfc822date}
parents {parent%changesetparent}
date{date|date}{date|rfc822date}
parents
date{date|date}{date|rfc822date}
parents
{date|date}{date|rfc822date} {author|person} {desc|strip|firstline|escape|nonempty}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}
date{date|date}{date|rfc822date}
parents{name|escape} {description} {contact|obfuscate}{lastchange|date}{lastchange|rfc822date} {archives%indexarchiveentry}
{date|date}{date|rfc822date} {author|person} {desc|strip|firstline|escape|nonempty}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '{name|escape} '}{bookmarks % '{name|escape} '}
- + @@ -16,7 +16,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/changeset.tmpl --- a/mercurial/templates/spartan/changeset.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/changeset.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -31,7 +31,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/fileannotate.tmpl --- a/mercurial/templates/spartan/fileannotate.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/fileannotate.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -30,7 +30,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/filelogentry.tmpl --- a/mercurial/templates/spartan/filelogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/filelogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,6 +1,6 @@
{date|date}:{date|rfc822date}: {desc|strip|firstline|escape|nonempty}
date:{date|date}{date|rfc822date}
files:
date:{date|date}{date|rfc822date}
files:{author|obfuscate}
date:{date|date}{date|rfc822date}
permissions:
- + @@ -18,7 +18,7 @@ - +
{date|date}:{date|rfc822date}: {desc|strip|firstline|escape|nonempty}
date:{date|date}{date|rfc822date}
diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/filerevision.tmpl --- a/mercurial/templates/spartan/filerevision.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/filerevision.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -30,7 +30,7 @@ {author|obfuscate} date: - {date|date} + {date|rfc822date} permissions: {permissions|permissions} diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/map --- a/mercurial/templates/spartan/map Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/map Thu Oct 27 11:57:08 2011 -0700 @@ -168,7 +168,7 @@ {name|escape} {description} {contact|obfuscate} - {lastchange|date} + {lastchange|rfc822date} RSS Atom diff -r 6cb8b46ea90a -r fe9d36a6853e mercurial/templates/spartan/shortlogentry.tmpl --- a/mercurial/templates/spartan/shortlogentry.tmpl Thu Oct 27 18:15:34 2011 -0500 +++ b/mercurial/templates/spartan/shortlogentry.tmpl Thu Oct 27 11:57:08 2011 -0700 @@ -1,6 +1,6 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e tests/test-hgweb-commands.t --- a/tests/test-hgweb-commands.t Thu Oct 27 18:15:34 2011 -0500 +++ b/tests/test-hgweb-commands.t Thu Oct 27 11:57:08 2011 -0700 @@ -246,17 +246,17 @@ - + - + - + @@ -339,7 +339,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -701,7 +701,7 @@
{date|date}{date|rfc822date} {author|person} {desc|strip|firstline|escape|nonempty}
description
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test branchstable tip something
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test Added tag 1.0 for changeset 2ef0ac749a14default
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test base1.0 anotherthing
dateThu Jan 01 00:00:00 1970 +0000
Thu, 01 Jan 1970 00:00:00 +0000
parents description
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test base1.0 anotherthing
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parents
- + - + - +
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test @@ -715,7 +715,7 @@
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test @@ -729,7 +729,7 @@
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test @@ -749,7 +749,7 @@ - +
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 1.0 changeset | @@ -764,7 +764,7 @@ - + - + - + @@ -198,7 +198,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e tests/test-highlight.t --- a/tests/test-highlight.t Thu Oct 27 18:15:34 2011 -0500 +++ b/tests/test-highlight.t Thu Oct 27 11:57:08 2011 -0700 @@ -121,7 +121,7 @@ - + @@ -251,7 +251,7 @@ - +
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 anotherthing changeset | @@ -773,7 +773,7 @@
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 something changeset | @@ -788,7 +788,7 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -504,7 +504,7 @@ - + diff -r 6cb8b46ea90a -r fe9d36a6853e tests/test-hgweb-filelog.t --- a/tests/test-hgweb-filelog.t Thu Oct 27 18:15:34 2011 -0500 +++ b/tests/test-hgweb-filelog.t Thu Oct 27 11:57:08 2011 -0700 @@ -179,12 +179,12 @@ - + - + @@ -280,12 +280,12 @@ - + - + @@ -381,7 +381,7 @@ - + @@ -477,7 +477,7 @@ - + @@ -604,7 +604,7 @@
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 1d22e65f027e stable @@ -798,7 +798,7 @@
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 a4f92ed23982 default diff -r 6cb8b46ea90a -r fe9d36a6853e tests/test-hgweb-diffs.t --- a/tests/test-hgweb-diffs.t Thu Oct 27 18:15:34 2011 -0500 +++ b/tests/test-hgweb-diffs.t Thu Oct 27 11:57:08 2011 -0700 @@ -81,7 +81,7 @@
dateThu Jan 01 00:00:00 1970 +0000
Thu, 01 Jan 1970 00:00:00 +0000
parents
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parents
dateThu Jan 01 00:00:00 1970 +0000
Thu, 01 Jan 1970 00:00:00 +0000
parents
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parentsdescription
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test second a
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test first a
description
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test second a
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test first a
description
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test first a
description
Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000 test first a
- + @@ -622,14 +622,14 @@ - +
Thu Jan 01 00:00:00 1970 +0000:Thu, 01 Jan 1970 00:00:00 +0000: change c
date:Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
- + @@ -655,7 +655,7 @@ - +
Thu Jan 01 00:00:00 1970 +0000:Thu, 01 Jan 1970 00:00:00 +0000: mv b
date:Thu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
diff -r 6cb8b46ea90a -r fe9d36a6853e tests/test-hgweb-removed.t --- a/tests/test-hgweb-removed.t Thu Oct 27 18:15:34 2011 -0500 +++ b/tests/test-hgweb-removed.t Thu Oct 27 11:57:08 2011 -0700 @@ -76,7 +76,7 @@
dateThu Jan 01 00:00:00 1970 +0000
Thu, 01 Jan 1970 00:00:00 +0000
parents cb9a9f314b8b
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parents
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parents
dateThu Jan 01 00:00:00 1970 +0000Thu, 01 Jan 1970 00:00:00 +0000
parents