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 82b5a145a3dcda2d5a44097fb5a5df6f26d5c379 (commit)
from c5eda64b21a9deebaaaaff0b6678217974e076d1 (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=82b5a145a3dcda2d5a44097fb5a5df6f26d5c379
commit 82b5a145a3dcda2d5a44097fb5a5df6f26d5c379
Author: Franck Villaume <[email protected]>
Date: Tue Mar 20 08:23:56 2018 +0000
scmsvn: align test & code: use kbd
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 0d7e538..36321aa 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -149,7 +149,7 @@ some control over it to the project's administrator.");
foreach ($repo_list as $repo_name) {
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
- $b .= html_e('tt', array(), 'svn
'.$ssh_port.' checkout
svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd', array(), 'svn
'.$ssh_port.' checkout
svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$repo_name.$module).html_e('br');
}
}
}
@@ -159,7 +159,7 @@ some control over it to the project's administrator.");
foreach ($repo_list as $repo_name) {
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
- $b .= html_e('tt', array(), 'svn
checkout http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
$this->getBoxForProject($project).
'/anonscm/svn/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd', array(), 'svn
checkout http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
$this->getBoxForProject($project).
'/anonscm/svn/'.$repo_name.$module).html_e('br');
}
}
}
@@ -206,9 +206,9 @@ some control over it to the project's administrator.");
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
if
(forge_get_config('use_shell_limited')) {
- $b .= html_e('tt',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://'.$d.'@'.$this->getBoxForProject($project).'/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://'.$d.'@'.$this->getBoxForProject($project).'/'.$repo_name.$module).html_e('br');
} else {
- $b .= html_e('tt',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://'.$d.'@'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://'.$d.'@'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$repo_name.$module).html_e('br');
}
}
}
@@ -222,7 +222,7 @@ some control over it to the project's administrator.");
foreach ($repo_list as $repo_name) {
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
- $b .= html_e('tt', array(),
'svn checkout --username '.$d.' http'.((forge_get_config('use_ssl', 'scmsvn'))
? 's' :
'').'://'.$this->getBoxForProject($project).'/authscm/'.$d.'/svn/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd', array(),
'svn checkout --username '.$d.' http'.((forge_get_config('use_ssl', 'scmsvn'))
? 's' :
'').'://'.$this->getBoxForProject($project).'/authscm/'.$d.'/svn/'.$repo_name.$module).html_e('br');
}
}
$b .= '</div>';
@@ -245,9 +245,9 @@ some control over it to the project's administrator.");
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
if
(forge_get_config('use_shell_limited')) {
- $b .= html_e('tt',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://<i>'._('developername').'</i>@'.$this->getBoxForProject($project).'/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://<i>'._('developername').'</i>@'.$this->getBoxForProject($project).'/'.$repo_name.$module).html_e('br');
} else {
- $b .= html_e('tt',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://<i>'._('developername').'</i>@'.$this->getBoxForProject($project).$this->svn_root_fs
.'/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd',
array(), 'svn '.$ssh_port.'checkout
svn+ssh://<i>'._('developername').'</i>@'.$this->getBoxForProject($project).$this->svn_root_fs
.'/'.$repo_name.$module).html_e('br');
}
}
}
@@ -263,7 +263,7 @@ some control over it to the project's administrator.");
foreach ($repo_list as $repo_name) {
$modules = $this->topModule($project,
$repo_name);
foreach ($modules as $module) {
- $b .= html_e('tt', array(),
'svn checkout --username <i>'._('developername').'</i>
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' :
'').'://'.$this->getBoxForProject($project).'/authscm/<i>'._('developername').'</i>/svn/'.$repo_name.$module).html_e('br');
+ $b .= html_e('kbd', array(),
'svn checkout --username <i>'._('developername').'</i>
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' :
'').'://'.$this->getBoxForProject($project).'/authscm/<i>'._('developername').'</i>/svn/'.$repo_name.$module).html_e('br');
}
}
$b .= '</div>';
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php
b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index f590a01..74fbb20 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -52,7 +52,7 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
$this->clickAndWait("link=SCM");
- $p = $this->getText("//span[contains(.,'svn checkout
svn+ssh')]");
+ $p = $this->getText("//kbd[contains(.,'svn checkout
svn+ssh')]");
$p = preg_replace(",^svn checkout ,", "", $p);
// Create a local checkout, commit stuff
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 5fc6918..c08423c 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -49,7 +49,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
$this->clickAndWait("link=SCM");
- $p = $this->getText("//span[contains(.,'svn checkout --username
".FORGE_ADMIN_USERNAME." http')]");
+ $p = $this->getText("//kbd[contains(.,'svn checkout --username
".FORGE_ADMIN_USERNAME." http')]");
$p = preg_replace(",^svn checkout --username
".FORGE_ADMIN_USERNAME." ,", "", $p);
// Create a local clone, add stuff, push it to the repo
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmsvn/common/SVNPlugin.class.php | 16 ++++++++--------
tests/func/50_PluginsScmSvn/svnSSHTest.php | 2 +-
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
