[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-129-g4808b05

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Feb 8 14:41:57 CET 2018


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  4808b05036868217bdf06878d63254d8b273e8c0 (commit)
      from  e4faee19d74c2eae9e7b323c83dd5495c4cb9df5 (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=4808b05036868217bdf06878d63254d8b273e8c0

commit 4808b05036868217bdf06878d63254d8b273e8c0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 8 13:41:51 2018 +0000

    scmhg: fix PHP warning & introduce support for hgweb browse and multirepo

diff --git a/src/plugins/scmhg/common/HgPlugin.class.php b/src/plugins/scmhg/common/HgPlugin.class.php
index 96619d0..f6dcf88 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -278,13 +278,15 @@ Offer DAV or SSH access.");
 			return false;
 		}
 		if ($this->browserDisplayable($project)) {
+			(isset($params['extra']) && $params['extra']) ? $extrarepo = $params['extra'] : $extrarepo = $project->getUnixName();
+
 			$protocol = forge_get_config('use_ssl', 'scmhg')? 'https' : 'http';
 			$box = $this->getBoxForProject($project);
                         if ($project->enableAnonSCM()) {
-				$iframesrc = $protocol.'://'.$box.'/anonscm/scmhg/cgi-bin/'.$project->getUnixName();
+				$iframesrc = $protocol.'://'.$box.'/anonscm/scmhg/cgi-bin/'.$project->getUnixName().'/'.$extrarepo;
 			} elseif (session_loggedin()) {
 				$logged_user = user_get_object(user_getid())->getUnixName();
-				$iframesrc = $protocol.'://'.$box.'/authscm/'.$logged_user.'/scmhg/cgi-bin/'.$project->getUnixName().'/';
+				$iframesrc = $protocol.'://'.$box.'/authscm/'.$logged_user.'/scmhg/cgi-bin/'.$project->getUnixName().'/'.$extrarepo.'/';
 			}
 			if ($params['commit']) {
 				$iframesrc .= '/rev/'.$params['commit'];
@@ -905,8 +907,9 @@ Offer DAV or SSH access.");
  	}
 
 	function getRepositories($group, $autoinclude = true) {
+		$repoarr = array();
 		if ($autoinclude) {
-			$repoarr = array($group->getUnixName());
+			$repoarr[] = $group->getUnixName();
 		}
 		$result = db_query_params('SELECT repo_name FROM scm_secondary_repos WHERE group_id = $1 AND next_action = $2 AND plugin_id = $3 ORDER BY repo_name',
 						   array($group->getID(),

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

Summary of changes:
 src/plugins/scmhg/common/HgPlugin.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list