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.1 has been updated
via 672d808bcc698e700bdac49c8a5e74e187d40a6d (commit)
from 9b3d1ad09e3edc5d823032ea67913dd76578e31c (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=672d808bcc698e700bdac49c8a5e74e187d40a6d
commit 672d808bcc698e700bdac49c8a5e74e187d40a6d
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Tue Feb 20 17:58:19 2018 +0000
scmhook: reuse scm_plugin rather than fetching info from library. better
support for multiscm and multirepo
diff --git a/src/plugins/scmhook/cronjobs/updateScmRepo.php
b/src/plugins/scmhook/cronjobs/updateScmRepo.php
index b9f0905..d709982 100755
--- a/src/plugins/scmhook/cronjobs/updateScmRepo.php
+++ b/src/plugins/scmhook/cronjobs/updateScmRepo.php
@@ -56,7 +56,7 @@ function install_hooks($params) {
$group_id = $params[0];
// get the list of project to be updated
- $res = db_query_params('SELECT groups.group_id, groups.scm_box,
plugin_scmhook.hooks
+ $res = db_query_params('SELECT groups.group_id, groups.scm_box,
plugin_scmhook.hooks, plugin_scmhook.scm_plugin
FROM groups, plugin_scmhook
WHERE groups.status = $1
AND plugin_scmhook.id_group = groups.group_id
@@ -72,19 +72,11 @@ function install_hooks($params) {
$scmhookPlugin = new scmhookPlugin;
while ($row = db_fetch_array($res)) {
$group_id = $row['group_id'];
- $scm_box = $row['scm_box'];
- $scmtype = '';
- // find the scm type of the project
- $listScm = $scmhookPlugin->getListLibraryScm();
$group = group_get_object($group_id);
- for ($i = 0; $i < count($listScm); $i++) {
- if ($group->usesPlugin($listScm[$i])) {
- $scmtype = $listScm[$i];
- continue;
- }
- }
+ $scm_box = $row['scm_box'];
$returnvalue = true;
// call the right cronjob in the library
+ $scmtype = $row['scm_plugin'];
switch ($scmtype) {
case 'scmsvn':
cron_debug("INFO start updating hooks for project
".$group->getUnixName());
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmhook/cronjobs/updateScmRepo.php | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
