[evolvis-commits] r18381: upstream pending merges:↵ Roland Mas 2012-04-25 Fixed SVN commit stats calculations (thanks to Coiby Xu)↵ Roland Mas 2012-04-23 Fixed GitPlugin::getRepositories() to always return an array↵ jheyman 2012-04-20 Fix missing projet name tab in viewvc↵ jheyman 2012-04-20 Fix double menu in viewvc by Xavier LE BOËC↵ jheyman 2012-04-19 Workaround to create project with the selected SCM plugin↵ jheyman 2012-04-18 Add option -f in cvs-pserver↵ jheyman 2012-04-18 Fix anonymous checkout with CVS pserver

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 26 14:43:54 CEST 2012


Author: mirabilos
Date: 2012-04-26 14:43:54 +0200 (Thu, 26 Apr 2012)
New Revision: 18381

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/common/CVSPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/sbin/cvs-pserver
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmgit/common/GitPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc.php
Log:
upstream pending merges:
  Roland Mas 2012-04-25 Fixed SVN commit stats calculations (thanks to Coiby Xu)
    Roland Mas 2012-04-23 Fixed GitPlugin::getRepositories() to always return an array
    jheyman 2012-04-20 Fix missing projet name tab in viewvc
    jheyman 2012-04-20 Fix double menu in viewvc by Xavier LE BOËC
    jheyman 2012-04-19 Workaround to create project with the selected SCM plugin
    jheyman 2012-04-18 Add option -f in cvs-pserver
    jheyman 2012-04-18 Fix anonymous checkout with CVS pserver

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2012-04-26 12:43:54 UTC (rev 18381)
@@ -2606,10 +2606,13 @@
 				}
 			}
 
