changeset 660:25cd8a5fd489

fix branch escaping
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 30 Sep 2013 22:57:18 +0400
parents 9dcedc28c5b6
children b5faf07c8171
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, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/resources/buildServerResources/fastlog.template	Mon Sep 30 20:46:23 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/fastlog.template	Mon Sep 30 22:57:18 2013 +0400
@@ -1,9 +1,8 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\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'
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branch|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'
 
 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:46:23 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/log.no.files.template	Mon Sep 30 22:57:18 2013 +0400
@@ -1,6 +1,5 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\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}'
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branch|xmlescape}">\n{parents}<author original="{author|xmlescape}"/>\n<date>{date|date|xmlescape}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'
 parent = '<parent revision="{rev}" node="{node}" shortnode="{node|short}"/>\n'
--- a/mercurial-server/resources/buildServerResources/log.template	Mon Sep 30 20:46:23 2013 +0200
+++ b/mercurial-server/resources/buildServerResources/log.template	Mon Sep 30 22:57:18 2013 +0400
@@ -1,12 +1,11 @@
 header = '<?xml version="1.0"?>\n<log>\n'
 footer = '</log>\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'
+changeset = '<logentry revision="{rev}" shortnode="{node|short}" branch="{branch|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'
 
 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'