[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2177-g4faae63

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Sep 15 16:51:26 CEST 2017


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  4faae63f5c7cf1fc68db15ef46bc03c98d53266d (commit)
       via  1003da151df5588dec2a7e63151f06557069c18e (commit)
       via  a678a7deb1b46563539839b1c0d7547f9fc856c2 (commit)
      from  27c71d491e06bb7bed5c9adb6ccf25c8ab44e4e9 (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=4faae63f5c7cf1fc68db15ef46bc03c98d53266d

commit 4faae63f5c7cf1fc68db15ef46bc03c98d53266d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Sep 15 14:51:19 2017 +0000

    multirepo stats display

diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index e1ebb86..b468fe4 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -176,7 +176,7 @@ over it to the project's administrator.");
 		global $HTML;
 		$b = '';
 
-		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(commits) as commits, sum(adds) as adds, sum(adds+commits) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
+		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(commits) as commits, sum(adds) as adds, sum(adds+commits) as combined, reponame FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id, reponame ORDER BY reponame, combined DESC, realname',
 					  array($project->getID()));
 
 		if (db_numrows($result) > 0) {
@@ -190,7 +190,22 @@ over it to the project's administrator.");
 			$i = 0;
 			$total = array('adds' => 0, 'commits' => 0);
 
+			$prevrepo = '';
 			while ($data = db_fetch_array($result)) {
+				if ($prevrepo != $data['reponame']) {
+					if ($prevrepo != '') {
+						$cells = array();
+						$cells[] = array(html_e('strong', array(), _('Total')._(':')), 'class' => 'halfwidth');
+						$cells[] = array($total['adds'], 'class' => 'onequarterwidth align-right');
+						$cells[] = array($total['updates'], 'class' => 'onequarterwidth align-right');
+						$b .= $HTML->multiTableRow(array(), $cells);
+					}
+					$prevrepo = $data['reponame'];
+					$total = array('adds' => 0, 'updates' => 0);
+					$cells = array();
+					$cells[] = array(html_e('strong', array(), $data['reponame'].' '._('statistics')), 'colspan' => 3);
+					$b .= $HTML->multiTableRow(array(), $cells);
+				}
 				$cells = array();
 				$cells[] = array(util_display_user($data['user_name'], $data['user_id'], $data['realname']), 'class' => 'halfwidth');
 				$cells[] = array($data['adds'], 'class' => 'onequarterwidth align-right');
@@ -207,7 +222,7 @@ over it to the project's administrator.");
 			$b .= $HTML->multiTableRow(array(), $cells);
 			$b .= $HTML->listTableBottom();
 		} else {
-			$b .= $HTML->information(_('No history yet'));
+			$b .= $HTML->warning_msg(_('No history yet.'));
 		}
 
 		return $b;
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index a5e5eea..80a31d3 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -337,7 +337,7 @@ control over it to the project's administrator.");
 		global $HTML;
 		$b = '';
 
-		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+updates) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (updates>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
+		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+updates) as combined, reponame FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (updates>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id, reponame ORDER BY reponame, combined DESC, realname',
 			array($project->getID()));
 
 		if (db_numrows($result) > 0) {
@@ -351,7 +351,22 @@ control over it to the project's administrator.");
 			$i = 0;
 			$total = array('adds' => 0, 'updates' => 0);
 
+			$prevrepo = '';
 			while ($data = db_fetch_array($result)) {
+				if ($prevrepo != $data['reponame']) {
+					if ($prevrepo != '') {
+						$cells = array();
+						$cells[] = array(html_e('strong', array(), _('Total')._(':')), 'class' => 'halfwidth');
+						$cells[] = array($total['adds'], 'class' => 'onequarterwidth align-right');
+						$cells[] = array($total['updates'], 'class' => 'onequarterwidth align-right');
+						$b .= $HTML->multiTableRow(array(), $cells);
+					}
+					$prevrepo = $data['reponame'];
+					$total = array('adds' => 0, 'updates' => 0);
+					$cells = array();
+					$cells[] = array(html_e('strong', array(), $data['reponame'].' '._('statistics')), 'colspan' => 3);
+					$b .= $HTML->multiTableRow(array(), $cells);
+				}
 				$cells = array();
 				$cells[] = array(util_display_user($data['user_name'], $data['user_id'], $data['realname']), 'class' => 'halfwidth');
 				$cells[] = array($data['adds'], 'class' => 'onequarterwidth align-right');

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1003da151df5588dec2a7e63151f06557069c18e

commit 1003da151df5588dec2a7e63151f06557069c18e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Sep 15 14:50:45 2017 +0000

    homogeneous display

diff --git a/src/plugins/scmcvs/common/CVSPlugin.class.php b/src/plugins/scmcvs/common/CVSPlugin.class.php
index b68ecfa..c3979c1 100644
--- a/src/plugins/scmcvs/common/CVSPlugin.class.php
+++ b/src/plugins/scmcvs/common/CVSPlugin.class.php
@@ -199,7 +199,7 @@ over it to the project's administrator.");
 			$b .= $HTML->multiTableRow(array(), $cells);
 			$b .= $HTML->listTableBottom();
 		} else {
-			$b .= $HTML->information(_('No history yet'));
+			$b .= $HTML->warning_msg(_('No history yet.'));
 		}
 
 		return $b ;

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a678a7deb1b46563539839b1c0d7547f9fc856c2

commit a678a7deb1b46563539839b1c0d7547f9fc856c2
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Sep 15 14:50:29 2017 +0000

    scmhg: prepare multi repo support

diff --git a/src/plugins/scmhg/common/HgPlugin.class.php b/src/plugins/scmhg/common/HgPlugin.class.php
index 1665271..5daedbe 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -190,7 +190,7 @@ Offer DAV or SSH access.");
 		global $HTML;
 		$b = '';
 
-		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+commits) as combined FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id ORDER BY combined DESC, realname',
+		$result = db_query_params('SELECT u.realname, u.user_name, u.user_id, sum(updates) as updates, sum(adds) as adds, sum(adds+commits) as combined, reponame FROM stats_cvs_user s, users u WHERE group_id=$1 AND s.user_id=u.user_id AND (commits>0 OR adds >0) GROUP BY u.user_id, realname, user_name, u.user_id, reponame ORDER BY reponame, combined DESC, realname',
 			array($project->getID()));
 
 		if (db_numrows($result) > 0) {

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmcvs/common/CVSPlugin.class.php     |  2 +-
 src/plugins/scmdarcs/common/DarcsPlugin.class.php | 19 +++++++++++++++++--
 src/plugins/scmgit/common/GitPlugin.class.php     | 17 ++++++++++++++++-
 src/plugins/scmhg/common/HgPlugin.class.php       |  2 +-
 4 files changed, 35 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list