# HG changeset patch # User Rocco Rutte # Date 1240222204 -7200 # Node ID 89bc3946c8f3a1b528f1161e01f81d8be445ab4f # Parent 27dbe534397bcd472864d913676c726f92f6ab61 hgweb: use "nonempty" filter in templates for the changelog message At least subversion allows empty commit logs which, after conversion, show up as empty fields in hgweb and don't allow selecting the changeset. Using "nonempty" as filter, "(none)" is used to get clickable links for empty commit messages. diff -r 27dbe534397b -r 89bc3946c8f3 templates/atom/changelogentry.tmpl --- a/templates/atom/changelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/atom/changelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,5 +1,5 @@ - #desc|strip|firstline|strip|escape# + #desc|strip|firstline|strip|escape|nonempty# {urlbase}{url}#changeset-{node} @@ -10,7 +10,7 @@ #date|rfc3339date#
-
#desc|escape#
+
#desc|escape|nonempty#
diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/changelogentry.tmpl --- a/templates/gitweb/changelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/changelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,5 +1,5 @@
-#date|age# ago#desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +#date|age# ago#desc|strip|firstline|escape|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
-#desc|strip|escape|addbreaks# +#desc|strip|escape|addbreaks|nonempty#

diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/changeset.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -16,7 +16,7 @@
-#desc|strip|escape|firstline# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +#desc|strip|escape|firstline|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
@@ -29,7 +29,7 @@
-#desc|strip|escape|addbreaks# +#desc|strip|escape|addbreaks|nonempty#
diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/fileannotate.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -49,7 +49,7 @@
-{desc|strip|escape|addbreaks} +{desc|strip|escape|addbreaks|nonempty}
diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/filerevision.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -49,7 +49,7 @@
-{desc|strip|escape|addbreaks} +{desc|strip|escape|addbreaks|nonempty}
diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/graph.tmpl --- a/templates/gitweb/graph.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/graph.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -78,7 +78,10 @@ item = item.replace(/_PARITY/, 'parity' + parity); item = item.replace(/_NODEID/, cur[0]); item = item.replace(/_NODEID/, cur[0]); - item = item.replace(/_DESC/, cur[3]); + if (cur[3] != '') + item = item.replace(/_DESC/, cur[3]); + else + item = item.replace(/_DESC/, '(none)'); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]); diff -r 27dbe534397b -r 89bc3946c8f3 templates/gitweb/map --- a/templates/gitweb/map Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/gitweb/map Mon Apr 20 12:10:04 2009 +0200 @@ -56,8 +56,8 @@ tagtag = '{name} ' branchtag = '{name} ' inbranchtag = '{name} ' -shortlogentry = '
' -filelogentry = '' +shortlogentry = '' +filelogentry = '' archiveentry = ' | #type|escape# ' indexentry = '\n' indexarchiveentry = ' {type|escape} ' diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/changelogentry.tmpl --- a/templates/monoblue/changelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/changelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,6 +1,6 @@ -

#desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}

+

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

diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/changeset.tmpl --- a/templates/monoblue/changeset.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/changeset.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -34,7 +34,7 @@ -

#desc|strip|escape|firstline# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}

+

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

#date|age# ago

@@ -49,7 +49,7 @@ #child%changesetchild#
-

#desc|strip|escape|addbreaks#

+

#desc|strip|escape|addbreaks|nonempty#

#date|age# ago#author|person##desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
#date|age# ago#desc|strip|firstline|escape#
#date|age# ago#author|person##desc|strip|firstline|escape|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}
#date|age# ago#desc|strip|firstline|escape|nonempty#
{name|escape}{description}{contact|obfuscate}{lastchange|age} ago
#files# diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/fileannotate.tmpl --- a/templates/monoblue/fileannotate.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/fileannotate.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -53,7 +53,7 @@
#permissions|permissions#
-

{desc|strip|escape|addbreaks}

+

{desc|strip|escape|addbreaks|nonempty}

{annotate%annotateline} diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/filerevision.tmpl --- a/templates/monoblue/filerevision.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/filerevision.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -53,7 +53,7 @@
#permissions|permissions#
-

{desc|strip|escape|addbreaks}

+

{desc|strip|escape|addbreaks|nonempty}

