prel/pdev: ajouter les hook BEFORE_*
This commit is contained in:
parent
7e05caf4d7
commit
bd0da9cffe
30
bin/pdev
30
bin/pdev
@ -36,7 +36,7 @@ Ce script va
|
||||
|
||||
local script=".git/pman-merge.sh"
|
||||
local -a push_branches delete_branches
|
||||
local after
|
||||
local hook
|
||||
local comment=
|
||||
local or_die=" || exit 1"
|
||||
|
||||
@ -47,10 +47,15 @@ Ce script va
|
||||
if [ -n "\$merge" ]; then
|
||||
esection "Fusionner la branche"
|
||||
EOF
|
||||
_mscript_merge_branch
|
||||
after="AFTER_MERGE_${SrcType^^}"; [ -n "${!after}" ] && _scripta <<EOF
|
||||
hook="BEFORE_MERGE_${SrcType^^}"; [ -n "${!hook}" ] && _scripta <<EOF
|
||||
(
|
||||
${!after}
|
||||
${!hook}
|
||||
)$or_die
|
||||
EOF
|
||||
_mscript_merge_branch
|
||||
hook="AFTER_MERGE_${SrcType^^}"; [ -n "${!hook}" ] && _scripta <<EOF
|
||||
(
|
||||
${!hook}
|
||||
)$or_die
|
||||
EOF
|
||||
_scripta <<EOF
|
||||
@ -65,9 +70,9 @@ if [ -n "\$delete" ]; then
|
||||
esection "Supprimer la branche"
|
||||
EOF
|
||||
_mscript_delete_branch
|
||||
after="AFTER_DELETE_${SrcType^^}"; [ -n "${!after}" ] && _scripta <<EOF
|
||||
hook="AFTER_DELETE_${SrcType^^}"; [ -n "${!hook}" ] && _scripta <<EOF
|
||||
(
|
||||
${!after}
|
||||
${!hook}
|
||||
)$or_die
|
||||
EOF
|
||||
_scripta <<EOF
|
||||
@ -80,6 +85,11 @@ EOF
|
||||
# push
|
||||
if [ -n "\$push" ]; then
|
||||
esection "Pousser les branches"
|
||||
EOF
|
||||
hook="BEFORE_PUSH_${DestType^^}"; [ -n "${!hook}" ] && _scripta <<EOF
|
||||
(
|
||||
${!hook}
|
||||
)$or_die
|
||||
EOF
|
||||
_script_push_branches
|
||||
if [ ${#delete_branches[*]} -gt 0 ]; then
|
||||
@ -88,9 +98,9 @@ EOF
|
||||
_script_push_branches
|
||||
_scripta <<<fi
|
||||
fi
|
||||
after="AFTER_PUSH_${DestType^^}"; [ -n "${!after}" ] && _scripta <<EOF
|
||||
hook="AFTER_PUSH_${DestType^^}"; [ -n "${!hook}" ] && _scripta <<EOF
|
||||
(
|
||||
${!after}
|
||||
${!hook}
|
||||
)$or_die
|
||||
EOF
|
||||
_scripta <<EOF
|
||||
@ -141,10 +151,12 @@ args=(
|
||||
CONFIGURATION
|
||||
Le fichier .pman.conf contient la configuration des branches. Les variables
|
||||
supplémentaires suivantes peuvent être définies:
|
||||
BEFORE_MERGE_<srcType>
|
||||
AFTER_MERGE_<srcType>
|
||||
AFTER_DELETE_<srcType>
|
||||
BEFORE_PUSH_<destType>
|
||||
AFTER_PUSH_<destType>
|
||||
xxxType valant UPSTREAM, DEVELOP, FEATURE, RELEASE, MAIN, HOTFIX, DIST"
|
||||
srcType et destType pouvant valoir UPSTREAM, DEVELOP, FEATURE, RELEASE, MAIN, HOTFIX, DIST"
|
||||
-d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations"
|
||||
-O:,--origin Origin= "++\
|
||||
origine à partir de laquelle les branches distantes sont considérées"
|
||||
|
18
bin/prel
18
bin/prel
@ -85,6 +85,11 @@ Vous devrez:
|
||||
# create
|
||||
if [ -n "\$create" ]; then
|
||||
esection "Création de la release"
|
||||
EOF
|
||||
[ -n "$BEFORE_CREATE_RELEASE" ] && _scripta <<EOF
|
||||
(
|
||||
$BEFORE_CREATE_RELEASE
|
||||
)$or_die
|
||||
EOF
|
||||
_rscript_create_release_branch
|
||||
[ -n "$AFTER_CREATE_RELEASE" ] && _scripta <<EOF
|
||||
@ -101,6 +106,11 @@ EOF
|
||||
# merge
|
||||
if [ -n "\$merge" ]; then
|
||||
esection "Fusionner la release"
|
||||
EOF
|
||||
[ -n "$BEFORE_MERGE_RELEASE" ] && _scripta <<EOF
|
||||
(
|
||||
$BEFORE_MERGE_RELEASE
|
||||
)$or_die
|
||||
EOF
|
||||
_rscript_merge_release_branch "$DestBranch" "$Tag"
|
||||
_rscript_merge_release_branch "$SrcBranch"
|
||||
@ -119,6 +129,11 @@ EOF
|
||||
# push
|
||||
if [ -n "\$push" ]; then
|
||||
esection "Pousser branches et tags"
|
||||
EOF
|
||||
[ -n "$BEFORE_PUSH_RELEASE" ] && _scripta <<EOF
|
||||
(
|
||||
$BEFORE_PUSH_RELEASE
|
||||
)$or_die
|
||||
EOF
|
||||
_script_push_branches
|
||||
_script_push_tags
|
||||
@ -191,8 +206,11 @@ args=(
|
||||
CONFIGURATION
|
||||
Le fichier .pman.conf contient la configuration des branches. Les variables
|
||||
supplémentaires suivantes peuvent être définies:
|
||||
BEFORE_CREATE_RELEASE
|
||||
AFTER_CREATE_RELEASE
|
||||
BEFORE_MERGE_RELEASE
|
||||
AFTER_MERGE_RELEASE
|
||||
BEFORE_PUSH_RELEASE
|
||||
AFTER_PUSH_RELEASE"
|
||||
-d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations"
|
||||
-O:,--origin Origin= "++\
|
||||
|
Loading…
Reference in New Issue
Block a user