[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta2-76-gd36d72f

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Mar 21 16:14:06 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  d36d72fa98501daf88186b814b873c020213a773 (commit)
       via  c5302428fb9aeb295a7e111c9c403d2d40630a78 (commit)
       via  827a80fb173b8b623b3b27c1f55a7a3ee40aef7f (commit)
      from  2507923bb998451ea761f672d00a557bb88ccabb (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=d36d72fa98501daf88186b814b873c020213a773

commit d36d72fa98501daf88186b814b873c020213a773
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Mar 21 15:14:00 2018 +0000

    fix bzr whoami

diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index 8b3c95f..e73b435 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -59,7 +59,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$p = preg_replace(",^bzr checkout ,", "", $p);
 		$p = preg_replace(",/branchname$,", "", $p);
 		$t = exec("mktemp -d /tmp/bzrTest.XXXXXX");
-		system("bzr whoami admin <admin at localhost.localdomain>");
+		system("bzr whoami 'admin <admin at localhost.localdomain>'");
 		system("cd $t && bzr init --quiet trunk >/dev/null", $ret);
 		$this->assertEquals(0, $ret);
 		system("echo 'this is a simple text' > $t/trunk/mytext.txt");

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c5302428fb9aeb295a7e111c9c403d2d40630a78

commit c5302428fb9aeb295a7e111c9c403d2d40630a78
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Mar 21 15:13:07 2018 +0000

    use kbd and set bzr whoami

diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index 0104f58..8b3c95f 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -55,10 +55,11 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
-		$p = $this->getText("//tt[contains(.,'bzr checkout bzr+ssh')]");
+		$p = $this->getText("//kbd[contains(.,'bzr checkout bzr+ssh')]");
 		$p = preg_replace(",^bzr checkout ,", "", $p);
 		$p = preg_replace(",/branchname$,", "", $p);
 		$t = exec("mktemp -d /tmp/bzrTest.XXXXXX");
+		system("bzr whoami admin <admin at localhost.localdomain>");
 		system("cd $t && bzr init --quiet trunk >/dev/null", $ret);
 		$this->assertEquals(0, $ret);
 		system("echo 'this is a simple text' > $t/trunk/mytext.txt");

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=827a80fb173b8b623b3b27c1f55a7a3ee40aef7f

commit 827a80fb173b8b623b3b27c1f55a7a3ee40aef7f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Mar 21 15:12:42 2018 +0000

    use kbd html tag

diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php b/src/plugins/scmbzr/common/BzrPlugin.class.php
index 26d7267..732571d 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -94,7 +94,7 @@ over it to the project's administrator.");
 		$b .= _('This project\'s Bazaar repository can be checked out through anonymous access with the following command.');
 		$b .= '</p>';
 		$b .= '<p>' ;
-		$b .= '<tt>bzr checkout '.util_make_url ('/anonscm/bzr/'.$project->getUnixName().'/').'</tt><br />';
+		$b .= html_e('kbd', array(), 'bzr checkout '.util_make_url('/anonscm/bzr/'.$project->getUnixName().'/')).'<br />';
 		$b .= '</p>';
 		return $b ;
 	}
@@ -114,7 +114,7 @@ over it to the project's administrator.");
 			$b .= ' ';
 			$b .= _('Enter your site password when prompted.');
 			$b .= '</p>';
-			$b .= '<p><tt>bzr checkout bzr+ssh://'.$d.'@' . $this->getBoxForProject($project) . forge_get_config('repos_path', 'scmbzr') .'/'. $project->getUnixName().'/'._('branchname').'</tt></p>' ;
+			$b .= '<p>'.html_e('kbd', array(), 'bzr checkout bzr+ssh://'.$d.'@' . $this->getBoxForProject($project) . forge_get_config('repos_path', 'scmbzr') .'/'. $project->getUnixName().'/'._('branchname')).'</p>' ;
 		} else {
 			$b .= '<h2>';
 			$b .= sprintf(_('Developer %s Access via SSH'), 'Bazaar');

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

Summary of changes:
 src/plugins/scmbzr/common/BzrPlugin.class.php  | 4 ++--
 tests/func/55_PluginsScmMulti/multiSCMTest.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list