# HG changeset patch # User Dirkjan Ochtman # Date 1242377233 -7200 # Node ID 5c1aabc58004d7cbdc6d9ef0c93f945d2cfeeb73 # Parent 8b47efdf40eed33779d6d0acbff6301722a3f1b4 spartan: use newer template syntax everywhere diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/branches.tmpl --- a/templates/spartan/branches.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/branches.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,26 +1,26 @@ -#header# -#repo|escape#: branches +{header} +{repo|escape}: branches + href="{url}atom-branches" title="Atom feed for {repo|escape}: branches"> + href="{url}rss-branches" title="RSS feed for {repo|escape}: branches">
-changelog -shortlog -graph -tags -files -rss -atom +changelog +shortlog +graph +tags +files +rss +atom

branches:

-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/changelog.tmpl --- a/templates/spartan/changelog.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/changelog.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,43 +1,43 @@ -#header# -#repo|escape#: changelog +{header} +{repo|escape}: changelog + href="{url}atom-log" title="Atom feed for {repo|escape}"> + href="{url}rss-log" title="RSS feed for {repo|escape}">
-shortlog -graph -tags -branches -files -#archives%archiveentry# -rss -atom +shortlog +graph +tags +branches +files +{archives%archiveentry} +rss +atom
-

changelog for #repo|escape#

+

changelog for {repo|escape}

-
+ {sessionvars%hiddenformentry}

-navigate: #changenav%naventry# +navigate: {changenav%naventry}

-#entries%changelogentry# +{entries%changelogentry} -
+ {sessionvars%hiddenformentry}

-navigate: #changenav%naventry# +navigate: {changenav%naventry}

-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/changelogentry.tmpl --- a/templates/spartan/changelogentry.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/changelogentry.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,25 +1,25 @@ - +
- - + + - - + + - #parent%changelogparent# - #child%changelogchild# - #changelogtag# + {parent%changelogparent} + {child%changelogchild} + {changelogtag} - + - + - - + +
#date|age# ago:#desc|strip|firstline|escape|nonempty#{date|age} ago:{desc|strip|firstline|escape|nonempty}
changeset #rev#:#node|short#changeset {rev}:{node|short}
author:#author|obfuscate#{author|obfuscate}
date:#date|date#{date|date}
files:#files#files:{files}
diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/changeset.tmpl --- a/templates/spartan/changeset.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/changeset.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,51 +1,51 @@ -#header# -#repo|escape#: changeset #node|short# +{header} +{repo|escape}: changeset {node|short}
-changelog -shortlog -graph -tags -branches -files -raw -#archives%archiveentry# +changelog +shortlog +graph +tags +branches +files +raw +{archives%archiveentry}
-

changeset: #desc|strip|escape|firstline|nonempty#

+

changeset: {desc|strip|escape|firstline|nonempty}

- - + + -#parent%changesetparent# -#child%changesetchild# -#changesettag# +{parent%changesetparent} +{child%changesetchild} +{changesettag} - + - + - + - +
changeset #rev#:#node|short#changeset {rev}:{node|short}
author:#author|obfuscate#{author|obfuscate}
date:#date|date# (#date|age# ago){date|date} ({date|age} ago)
files:#files#{files}
description:#desc|strip|escape|addbreaks|nonempty#{desc|strip|escape|addbreaks|nonempty}
-#diff# +{diff}
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/error.tmpl --- a/templates/spartan/error.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/error.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,4 +1,4 @@ -#header# +{header} Mercurial Error @@ -9,7 +9,7 @@ An error occurred while processing your request:

-#error|escape# +{error|escape}

-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/fileannotate.tmpl --- a/templates/spartan/fileannotate.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/fileannotate.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,39 +1,39 @@ -#header# -#repo|escape#: #file|escape# annotate +{header} +{repo|escape}: {file|escape} annotate
-changelog -shortlog -graph -tags -branches -changeset -files -file -revisions -raw +changelog +shortlog +graph +tags +branches +changeset +files +file +revisions +raw
-

Annotate #file|escape#

+