+			// Disabled to keep user choice from registration page.
 //			$this->setUseSCM ($template->usesSCM()) ;
 
 			foreach ($template->getPlugins() as $plugin_id => $plugin_name) {
-				$this->setPluginUse ($plugin_name) ;
+				if (preg_match('/^scm/', $plugin_name) && ($plugin_name != 'scmhook')) {
+					$this->setPluginUse($plugin_name);
+				}
 			}
 
 			foreach ($template->getRoles() as $oldrole) {
@@ -2658,16 +2661,17 @@
 		$this->normalizeAllRoles () ;
 		$this->activateUsers();
 
+		// Delete fake join request
+		if (USE_PFO_RBAC) {
+			foreach (get_group_join_requests ($this) as $gjr) {
+				$gjr->delete(true) ;
+			}
+		}
+
 		// Switch back to user preference
 		session_set_internal ($saved_session->getID()) ;
 		setup_gettext_from_context();
 
-		if (USE_PFO_RBAC) {
-			foreach (get_group_join_requests($this) as $gjr) {
-				$gjr->delete(true);
-			}
-		}
-
 		db_commit();
 
 		$this->sendApprovalEmail();

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-26 12:43:54 UTC (rev 18381)
@@ -1,3 +1,22 @@
+fusionforge (1:5.1.1+evolvis57) xunstable; urgency=low
+
+  [ Roland Mas ]
+  * Handle whitespace in subdirectories of repositories
+    (patch from Christophe Guilloux)
+  * Fixed SVN commit stats calculations (thanks to Coiby Xu)
+  * Fixed GitPlugin::getRepositories() to always return an array
+
+  [ Julien Heyman ]
+  * Fix missing projet name tab in viewvc
+  * Fix double menu in viewvc by Xavier LE BOËC
+  * Workaround to create project with the selected SCM plugin
+
+  [ Alain Peyrat ]
+  * Apply patch [#387] cronjob stats_projects-backfill.php missing
+    enviroment by Erica Vidal
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 26 Apr 2012 11:36:20 +0200
+
 fusionforge (1:5.1.1+evolvis56) unstable; urgency=low
 
   * My Account: languages not shipped and not English (untranslated)

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/common/CVSPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/common/CVSPlugin.class.php	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/common/CVSPlugin.class.php	2012-04-26 12:43:54 UTC (rev 18381)
@@ -188,7 +188,7 @@
 		
 		if ($project->usesPlugin ($this->name)) {
 			if ($this->browserDisplayable ($project)) {
-				print '<iframe src="'.util_make_url ("/scm/viewvc.php/?root=".$project->getUnixName()).'" frameborder="0" width=100% height=700></iframe>' ;
+				session_redirect("/scm/viewvc.php/?root=".$project->getUnixName());
 			}
 		}
 	}
@@ -223,8 +223,16 @@
 			system ("chmod 3777 $locks_dir") ;
 			if ($project->enableAnonSCM()) {
 				system ("chmod -R g+wXs,o+rX-w $repo") ;
+				system ("echo \"SystemAuth=no\" > $repo/CVSROOT/config");
+				system ("echo \"LockDir=$locks_dir\" >> $repo/CVSROOT/config");
+				system ("echo \"anonymous\" > $repo/CVSROOT/readers");
+				system ("echo \"anonymous:\" > $repo/CVSROOT/passwd");
 			} else {
 				system ("chmod -R g+wXs,o-rwx $repo") ;
+				system ("echo \"SystemAuth=no\" > $repo/CVSROOT/config");
+				system ("echo \"LockDir=$locks_dir\" >> $repo/CVSROOT/config");
+				system ("echo \"\" > $repo/CVSROOT/readers");
+				system ("echo \"\" > $repo/CVSROOT/passwd");
 			}
 		} else {
 			$unix_user = forge_get_config ('apache_user') ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/sbin/cvs-pserver
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/sbin/cvs-pserver	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmcvs/sbin/cvs-pserver	2012-04-26 12:43:54 UTC (rev 18381)
@@ -12,6 +12,6 @@
 CVS_PSERV_REPOS=$(find $CVSROOT -mindepth 1 -maxdepth 1 -type d)
 allow_root_opts="--allow-root=/$(echo $CVS_PSERV_REPOS | sed 's: : --allow-root=/:g')"
 
-exec /usr/sbin/chroot $CHROOTDIR /usr/bin/cvs ${allow_root_opts} pserver
+exec /usr/sbin/chroot $CHROOTDIR /usr/bin/cvs -f ${allow_root_opts} pserver
 
 # End of file.

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmgit/common/GitPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmgit/common/GitPlugin.class.php	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmgit/common/GitPlugin.class.php	2012-04-26 12:43:54 UTC (rev 18381)
@@ -432,7 +432,7 @@
 
         function getRepositories($path) {
                 if (! is_dir($path))
-                        return;
+                        return array();
                 $list = array();
                 $entries = scandir($path);
                 foreach ($entries as $entry) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2012-04-26 12:43:54 UTC (rev 18381)
@@ -671,12 +671,12 @@
 			if ($attrs['ACTION'] == "M") {
 				$updates++;
 				if ($last_user) {
-					$usr_updates[$last_user] = isset($usr_updates[$last_user]) ? ($usr_updates[$last_user]+1) : 0 ;
+					$usr_updates[$last_user] = isset($usr_updates[$last_user]) ? ($usr_updates[$last_user]+1) : 1 ;
 				}
 			} elseif ($attrs['ACTION'] == "A") {
 				$adds++;
 				if ($last_user) {
-					$usr_adds[$last_user] = isset($usr_adds[$last_user]) ? ($usr_adds[$last_user]+1) : 0 ;
+					$usr_adds[$last_user] = isset($usr_adds[$last_user]) ? ($usr_adds[$last_user]+1) : 1 ;
 				}
 			}
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc.php	2012-04-25 16:01:19 UTC (rev 18380)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc.php	2012-04-26 12:43:54 UTC (rev 18381)
@@ -105,6 +105,10 @@
 		$repos_type = 'svn';
 	}
 	
+	// HACK : getSiteMenu in Navigation.class.php use GLOBAL['group_id']
+	// to fix missing projet name tab
+	$group_id = $Group->getID();
+
 	$content = viewcvs_execute($unix_name, $repos_type);
 }
 



More information about the evolvis-commits mailing list