This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 7489e12d4d38d3b50d809402c9c0105c33bfce52 (commit)
from 52a6fd3113602adafc0e8398ab205a029a2af57d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7489e12d4d38d3b50d809402c9c0105c33bfce52
commit 7489e12d4d38d3b50d809402c9c0105c33bfce52
Author: Franck Villaume <[email protected]>
Date: Tue Mar 22 10:41:14 2016 +0100
fix [#811] plugin scmsvn: better error handling when no commit exist
diff --git a/src/CHANGES b/src/CHANGES
index aee2c79..c282034 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -16,6 +16,7 @@ FusionForge 6.0.4:
* Plugin SCM Git: improve user matching when computing stats, support git
.mailmap (Inria)
* Plugin SCM Git: fix history browsing. Merge Patch from Sieu Truc [#802]
(TrivialDev)
* Plugin SCM SVN: fix HTTP commit access for old SVN 1.7 clients (Inria)
+* Plugin SCM SVN: fix activity and getCommits when there is no commits. "my
latest commits" returns unwanted error. [#811] (TrivialDev)
* Plugin scmhook: fix non-editable mailing list name in some configurations
(Inria)
* Plugin scmhook: fix migration scripts svntracker To ScmhookCommitTracker &
svncommitemail To ScmHookCommitEmail (TrivialDev)
* Plugin MediaWiki: fix permission error when upgrading suspended projects
database (Inria & TrivialDev)
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 6ef7ae6..89c32f3 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -598,10 +598,9 @@ some control over it to the project's administrator.");
// final checks
if (!xml_parse($xml_parser, '', true))
- exit_error('Unable to parse XML with error '
+ $this->setError('Unable to parse XML with error
'
.
xml_error_string(xml_get_error_code($xml_parser))
- . ' on line ' .
xml_get_current_line_number($xml_parser),
- 'activity');
+ . ' on line ' .
xml_get_current_line_number($xml_parser));
xml_parser_free($xml_parser);
if ($adds > 0 || $updates > 0 || $commits > 0 ||
$deletes > 0) {
@@ -686,10 +685,9 @@ some control over it to the project's administrator.");
// final checks
if (!xml_parse($xml_parser, '', true))
- exit_error('Unable to parse XML with error '
+ $this->setError('Unable to parse XML with error
'
.
xml_error_string(xml_get_error_code($xml_parser))
- . ' on line ' .
xml_get_current_line_number($xml_parser),
- 'activity');
+ . ' on line ' .
xml_get_current_line_number($xml_parser));
xml_parser_free($xml_parser);
if ($adds > 0 || $updates > 0 || $commits > 0 ||
$deletes > 0) {
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/scmsvn/common/SVNPlugin.class.php | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