Annotate {file|escape}

- - -#parent%fileannotateparent# -#child%fileannotatechild# + + +{parent%fileannotateparent} +{child%fileannotatechild} - + - + - + @@ -44,7 +44,7 @@
changeset #rev#:#node|short#
changeset {rev}:{node|short}
author:#author|obfuscate#
{author|obfuscate}
date:#date|date# (#date|age# ago){date|date} ({date|age} ago)
permissions:#permissions|permissions#{permissions|permissions}
description:
-#annotate%annotateline# +{annotate%annotateline}
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/filediff.tmpl --- a/templates/spartan/filediff.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/filediff.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,36 +1,36 @@ -#header# -#repo|escape#: #file|escape# diff +{header} +{repo|escape}: {file|escape} diff
-changelog -shortlog -graph -tags -branches -changeset -file -revisions -annotate -raw +changelog +shortlog +graph +tags +branches +changeset +file +revisions +annotate +raw
-

#file|escape#

+

{file|escape}

- - + + -#parent%filediffparent# -#child%filediffchild# +{parent%filediffparent} +{child%filediffchild}
revision #rev#:#node|short#revision {rev}:{node|short}
-#diff# +{diff}
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/filelog.tmpl --- a/templates/spartan/filelog.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/filelog.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,28 +1,28 @@ -#header# -#repo|escape#: #file|escape# history +{header} +{repo|escape}: {file|escape} history + href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}"> + href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}">
-changelog -shortlog -graph -tags -branches -file -annotate -rss -atom +changelog +shortlog +graph +tags +branches +file +annotate +rss +atom
-

#file|escape# revision history

+

{file|escape} revision history

navigate: {nav%filenaventry}

-#entries%filelogentry# +{entries%filelogentry} -#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/filelogentry.tmpl --- a/templates/spartan/filelogentry.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/filelogentry.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,24 +1,24 @@ - +
- - + + - - #rename%filelogrename# + {rename%filelogrename} - + - +
#date|age# ago:#desc|strip|firstline|escape|nonempty#{date|age} ago:{desc|strip|firstline|escape|nonempty}
revision #filerev#: + revision {filerev}: - #node|short# - (diff) - (annotate) + {node|short} + (diff) + (annotate)
author:#author|obfuscate#{author|obfuscate}
date:#date|date#{date|date}
diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/filerevision.tmpl --- a/templates/spartan/filerevision.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/filerevision.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,38 +1,38 @@ -#header# -#repo|escape#:#file|escape# +{header} +{repo|escape}:{file|escape}
-changelog -shortlog -graph -tags -branches -changeset -files -revisions -annotate -raw +changelog +shortlog +graph +tags +branches +changeset +files +revisions +annotate +raw
-

#file|escape#

+

{file|escape}

- - -#parent%filerevparent# -#child%filerevchild# + + +{parent%filerevparent} +{child%filerevchild} - + - + - + @@ -40,7 +40,7 @@
changeset #rev#:#node|short#
changeset {rev}:{node|short}
author:#author|obfuscate#
{author|obfuscate}
date:#date|date# (#date|age# ago)
{date|date} ({date|age} ago)
permissions:#permissions|permissions#
{permissions|permissions}
description: {desc|strip|escape|addbreaks|nonempty}
-#text%fileline#
+{text%fileline}
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/footer.tmpl --- a/templates/spartan/footer.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/footer.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,7 +1,7 @@ -#motd# +{motd} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/graph.tmpl --- a/templates/spartan/graph.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/graph.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,29 +1,29 @@ -#header# -#repo|escape#: graph +{header} +{repo|escape}: graph + href="{url}atom-tags" title="Atom feed for {repo|escape}: tags"> - + href="{url}rss-tags" title="RSS feed for {repo|escape}: tags"> +
-changelog -shortlog -tags -branches -files +changelog +shortlog +tags +branches +files

graph

-
+ {sessionvars%hiddenformentry}

-navigate: #changenav%navgraphentry# +navigate: {changenav%navgraphentry}

