[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. 2b68a9e0e4e039a492599612b44ed15a0765fb94

Roland Mas lolando at fusionforge.org
Wed Sep 17 17:19:59 CEST 2014


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, feature/concurrent-ssh-http-for-scm has been updated
       via  2b68a9e0e4e039a492599612b44ed15a0765fb94 (commit)
       via  3b75f77cb980d1cc12638da859a9cfe235470180 (commit)
       via  9b223895a3d3e9e8fd0b8d93c4065cf9ca21ec5d (commit)
       via  b08b9059227e16f44fc574a27358139d2ee22fa3 (commit)
       via  0d95506d451b804b21c31d1d61fce84d9347dac8 (commit)
       via  c65255a1cbd1184bb96dcce872194dd54c6651cc (commit)
       via  f084e62ec9b409fd77727a12a1e043865d389111 (commit)
       via  7c39fbf54b6e94dba55a168d32b66797b77a67f8 (commit)
       via  b1f2fa6276880e817b700470a577ce9a02017e39 (commit)
       via  26d2007475de98be62ba26a55cadac14af8821d7 (commit)
       via  c8c2d457daea804fe2f4aae07cbb29e592f093a2 (commit)
       via  845473ee4b5e703d7c0f3abc91ba281bdf87ade7 (commit)
       via  0a5484be2763f761153a9c5c092a8073451be4dd (commit)
       via  e6d7575dc7a09b44a8decb3306ddd191289f290c (commit)
      from  9679f11da0035a565c1d10b466eea9e73d18ee39 (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 2b68a9e0e4e039a492599612b44ed15a0765fb94
Merge: 9679f11 3b75f77
Author: Roland Mas <lolando at debian.org>
Date:   Wed Sep 17 17:19:48 2014 +0200

    Merge branch 'feature/concurrent-ssh-http-for-scm-5.3' into feature/concurrent-ssh-http-for-scm

diff --cc src/plugins/scmgit/common/GitPlugin.class.php
index a4ca28e,a24fdbe..6b35bf6
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@@ -286,11 -285,11 +286,11 @@@ class GitPlugin extends SCMPlugin 
  		}
  
  		if ($b == '') {
 -			$b .= '<h2>'._('Developer Git Access').'</h2>';
 -			$b .= '<p class="error">Error: No access protocol has been allowed for the Git plugin in scmgit.ini: : use_ssh and use_dav are disabled</p>';
 +			$b = '<h2>'._('Developer Git Access').'</h2>';
 +			$b .= $HTML->error_msg(_('Error: No access protocol has been allowed for the Git plugin in scmgit.ini: : use_ssh and use_dav are disabled'));
  		}
  
- 		if (session_loggedin() && forge_get_config('use_ssh', 'scmgit')) {
+ 		if (session_loggedin()) {
  			$u = user_get_object(user_getid());
  			if ($u->getUnixStatus() == 'A') {
  				$result = db_query_params('SELECT * FROM scm_personal_repos p WHERE p.group_id=$1 AND p.user_id=$2 AND plugin_id=$3',

commit 3b75f77cb980d1cc12638da859a9cfe235470180
Author: Roland Mas <lolando at debian.org>
Date:   Wed Sep 17 17:04:44 2014 +0200

    List instructions for personal Git repositories over Smart HTTP

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index a739ae0..a24fdbe 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -289,7 +289,7 @@ class GitPlugin extends SCMPlugin {
 			$b .= '<p class="error">Error: No access protocol has been allowed for the Git plugin in scmgit.ini: : use_ssh and use_dav are disabled</p>';
 		}
 
-		if (session_loggedin() && forge_get_config('use_ssh', 'scmgit')) {
+		if (session_loggedin()) {
 			$u = user_get_object(user_getid());
 			if ($u->getUnixStatus() == 'A') {
 				$result = db_query_params('SELECT * FROM scm_personal_repos p WHERE p.group_id=$1 AND p.user_id=$2 AND plugin_id=$3',
@@ -301,9 +301,14 @@ class GitPlugin extends SCMPlugin {
 					$b .= _('Access to your personal repository');
 					$b .= '</h2>';
 					$b .= '<p>';
-					$b .= _('You have a personal repository for this project, accessible through SSH with the following method. Enter your site password when prompted.');
+					$b .= _('You have a personal repository for this project, accessible through SSH with the following methods. Enter your site password when prompted.');
 					$b .= '</p>';
-					$b .= '<p><tt>git clone git+ssh://'.$u->getUnixName().'@' . $this->getBoxForProject($project) . '/'. forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $u->getUnixName() .'.git</tt></p>';
+					if (forge_get_config('use_ssh', 'scmgit')) {
+						$b .= '<p><tt>git clone git+ssh://'.$u->getUnixName().'@' . $this->getBoxForProject($project) . '/'. forge_get_config('repos_path', 'scmgit') .'/'. $project->getUnixName() .'/users/'. $u->getUnixName() .'.git</tt></p>';
+					}
+					if (forge_get_config('use_smarthttp', 'scmgit')) {
+						$b .= '<p><tt>git clone '.$protocol.'://'.$u->getUnixName().'@' . forge_get_config('scm_host').'/authscm/'.$u->getUnixName().'/git/'.$project->getUnixName() .'/users/'. $u->getUnixName() .'.git</tt></p>';
+					}
 				} else {
 					$glist = $u->getGroups();
 					foreach ($glist as $g) {

commit 9b223895a3d3e9e8fd0b8d93c4065cf9ca21ec5d
Merge: 383ae0e b08b905
Author: Roland Mas <lolando at debian.org>
Date:   Tue Sep 16 09:53:37 2014 +0200

    Merge branch 'Branch_5_3' into feature/concurrent-ssh-http-for-scm-5.3


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

Summary of changes:
 src/fusionforge.spec                               |   45 +++++++++++---------
 .../mediawiki/include/mediawikiPlugin.class.php    |    4 +-
 src/plugins/mediawiki/www/plugin_admin.php         |    7 ++-
 src/plugins/projectimport/www/projectsimport.php   |    4 +-
 src/plugins/scmbzr/common/BzrPlugin.class.php      |   36 +++++++++++-----
 src/plugins/scmgit/common/GitPlugin.class.php      |   11 +++--
 src/plugins/scmsvn/common/SVNPlugin.class.php      |   18 +++++---
 tests/scripts/phpunit.sh                           |    1 +
 8 files changed, 77 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list