#!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 source "$(dirname -- "$0")/../load.sh" || exit 1 require: git pman pman.conf git_cleancheckout_DIRTY="\ Vous avez des modifications locales. Enregistrez ces modifications avant de créer une release" function load_branches() { setx CurrentBranch=git_get_branch setx -a LocalBranches=git_list_branches setx -a RemoteBranches=git_list_rbranches "$Origin" setx -a AllBranches=git_list_pbranches "$Origin" } function load_config() { if [ -n "$ConfigFile" ]; then source "$ConfigFile" || die elif [ -n "$ConfigBranch" ]; then if ! array_contains LocalBranches "$ConfigBranch"; then die "$ConfigBranch: branche de configuration introuvable" else local config="$(git show "$ConfigBranch:.pman.conf" 2>/dev/null)" [ -n "$config" ] || die "$ConfigBranch: aucune configuration trouvée sur cette branche" eval "$config" fi elif [ -f .pman.conf ]; then ConfigFile=.pman.conf source "$ConfigFile" else require pman${MYNAME#prel}.conf fi SrcBranch="$1" [ -n "$SrcBranch" ] || SrcBranch="$CurrentBranch" case "$SrcBranch" in "$UPSTREAM") SrcType=upstream; DestBranch="$DEVELOP";; "$FEATURE"*) SrcType=feature; DestBranch="$DEVELOP";; "$DEVELOP") SrcType=develop; DestBranch="$MAIN";; "$RELEASE"*) SrcType=release; DestBranch="$MAIN";; "$HOTFIX"*) SrcType=hotfix; DestBranch="$MAIN";; "$MAIN") SrcType=main; DestBranch="$DIST";; "$DIST") SrcType=dist; DestBranch=;; *) DestBranch=;; esac } function ensure_branches() { [ -n "$SrcBranch" -a -n "$DestBranch" ] || die "$SrcBranch: Aucune configuration de fusion trouvée pour cette branche" array_contains AllBranches "$SrcBranch" || die "$SrcBranch: branche source introuvable" array_contains AllBranches "$DestBranch" || die "$DestBranch: branche destination introuvable" local branch ReleaseBranch= HotfixBranch= for branch in "${AllBranches[@]}"; do if [[ "$branch" == "$RELEASE"* ]]; then ReleaseBranch="$branch" elif [[ "$branch" == "$HOTFIX"* ]]; then HotfixBranch="$branch" fi done } ################################################################################ # Initialisation ################################################################################ function init_action() { : } ################################################################################ # Informations ################################################################################ DUMP_VARS=( ConfigBranch ConfigFile --Configuration "${CONFIG_VARS[@]}" --Paramètres CurrentBranch SrcType SrcBranch DestBranch ) function dump_action() { for var in "${DUMP_VARS[@]}"; do if [ "${var#--}" != "$var" ]; then estep "${var#--}" else echo_setv "$var=${!var}" fi done } function show_action() { local commits setx commits=_list_commits if [ -n "$commits" ]; then einfo "Commits à fusionner $SrcBranch --> $DestBranch" eecho "$commits" fi } ################################################################################ # Fusion de branche ################################################################################ function merge_action() { local script=".git/rel-merge.sh" local -a push_branches [ -n "$Merge" ] || exit_with edebug "La fusion est désactivée. Ce script va s'arrêter" enote "\ Ce script va - fusionner la branche ${COULEUR_BLEUE}$SrcBranch${COULEUR_NORMALE} dans ${COULEUR_ROUGE}$DestBranch${COULEUR_NORMALE}${Push:+ - pousser les branches modifiées}" ask_yesno "Voulez-vous continuer?" O || die local comment= local or_die=" || exit 1" _mscript_start _script_add <