# HG changeset patch # User Dirkjan Ochtman # Date 2009-05-15 08:46:39 # Node ID cebdfdcc3e42986b0c1ab77ab85e5fbd7ec2634e # Parent 437e06bbd11ed18e41862f5ea4b359052e7f8e26 git: use newer template syntax everywhere diff --git a/templates/gitweb/branches.tmpl b/templates/gitweb/branches.tmpl --- a/templates/gitweb/branches.tmpl +++ b/templates/gitweb/branches.tmpl @@ -1,14 +1,14 @@ -#header# -#repo|escape#: Branches +{header} +{repo|escape}: Branches + href="{url}atom-tags" title="Atom feed for {repo|escape}"/> + href="{url}rss-tags" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / branches +Mercurial{repo|escape} / branches
@@ -18,13 +18,13 @@ graph | tags | branches | -files +files
 
-#entries%branchentry# +{entries%branchentry}
-#footer# +{footer} diff --git a/templates/gitweb/changelog.tmpl b/templates/gitweb/changelog.tmpl --- a/templates/gitweb/changelog.tmpl +++ b/templates/gitweb/changelog.tmpl @@ -1,14 +1,14 @@ -#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}"/>
-Mercurial#repo|escape# / changelog +Mercurial{repo|escape} / changelog
@@ -20,20 +20,20 @@
summary | -shortlog | +shortlog | changelog | graph | tags | branches | -files#archives%archiveentry# +files{archives%archiveentry}
-#changenav%naventry#
+{changenav%naventry}
-#entries%changelogentry# +{entries%changelogentry}
-#changenav%naventry#
+{changenav%naventry}
-#footer# +{footer} diff --git a/templates/gitweb/changelogentry.tmpl b/templates/gitweb/changelogentry.tmpl --- a/templates/gitweb/changelogentry.tmpl +++ b/templates/gitweb/changelogentry.tmpl @@ -1,14 +1,14 @@
-#date|age# ago#desc|strip|firstline|escape|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +{date|age} ago{desc|strip|firstline|escape|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
-changeset
+changeset
-#author|obfuscate# [#date|rfc822date#] rev #rev#
+{author|obfuscate} [{date|rfc822date}] rev {rev}
-#desc|strip|escape|addbreaks|nonempty# +{desc|strip|escape|addbreaks|nonempty}

diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl +++ b/templates/gitweb/changeset.tmpl @@ -1,50 +1,50 @@ -#header# +{header} {repo|escape}: changeset {rev}:{node|short} + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / changeset +Mercurial{repo|escape} / changeset
summary | -shortlog | -changelog | +shortlog | +changelog | graph | tags | branches | -files | +files | changeset | -raw #archives%archiveentry#
+raw {archives%archiveentry}
-#desc|strip|escape|firstline|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +{desc|strip|escape|firstline|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
- - -#branch%changesetbranch# + + +{branch%changesetbranch} -#parent%changesetparent# -#child%changesetchild# +{parent%changesetparent} +{child%changesetchild}
author#author|obfuscate#
#date|date# (#date|age# ago)
author{author|obfuscate}
{date|date} ({date|age} ago)
changeset {rev}{node|short}
-#desc|strip|escape|addbreaks|nonempty# +{desc|strip|escape|addbreaks|nonempty}
-#files# +{files}
-
#diff#
+
{diff}
-#footer# +{footer} diff --git a/templates/gitweb/error.tmpl b/templates/gitweb/error.tmpl --- a/templates/gitweb/error.tmpl +++ b/templates/gitweb/error.tmpl @@ -1,18 +1,18 @@ -#header# -#repo|escape#: Error +{header} +{repo|escape}: Error + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / error +Mercurial{repo|escape} / error
-summary | shortlog | changelog | tags | files
+summary | shortlog | changelog | tags | files
@@ -22,4 +22,4 @@ {error|escape}
-#footer# +{footer} diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -1,14 +1,14 @@ -#header# +{header} {repo|escape}: {file|escape}@{node|short} (annotated) + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / annotate +Mercurial{repo|escape} / annotate
@@ -18,34 +18,34 @@ graph | tags | branches | -files | -changeset | -file | -revisions | +files | +changeset | +file | +revisions | annotate | diff | -raw
+raw
-
#file|escape#
+
{file|escape}
- + - -#branch%filerevbranch# + +{branch%filerevbranch} - -#parent%fileannotateparent# -#child%fileannotatechild# + +{parent%fileannotateparent} +{child%fileannotatechild} - +
author#author|obfuscate#
{author|obfuscate}
#date|date# (#date|age# ago)
{date|date} ({date|age} ago)
changeset {rev}#node|short#
{node|short}
permissions#permissions|permissions#
{permissions|permissions}
@@ -54,8 +54,8 @@ annotate |
-#annotate%annotateline# +{annotate%annotateline}
-#footer# +{footer} diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl --- a/templates/gitweb/filediff.tmpl +++ b/templates/gitweb/filediff.tmpl @@ -1,7 +1,7 @@ {header} {repo|escape}: diff {file|escape} + href="{url}atom-log" title="Atom feed for {repo|escape}"/> diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl +++ b/templates/gitweb/filelog.tmpl @@ -1,14 +1,14 @@ -#header# -#repo|escape#: File revisions +{header} +{repo|escape}: File revisions + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / file revisions +Mercurial{repo|escape} / file revisions
@@ -18,23 +18,23 @@ graph | tags | branches | -file | +file | revisions | -annotate | +annotate | diff | -rss +rss
{nav%filenaventry}
-
#file|urlescape#
+
{file|urlescape}
-#entries%filelogentry# +{entries%filelogentry}
{nav%filenaventry}
-#footer# +{footer} diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -1,14 +1,14 @@ -#header# +{header} {repo|escape}: {file|escape}@{node|short} + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / file revision +Mercurial{repo|escape} / file revision
@@ -18,34 +18,34 @@ graph | tags | branches | -files | -changeset | +files | +changeset | file | -revisions | -annotate | +revisions | +annotate | diff | -raw
+raw
-
#file|escape#
+
{file|escape}
- + - -#branch%filerevbranch# + +{branch%filerevbranch} - -#parent%filerevparent# -#child%filerevchild# + +{parent%filerevparent} +{child%filerevchild} - +
author#author|obfuscate#
{author|obfuscate}
#date|date# (#date|age# ago)
{date|date} ({date|age} ago)
changeset {rev}#node|short#
{node|short}
permissions#permissions|permissions#
{permissions|permissions}
@@ -54,7 +54,7 @@ file |
-#text%fileline# +{text%fileline}
-#footer# +{footer} diff --git a/templates/gitweb/graph.tmpl b/templates/gitweb/graph.tmpl --- a/templates/gitweb/graph.tmpl +++ b/templates/gitweb/graph.tmpl @@ -1,15 +1,15 @@ -#header# -#repo|escape#: Graph +{header} +{repo|escape}: Graph + href="{url}atom-log" title="Atom feed for {repo|escape}"/> + href="{url}rss-log" title="RSS feed for {repo|escape}"/>
-Mercurial#repo|escape# / graph +Mercurial{repo|escape} / graph
@@ -21,15 +21,15 @@
summary | shortlog | -changelog | +changelog | graph | tags | branches | -files +files
less more -| #changenav%navgraphentry#
+| {changenav%navgraphentry}
 
@@ -38,11 +38,11 @@ graph |
    - +
      - +