natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* idf.php-dist: no need to configure a branch prefix any longer now that the project owner can define the master branch name

Browse Source 
* Monotone.php: change accordingly to use the configured master branch name and fallback to all branches ("*") if noone is found
This commit is contained in:
Thomas Keller 2010-04-27 23:28:52 +02:00
parent 18ba8d0ac5
commit 94a5464155
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/IDF/Scm/Monotone.php
View File

@ -366,11 +366,15 @@ class IDF_Scm_Monotone extends IDF_Scm
public static function getAnonymousAccessUrl($project) public static function getAnonymousAccessUrl($project)
{ {
$conf = $project->getConf();
if (false === ($branch = $conf->getVal('mtn_master_branch', false))
|| empty($branch)) {
$branch = "*";
}
return sprintf( return sprintf(
Pluf::f('mtn_remote_url'), Pluf::f('mtn_remote_url'),
$project->shortname, $project->shortname,
Pluf::f('mtn_branch_prefix'), $branch
$project->shortname
); );
} }

3
src/IDF/conf/idf.php-dist
View File

@ -76,8 +76,7 @@ $cfg['svn_remote_url'] = 'http://localhost/svn/%s';
# Same as for git, you can have multiple repositories, one for each # Same as for git, you can have multiple repositories, one for each
# project or a single one for all the projects. # project or a single one for all the projects.
$cfg['mtn_repositories'] = '/home/mtn/repositories/%s.mtn'; $cfg['mtn_repositories'] = '/home/mtn/repositories/%s.mtn';
$cfg['mtn_branch_prefix'] = 'com.indefero.projects.'; $cfg['mtn_remote_url'] = 'mtn://localhost/~%s/%s';
$cfg['mtn_remote_url'] = 'mtn://localhost/~%s/%s%s';
# Mercurial repositories path # Mercurial repositories path
#$cfg['mercurial_repositories'] = '/home/mercurial/repositories/%s'; #$cfg['mercurial_repositories'] = '/home/mercurial/repositories/%s';