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 c76943842dc596a206b6ea2b8f85870d2ccc0a8a (commit) via 99f24cd38bbd66f51c4c4704cfb8f378a65ca930 (commit) from 9a9651396ede1c49cb6a001df43da83de4d34812 (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=c76943842dc596a206b6ea2b8f85870d2ccc0a8a commit c76943842dc596a206b6ea2b8f85870d2ccc0a8a Author: Franck Villaume <franck.villa...@trivialdev.com> Date: Tue Dec 11 09:49:20 2018 +0000 fix [#906]: support complex path diff --git a/src/CHANGES b/src/CHANGES index 254aa21..56c7579 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,7 @@ FusionForge 6.1.1: * Widget User Page: fix owner test to ensure the user is the owner of the layout. -* fix [#903]: scmhook commitEmail for scmhg broken +* Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] +* Plugin Scmsvn: fix <reponame>_scmsvn_paths.txt support [#906] FusionForge 6.1: * Accounts: minimum password length is now 8 (Sylvain Beucler) diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php index e010f70..8b3a058 100644 --- a/src/plugins/scmsvn/common/SVNPlugin.class.php +++ b/src/plugins/scmsvn/common/SVNPlugin.class.php @@ -109,12 +109,18 @@ some control over it to the project's administrator."); } // Check scm_path module presence in repository $modules = array(); + $repo = 'file://' . forge_get_config('repos_path', $this->name).'/'.$repo_name; foreach ($scm_paths as $scm_path) { + $scm_path = trim($scm_path); if (strpos($scm_path, "!") === false) { - $repo = 'file://' . forge_get_config('repos_path', $this->name).'/'.$repo_name; $res = array(); - if (!(exec("svn ls '$repo'", $res) && in_array($scm_path.'/', $res))) { - $modules[] = '/'.$scm_path; + exec("svn info '$repo'", $res); + if (!preg_grep("/svn: warning: W170000: URL/", $res)) { + if (substr($scm_path, 0, 1) === '/') { + $modules[] = $scm_path; + } else { + $modules[] = '/'.$scm_path; + } } } } https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=99f24cd38bbd66f51c4c4704cfb8f378a65ca930 commit 99f24cd38bbd66f51c4c4704cfb8f378a65ca930 Author: Franck Villaume <franck.villa...@trivialdev.com> Date: Tue Dec 11 09:48:18 2018 +0000 6.1.0 -> 6.1.1 diff --git a/src/VERSION b/src/VERSION index dfda3e0..f3b5af3 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -6.1.0 +6.1.1 ----------------------------------------------------------------------- Summary of changes: src/CHANGES | 3 ++- src/VERSION | 2 +- src/plugins/scmsvn/common/SVNPlugin.class.php | 12 +++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) hooks/post-receive -- FusionForge _______________________________________________ Fusionforge-commits mailing list Fusionforge-commits@lists.fusionforge.org http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits