The default branch "master" is now configurable

Author: Anthony Demurtas

Source/Source.php

@@ -83,6 +83,8 @@ function config() {
 			'bugfix_message'	=> 'Fix committed to $1 branch.',
 			'bugfix_message_view_status'	=> VS_PUBLIC,
 
+			'default_branch'    => 'master',
+
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
 

Source/lang/strings_english.txt

@@ -100,6 +100,8 @@ $s_plugin_Source_bugfix_message = 'Bug Fixed Message Template';
 $s_plugin_Source_bugfix_message_info = 'Use $1 for branch, $2 for revision, $3 for timestamp, $4 for commit message, $5 for repository name, or $6 for changeset ID.';
 $s_plugin_Source_bugfix_message_view_status = 'Bug Fixed Message View State';
 $s_plugin_Source_bugfix_message_view_status_info = 'Note: if the changeset\'s author/committer does not have <em>private_bugnote_threshold</em>, the note will be Public regardless of this setting.';
+$s_plugin_Source_default_branch = 'Default branch';
+$s_plugin_Source_default_branch_info = 'Branch by default when creating a repository.';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';

Source/lang/strings_french.txt

@@ -98,6 +98,8 @@ $s_plugin_Source_bugfix_message = 'Modèle de message de résolution';
 $s_plugin_Source_bugfix_message_info = 'Utilisez $1 pour la branche, $2 pour la révision, $3 pour l\'horodatage, $4 pour le message de soumission, ou $5 pour le nom du dépôt.';
 $s_plugin_Source_bugfix_message_view_status = 'Type de message de résolution';
 $s_plugin_Source_bugfix_message_view_status_info = 'Note: si l\'auteur du jeu de changement n\'a pas le niveau <em>private_bugnote_threshold</em>, la note sera Publique quel que soit la valeur de cette option.';
+$s_plugin_Source_default_branch = 'Branche par défaut';
+$s_plugin_Source_default_branch_info = 'Branche par defaut lors de la création d\'un dépôt.';
 $s_plugin_Source_reset = 'Réinitialiser';
 $s_plugin_Source_menu_links = 'Liens du menu principal';
 $s_plugin_Source_show_repo_link = 'Dépôts';

Source/pages/manage_config.php

@@ -39,6 +39,8 @@
 $f_bugfix_message = gpc_get_string( 'bugfix_message' );
 $f_bugfix_message_view_status = gpc_get_int( 'bugfix_message_view_status', VS_PUBLIC );
 
+$f_default_branch = gpc_get_string( 'default_branch' );
+
 function check_urls( $t_urls_in ) {
 	$t_urls_in = explode( "\n", $t_urls_in );
 	$t_urls_out = array();
@@ -119,6 +121,8 @@ function maybe_set_option( $name, $value ) {
 maybe_set_option( 'bugfix_message', $f_bugfix_message );
 maybe_set_option( 'bugfix_message_view_status', $f_bugfix_message_view_status );
 
+maybe_set_option( 'default_branch', $f_default_branch );
+
 maybe_set_option( 'remote_checkin', $f_remote_checkin );
 maybe_set_option( 'checkin_urls', serialize( $t_checkin_urls ) );
 maybe_set_option( 'remote_imports', $f_remote_imports );

Source/pages/manage_config_page.php

@@ -259,6 +259,16 @@
 	</tr>
 
 	<tr class="spacer"></tr>
+	<tr>
+		<td class="category"><?php echo plugin_lang_get( 'default_branch' ) ?></td>
+		<td>
+			<input name="default_branch" type="text" class="input-sm" size="50" value="<?php echo string_attribute( plugin_config_get( 'default_branch' ) ) ?>"/>
+			<br>
+			<span class="small"><?php echo plugin_lang_get( 'default_branch_info' ) ?></span>
+		</td>
+	</tr>
+
+	<tr class="spacer" />
 	<tr>
 		<td class="category"><?php echo plugin_lang_get( 'api_key' ) ?></td>
 		<td>

SourceGitlab/SourceGitlab.php

@@ -115,7 +115,7 @@ public function update_repo_form( $p_repo ) {
 		if ( isset( $p_repo->info['master_branch'] ) ) {
 			$t_master_branch = $p_repo->info['master_branch'];
 		} else {
-			$t_master_branch = 'master';
+			$t_master_branch = config_get('plugin_Source_default_branch', 'master');
 		}
 ?>
 <tr>
@@ -249,7 +249,7 @@ public function import_full( $p_repo ) {
 
 		$t_branch = $p_repo->info['master_branch'];
 		if ( is_blank( $t_branch ) ) {
-			$t_branch = 'master';
+			$t_branch = config_get('plugin_Source_default_branch', 'master');
 		}
 
 		# if we're not allowed everything, populate an array of what we are allowed