changeset 658:256817bd4a0e

fix xmlescape for branch name
author eugene.petrenko@gmail.com
date Mon, 30 Sep 2013 20:30:40 +0200
parents b5844a6612cb
children 9dcedc28c5b6
files mercurial-server/resources/buildServerResources/fastlog.template mercurial-server/resources/buildServerResources/log.no.files.template mercurial-server/resources/buildServerResources/log.template
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/resources/buildServerResources/fastlog.template	Mon Sep 30 20:09:12 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/fastlog.template	Mon Sep 30 20:30:40 2013 +0200
@@ -1,8 +1,9 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\n'
 
-changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches|xmlescape}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{files}</paths>\n</logentry>\n'
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{files}</paths>\n</logentry>\n'
 
 file  = '<path action="M">{file|xmlescape}</path>\n'
 
+branches = '${branch|xmlescape}'
 parent = '<parent revision="{rev}" shortnode="{node|short}"/>\n'
--- a/mercurial-server/resources/buildServerResources/log.no.files.template	Mon Sep 30 20:09:12 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/log.no.files.template	Mon Sep 30 20:30:40 2013 +0200
@@ -1,6 +1,6 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\n'
 
-changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches|xmlescape}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'
-
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'
+branches = '${branch|xmlescape}'
 parent = '<parent revision="{rev}" node="{node}" shortnode="{node|short}"/>\n'
--- a/mercurial-server/resources/buildServerResources/log.template	Mon Sep 30 20:09:12 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/log.template	Mon Sep 30 20:30:40 2013 +0200
@@ -1,11 +1,12 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\n'
 
-changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches|xmlescape}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n</logentry>\n'
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branches}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n</logentry>\n'
 
 file_add  = '<path action="A">{file_add|xmlescape}</path>\n'
 file_mod  = '<path action="M">{file_mod|xmlescape}</path>\n'
 file_del  = '<path action="R">{file_del|xmlescape}</path>\n'
 
+branches = '${branch|xmlescape}'
 parent = '<parent revision="{rev}" shortnode="{node|short}"/>\n'