[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17559009#comment-17559009
]
Daniel Sahlberg commented on SVN-4711:
--
Updated the patch to apply cleanly to current trunk (r1902273).
The previous patch added a testcase which was committed separately (r1897133).
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Labels: bite-sized
> Attachments: 4711_patch_new.txt, tests.zip
>
>
> {{svn log --xml}} produces an invalid xml when the {{--use-merge-history}}
> option is combined with {{--search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> [https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3]
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> [https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3]
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will o
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17467651#comment-17467651
]
Daniel Sahlberg commented on SVN-4711:
--
See 4711_patch.txt
Proposed fix will add an additional start tag:
daniel
2022-01-02T13:40:36.192433Z
/trunk/iota
msg1
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Labels: bite-sized
> Attachments: 4711_patch.txt, tests.zip
>
>
> {{svn log --xml}} produces an invalid xml when the {{--use-merge-history}}
> option is combined with {{--search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> [https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3]
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> [https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3]
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will only be contacted if $
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17098377#comment-17098377
]
Matthias Ludwig commented on SVN-4711:
--
Daniel Shahaf:
{quote}Could you create a new issue for it, please?
{quote}
Thank you for investigating
I've created a new issue SVN-4856
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Labels: bite-sized
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will only be contacted if
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17098154#comment-17098154
]
Daniel Shahaf commented on SVN-4711:
[~MatzeL] Your issue is an entirely different problem: the callback is called
three times with has_children=TRUE and four times with SVN_INVALID_REVNUM.
That's not the cmdline client's fault, but the library's.
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Labels: bite-sized
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write"
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17098153#comment-17098153
]
Daniel Shahaf commented on SVN-4711:
I'm not sure what the expected output in this case is. Take the example in the
test, where r3 is merged to trunk in r4. What should the output be when the
argument to --search matches r3's log message? When it matches r4's log
message? When it matches both? (Whoever wants to work on a fix for this,
please ask dev@ about the semantics if there is a doubt.)
[~MatzeL] With the info in my previous comment in mind, I'm sure now that
you've found a separate issue. Could you create a new issue for it, please?
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Labels: bite-sized
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e re
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17098150#comment-17098150
]
Daniel Shahaf commented on SVN-4711:
The problem is in the cmdline client's filtering code. The "Match search
pattern before XML-escaping" block in svn_cl__log_entry_receiver_xml() doesn't
print the opening "logentry" tag ever, but the preceding block in the same
function assumes that an opening tag will have been printed for every call
where has_children is true, regardless of filtering.
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "ano
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17098148#comment-17098148
]
Daniel Shahaf commented on SVN-4711:
Test added in r1877310.
[~MatzeL] Your script doesn't use the --search option, and the test I added
passes when the --search option is removed, so I'm not sure whether you've
found the same issue or an independent one.
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will only be contact
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17097956#comment-17097956
]
Matthias Ludwig commented on SVN-4711:
--
I experienced a similar problem: under Window with svn 1.13.0
I also wrote a Batch to reproduce: [^tests.zip]
The same effect: one closing tag of too much.
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
> Attachments: tests.zip
>
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will only be contacted if $URL is svn://foo, of course.
> # ${SVNSERVE} --pid-
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16385585#comment-16385585
]
Daniel Shahaf commented on SVN-4711:
Martin, thanks for investigating but we don't normally hold discussions on
jira. Could you please post the patch to dev@? It would be great if you ran
the test suite beforehand ('make test' or ./win-tests.py).
See https://subversion.apache.org/patches
Thanks.
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
> #
> # URL=http://localhost/SOMETHING/repos
> # URL=svn://localhost/repos
> URL=file:///`pwd`/repos
> if [ -e repos ]; then rm -rf repos; fi
> if [ -e wc ]; then rm -rf wc; fi
> if [ -e import-me ]; then rm -rf import-me; fi
> ${SVNADMIN} create repos
> # These are for svnserve only.
> echo "[general]" > repos/conf/svnserve.conf
> echo "anon-access = write" >> repos/conf/svnserve.conf
> echo "auth-access = write" >> repos/conf/svnserve.conf
> # The server will only be
[jira] [Commented] (SVN-4711) invalid xml file produced by: svn log --xml --verbose --use-merge-history --search
[
https://issues.apache.org/jira/browse/SVN-4711?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16383948#comment-16383948
]
Martin Obermeir commented on SVN-4711:
--
removing line 547 of "subversion/svn/log-cmd.c" would solve this particular
issue (but I haven't checked for side effects).
[https://github.com/apache/subversion/blob/9a4edfd7a6b4e4337afb9a623d5f392b6646a4e4/subversion/svn/log-cmd.c#L547]
{code:c}
diff --git a/subversion/svn/log-cmd.c b/subversion/svn/log-cmd.c
index 5dc908e63b..6e883a7588 100644
--- a/subversion/svn/log-cmd.c
+++ b/subversion/svn/log-cmd.c
@@ -544,7 +544,6 @@ svn_cl__log_entry_receiver_xml(void *baton,
if (! SVN_IS_VALID_REVNUM(log_entry->revision))
{
- svn_xml_make_close_tag(&sb, pool, "logentry");
SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
if (lb->merge_stack)
apr_array_pop(lb->merge_stack);
{code}
> invalid xml file produced by: svn log --xml --verbose --use-merge-history
> --search
> --
>
> Key: SVN-4711
> URL: https://issues.apache.org/jira/browse/SVN-4711
> Project: Subversion
> Issue Type: Bug
>Affects Versions: 1.9.5, 1.9.7, trunk
> Environment: OS:
> * Kubuntu 17.10 (Linux 4.13.0-17-generic #20-Ubuntu SMP Mon Nov 6 10:04:08
> UTC 2017 x86_64 x86_64 x86_64 GNU/Linux)
> * Windows 7
> Checked with svn versions:
> * svn, version 1.9.7 (r1800392) compiled Aug 17 2017, 10:20:03 on
> x86_64-pc-linux-gnu
> * svn version 1.9.5 (r1770682) compiled Nov 26 2016, 14:22:31 on
> x86-microsoft-windows)
> * also trunk 1.11.0-dev confirmed by "danielsh" on IRC:
> http://sprunge.us/YYbL (thanks)
> Additional information:
> * The compiler and configuration options you built Subversion with: from apt
> * Any private modifications you made to your Subversion: (none)
> * The version of Berkeley DB you're running Subversion with, if any: (none)
>Reporter: Martin Obermeir
>Priority: Major
>
> {{svn log \-\-xml}} produces an invalid xml when the
> {{\-\-use-merge-history}} option is combined with {{\-\-search}}
> Example:
> {code:none}
> svn log --xml --verbose --use-merge-history --search "msg1"
> {code}
> The xml contains two closing {{}} tags, but only one opening
> {{}} tag.
> The bug can be easily reproduced with the script attached to this issue, it
> is also available here:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> *Expected output:*
> xml with just one "" line
> *Actual output (see last lines):*
> {code:none}
>
>
>reverse-merge="false"
> revision="3">
> xyz
> 2017-12-11T10:14:38.084171Z
>
>kind="file"
> action="M"
> prop-mods="false"
> text-mods="true">/trunk/iota
>
> msg1
>
>
>
> {code}
> Script to reproduce:
> https://gist.github.com/anonymous/91aa228d6c22bff7ec2cbba2aecb2cd3
> {code:none}
> #!/bin/sh
> ##
> ## ##
> ## This is a template for writing Subversion bug reproduction scripts. ##
> ## ##
> ## It creates a repository containing the standard Greek Tree (see ##
> ##
> http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/greek-tree.txt)
> ##
> ## and checks out a working copy containing that tree. Please adjust ##
> ## this script however you need to to demonstrate your bug. When it's ##
> ## ready, post the bug report to d...@subversion.apache.org -- after
> ##
> ##
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs,
> ##
> ## of course. ##
> ## ##
> ##
> # You might need to adjust these lines to point to your
> # compiled-from-source Subversion binaries, if using those:
> if [ -z "$SVN" ]; then
> SVN=`which svn`
> # SVNSERVE=`which svnserve`
> SVNADMIN=`which svnadmin`
> fi
> # Make sure we don't use $HOME/.subversion/.
> if [ ! -d "`pwd`/svn-repro-config-dir" ]; then mkdir
> "`pwd`/svn-repro-config-dir"; fi
> SVN="${SVN} --config-dir=`pwd`/svn-repro-config-dir"
> SVNADMIN="${SVNADMIN} --config-dir=`pwd`/svn-repro-config-dir"
> # SVNSERVE="${SVNSERVE} --config-dir=`pwd`/svn-repro-config-dir"
> # Use English output.
> LC_ALL=C; export LC_ALL
> # Select an access method. If svn://, the svnserve setup is
> # handled automagically by this script; but if http://, then
> # you'll have to configure it yourself first.
>