@@ -31,11 +31,11 @@
- +
- + -
+ {sessionvars%hiddenformentry}

-navigate: #changenav%navgraphentry# +navigate: {changenav%navgraphentry}

-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/header.tmpl --- a/templates/spartan/header.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/header.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,6 +1,6 @@ - + - + diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/index.tmpl --- a/templates/spartan/index.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/index.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,4 +1,4 @@ -#header# +{header} Mercurial repositories index @@ -7,13 +7,13 @@ - - - - + + + + - #entries%indexentry# + {entries%indexentry}
NameDescriptionContactLast changeNameDescriptionContactLast change  
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/manifest.tmpl --- a/templates/spartan/manifest.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/manifest.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,28 +1,28 @@ -#header# -#repo|escape#: files for changeset #node|short# +{header} +{repo|escape}: files for changeset {node|short}
-changelog -shortlog -graph -tags -branches -changeset -#archives%archiveentry# +changelog +shortlog +graph +tags +branches +changeset +{archives%archiveentry}
-

files for changeset #node|short#: #path|escape#

+

files for changeset {node|short}: {path|escape}

- + -#dentries%direntry# -#fentries%fileentry# +{dentries%direntry} +{fentries%fileentry}
drwxr-xr-x      - [up] + [up]
-#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/map --- a/templates/spartan/map Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/map Fri May 15 10:47:13 2009 +0200 @@ -11,8 +11,8 @@ navshortentry = '{label|escape} ' navgraphentry = '{label|escape} ' filenaventry = '{label|escape} ' -filedifflink = '#file|escape# ' -filenodelink = '#file|escape# ' +filedifflink = '{file|escape} ' +filenodelink = '{file|escape} ' filenolink = '{file|escape} ' fileellipses = '...' changelogentry = changelogentry.tmpl @@ -21,55 +21,55 @@ manifest = manifest.tmpl direntry = ' - + drwxr-xr-x      - #basename|escape#/ - - #emptydirs|urlescape# + {basename|escape}/ + + {emptydirs|urlescape} ' fileentry = ' - - #permissions|permissions#  - #date|isodate#  - #size#  - #basename|escape#' + + {permissions|permissions}  + {date|isodate}  + {size}  + {basename|escape}' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl -fileline = '
#linenumber##line|escape#
' +fileline = '
{linenumber}{line|escape}
' filelogentry = filelogentry.tmpl annotateline = ' - + - #author|user#@#rev# + {author|user}@{rev} - #linenumber# + {linenumber} - 
#line|escape#
+ 
{line|escape}
' -difflineplus = '#linenumber##line|escape#' -difflineminus = '#linenumber##line|escape#' -difflineat = '#linenumber##line|escape#' -diffline = '#linenumber##line|escape#' +difflineplus = '{linenumber}{line|escape}' +difflineminus = '{linenumber}{line|escape}' +difflineat = '{linenumber}{line|escape}' +diffline = '{linenumber}{line|escape}' changelogparent = ' - parent #rev#: + parent {rev}: - #node|short# + {node|short} ' changesetparent = ' - parent #rev#: - #node|short# + parent {rev}: + {node|short} ' filerevparent = ' @@ -85,8 +85,8 @@ base: - - #file|escape#@#node|short# + + {file|escape}@{node|short} ' @@ -101,74 +101,74 @@ ' changesetchild = ' - child #rev#: - #node|short# + child {rev}: + {node|short} ' changelogchild = ' - child #rev#: - #node|short# + child {rev}: + {node|short} ' filerevchild = ' child: - #node|short# + {node|short} ' fileannotatechild = ' child: - #node|short# + {node|short} ' tags = tags.tmpl tagentry = ' -
  • - #node# - #tag|escape# +
  • + {node} + {tag|escape}
    • ' branches = branches.tmpl branchentry = ' -
  • - #node# - #branch|escape# +
  • + {node} + {branch|escape}
    • ' -diffblock = '
    #lines#
    ' -changelogtag = 'tag:#tag|escape#' -changesettag = 'tag:#tag|escape#' +diffblock = '
    {lines}
    ' +changelogtag = 'tag:{tag|escape}' +changesettag = 'tag:{tag|escape}' filediffparent = ' - parent #rev#: - #node|short# + parent {rev}: + {node|short} ' filelogparent = ' - parent #rev#: - #node|short# + parent {rev}: + {node|short} ' filediffchild = ' - child #rev#: - #node|short# + child {rev}: + {node|short} ' filelogchild = ' - child #rev#: - #node|short# + child {rev}: + {node|short} ' indexentry = ' - - #name|escape# - #description# - #contact|obfuscate# - #lastchange|age# ago + + {name|escape} + {description} + {contact|obfuscate} + {lastchange|age} ago - RSS - Atom - #archives%archiveentry# + RSS + Atom + {archives%archiveentry} ' index = index.tmpl -archiveentry = '#type|escape# ' +archiveentry = '{type|escape} ' notfound = notfound.tmpl error = error.tmpl -urlparameter = '#separator##name#=#value|urlescape#' -hiddenformentry = '' +urlparameter = '{separator}{name}={value|urlescape}' +hiddenformentry = '' diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/notfound.tmpl --- a/templates/spartan/notfound.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/notfound.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,12 +1,12 @@ -#header# +{header} Mercurial repository not found

    Mercurial repository not found

    -The specified repository "#repo|escape#" is unknown, sorry. +The specified repository "{repo|escape}" is unknown, sorry. Please go back to the main repository list page. -#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/search.tmpl --- a/templates/spartan/search.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/search.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,36 +1,36 @@ -#header# -#repo|escape#: searching for #query|escape# +{header} +{repo|escape}: searching for {query|escape}
    -changelog -shortlog -graph -tags -branches -files -#archives%archiveentry# +changelog +shortlog +graph +tags +branches +files +{archives%archiveentry}
    -

    searching for #query|escape#

    +

    searching for {query|escape}

    {sessionvars%hiddenformentry}

    search: - +

    -#entries# +{entries}
    {sessionvars%hiddenformentry}

    search: - +

    -#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/shortlog.tmpl --- a/templates/spartan/shortlog.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/shortlog.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,43 +1,43 @@ -#header# -#repo|escape#: shortlog +{header} +{repo|escape}: shortlog + href="{url}atom-log" title="Atom feed for {repo|escape}"> + href="{url}rss-log" title="RSS feed for {repo|escape}">
    -changelog -graph -tags -branches -files -#archives%archiveentry# -rss -atom +changelog +graph +tags +branches +files +{archives%archiveentry} +rss +atom
    -

    shortlog for #repo|escape#

    +

    shortlog for {repo|escape}

    -
    + {sessionvars%hiddenformentry}

    -navigate: #changenav%navshortentry# +navigate: {changenav%navshortentry}

    -#entries%shortlogentry# +{entries%shortlogentry} -
    + {sessionvars%hiddenformentry}

    -navigate: #changenav%navshortentry# +navigate: {changenav%navshortentry}

    -#footer# +{footer} diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/shortlogentry.tmpl --- a/templates/spartan/shortlogentry.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/shortlogentry.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,7 +1,7 @@ - +
    - - - + + +
    #date|age##author|person##desc|strip|firstline|escape|nonempty#{date|age}{author|person}{desc|strip|firstline|escape|nonempty}
    diff -r 8b47efdf40ee -r 5c1aabc58004 templates/spartan/tags.tmpl --- a/templates/spartan/tags.tmpl Fri May 15 10:47:05 2009 +0200 +++ b/templates/spartan/tags.tmpl Fri May 15 10:47:13 2009 +0200 @@ -1,26 +1,26 @@ -#header# -#repo|escape#: tags +{header} +{repo|escape}: tags + href="{url}atom-tags" title="Atom feed for {repo|escape}: tags"> + href="{url}rss-tags" title="RSS feed for {repo|escape}: tags">
    -changelog -shortlog -graph -branches -files -rss -atom +changelog +shortlog +graph +branches +files +rss +atom

    tags:

    -#footer# +{footer}