#text%fileline# diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/graph.tmpl --- a/templates/monoblue/graph.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/graph.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -75,7 +75,10 @@ item = item.replace(/_PARITY/, 'parity' + parity); item = item.replace(/_NODEID/, cur[0]); item = item.replace(/_NODEID/, cur[0]); - item = item.replace(/_DESC/, cur[3]); + if (cur[3] != '') + item = item.replace(/_DESC/, cur[3]); + else + item = item.replace(/_DESC/, '(none)'); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]); diff -r 27dbe534397b -r 89bc3946c8f3 templates/monoblue/map --- a/templates/monoblue/map Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/monoblue/map Mon Apr 20 12:10:04 2009 +0200 @@ -55,8 +55,8 @@ tagtag = '{name} ' branchtag = '{name} ' inbranchtag = '{name} ' -shortlogentry = '
' -filelogentry = '' +shortlogentry = '' +filelogentry = '' archiveentry = '
  • #type|escape#
  • ' indexentry = '\n' indexarchiveentry = '{type|escape} ' diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/changeset.tmpl --- a/templates/paper/changeset.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/changeset.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -35,7 +35,7 @@ files, or words in the commit message -
    {desc|strip|escape|addbreaks}
    +
    {desc|strip|escape|addbreaks|nonempty}
    #date|age# ago#author|person##desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}changeset | files
    #date|age# ago#desc|strip|firstline|escape#file | diff | annotate #rename%filelogrename#
    #date|age# ago#author|person##desc|strip|firstline|escape|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}changeset | files
    #date|age# ago#desc|strip|firstline|escape|nonempty#file | diff | annotate #rename%filelogrename#
    {name|escape}{description}{contact|obfuscate}{lastchange|age} ago
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/fileannotate.tmpl --- a/templates/paper/fileannotate.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/fileannotate.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -39,7 +39,7 @@ files, or words in the commit message -
    {desc|strip|escape|addbreaks}
    +
    {desc|strip|escape|addbreaks|nonempty}
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/filediff.tmpl --- a/templates/paper/filediff.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/filediff.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -38,7 +38,7 @@ files, or words in the commit message -
    {desc|strip|escape|addbreaks}
    +
    {desc|strip|escape|addbreaks|nonempty}
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/filelogentry.tmpl --- a/templates/paper/filelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/filelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,5 +1,5 @@ - + diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/filerevision.tmpl --- a/templates/paper/filerevision.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/filerevision.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -38,7 +38,7 @@ files, or words in the commit message -
    {desc|strip|escape|addbreaks}
    +
    {desc|strip|escape|addbreaks|nonempty}
    {date|age} {author|person}{desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{desc|strip|firstline|escape|nonempty}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/graph.tmpl --- a/templates/paper/graph.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/graph.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -86,7 +86,10 @@ item = item.replace(/_PARITY/, 'parity' + parity); item = item.replace(/_NODEID/, cur[0]); item = item.replace(/_NODEID/, cur[0]); - item = item.replace(/_DESC/, cur[3]); + if (cur[3] != '') + item = item.replace(/_DESC/, cur[3]); + else + item = item.replace(/_DESC/, '(none)'); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]); diff -r 27dbe534397b -r 89bc3946c8f3 templates/paper/shortlogentry.tmpl --- a/templates/paper/shortlogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/paper/shortlogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,5 +1,5 @@ - + diff -r 27dbe534397b -r 89bc3946c8f3 templates/rss/changelogentry.tmpl --- a/templates/rss/changelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/rss/changelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,7 +1,7 @@ #desc|strip|firstline|strip|escape# {urlbase}{url}rev/{node|short} - + #author|obfuscate# #date|rfc822date# diff -r 27dbe534397b -r 89bc3946c8f3 templates/rss/filelogentry.tmpl --- a/templates/rss/filelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/rss/filelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,7 +1,7 @@ #desc|strip|firstline|strip|escape# {urlbase}{url}log{#node|short#}/{file|urlescape} - + #author|obfuscate# #date|rfc822date# diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/changelogentry.tmpl --- a/templates/spartan/changelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/changelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,7 +1,7 @@
    {date|age} {author|person}{desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{desc|strip|firstline|escape|nonempty}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}
    - + diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/changeset.tmpl --- a/templates/spartan/changeset.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/changeset.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -13,7 +13,7 @@ #archives%archiveentry# -

    changeset: #desc|strip|escape|firstline#

    +

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

    #date|age# ago:#desc|strip|firstline|escape##desc|strip|firstline|escape|nonempty#
    changeset #rev#:
    @@ -37,7 +37,7 @@ - +
    description:#desc|strip|escape|addbreaks##desc|strip|escape|addbreaks|nonempty#
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/fileannotate.tmpl --- a/templates/spartan/fileannotate.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/fileannotate.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -36,7 +36,7 @@ description: - {desc|strip|escape|addbreaks} + {desc|strip|escape|addbreaks|nonempty} diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/filelogentry.tmpl --- a/templates/spartan/filelogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/filelogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -1,7 +1,7 @@ - + - +
    #date|age# ago:#desc|strip|firstline|escape##desc|strip|firstline|escape|nonempty#
    revision #filerev#: diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/filerevision.tmpl --- a/templates/spartan/filerevision.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/filerevision.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -34,7 +34,7 @@ #permissions|permissions#
    description:{desc|strip|escape|addbreaks}{desc|strip|escape|addbreaks|nonempty}
    diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/graph.tmpl --- a/templates/spartan/graph.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/graph.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -70,7 +70,10 @@ item = item.replace(/_PARITY/, 'parity' + parity); item = item.replace(/_NODEID/, cur[0]); item = item.replace(/_NODEID/, cur[0]); - item = item.replace(/_DESC/, cur[3]); + if (cur[3] != '') + item = item.replace(/_DESC/, cur[3]); + else + item = item.replace(/_DESC/, '(none)'); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]); diff -r 27dbe534397b -r 89bc3946c8f3 templates/spartan/shortlogentry.tmpl --- a/templates/spartan/shortlogentry.tmpl Mon Apr 20 11:34:15 2009 +0200 +++ b/templates/spartan/shortlogentry.tmpl Mon Apr 20 12:10:04 2009 +0200 @@ -2,6 +2,6 @@ #date|age# #author|person# - #desc|strip|firstline|escape# + #desc|strip|firstline|escape|nonempty# diff -r 27dbe534397b -r 89bc3946c8f3 tests/test-hgweb-commands.out Binary file tests/test-hgweb-commands.out has changed diff -r 27dbe534397b -r 89bc3946c8f3 tests/test-hgweb-empty.out --- a/tests/test-hgweb-empty.out Mon Apr 20 11:34:15 2009 +0200 +++ b/tests/test-hgweb-empty.out Mon Apr 20 12:10:04 2009 +0200 @@ -230,7 +230,10 @@ item = item.replace(/_PARITY/, 'parity' + parity); item = item.replace(/_NODEID/, cur[0]); item = item.replace(/_NODEID/, cur[0]); - item = item.replace(/_DESC/, cur[3]); + if (cur[3] != '') + item = item.replace(/_DESC/, cur[3]); + else + item = item.replace(/_DESC/, '(none)'); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]);