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, master has been updated
via a75f72e5be30c8b751c04cdef90784c1ea95e4d0 (commit)
from 0eae37325b6ed9115721129df03d61bb48a58f56 (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 -----------------------------------------------------------------
commit a75f72e5be30c8b751c04cdef90784c1ea95e4d0
Author: Franck Villaume <[email protected]>
Date: Mon Apr 15 22:00:06 2013 +0200
apply #533: improve activity display : final merge
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index b6fde88..b7c2540 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -568,8 +568,8 @@ class SVNPlugin extends SCMPlugin {
function activity($params) {
global $last_user, $last_time, $last_tag, $time_ok,
$start_time, $end_time,
$adds, $deletes, $updates, $commits, $date_key,
- $usr_adds, $usr_deletes, $usr_updates,
- $messages, $last_message, $times, $revisions;
+ $usr_adds, $usr_deletes, $usr_updates, $old_commit,
+ $messages, $last_message, $times, $revisions, $users;
$group_id = $params['group'];
$project = group_get_object($group_id);
if (! $project->usesPlugin($this->name)) {
@@ -577,6 +577,8 @@ class SVNPlugin extends SCMPlugin {
}
if (in_array('scmsvn', $params['show']) ||
(count($params['show']) < 1)) {
+ $commits = 0;
+ $old_commit = -1;
$start_time = $params['begin'];
$end_time = $params['end'];
$d1 = date('Y-m-d', $start_time - 80000);
@@ -609,8 +611,8 @@ class SVNPlugin extends SCMPlugin {
$result['user_name'] = $users[$i];
$userObject =
user_get_object_by_name($users[$i]);
if (is_a($userObject, 'GFUser')) {
- $result['realname'] =
$user->getFirstName().' '.$user->getLastName();
- $result['user_id'] =
$user->getId();
+ $result['realname'] =
$userObject->getFirstName().' '.$userObject->getLastName();
+ $result['user_id'] =
$userObject->getId();
} else {
$result['realname'] = '';
$result['user_id'] = '';
@@ -710,11 +712,12 @@ class SVNPlugin extends SCMPlugin {
// End of class, helper functions now
function SVNPluginCharData($parser, $chars) {
- global $last_tag, $last_user, $last_time, $start_time, $end_time,
- $time_ok, $user_list, $last_message, $messages, $times;
+ global $last_tag, $last_user, $last_time, $start_time, $end_time,
$old_commit, $commits,
+ $time_ok, $user_list, $last_message, $messages, $times, $users;
switch ($last_tag) {
case "AUTHOR": {
$last_user = preg_replace('/[^a-z0-9_-]/', '',
strtolower(trim($chars)));
+ $users[] = $last_user;
break;
}
case "DATE": {
@@ -729,7 +732,15 @@ function SVNPluginCharData($parser, $chars) {
break;
}
case "MSG": {
- $messages[] = $chars;
+ /* If commit id is the same, then concatenate the
string with the previous
++ * (happen when the message contain accents).
++ */
+ if ($old_commit == $commits) {
+ $messages[count($messages)-1] .= $chars;
+ } else {
+ $messages[] = $chars;
+ }
+ $old_commit = $commits;
break;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmsvn/common/SVNPlugin.class.php | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
