modifs.mineures sans commentaires
This commit is contained in:
parent
71ba18e0f0
commit
7c5fb1829a
@ -36,6 +36,11 @@ NULIB_GIT_FUNCTIONS_MAP=(
|
||||
im:git_is_merged
|
||||
)
|
||||
|
||||
function: git_get_toplevel ""
|
||||
function git_get_toplevel() {
|
||||
git rev-parse --show-toplevel 2>/dev/null
|
||||
}
|
||||
|
||||
function: git_check_gitvcs ""
|
||||
function git_check_gitvcs() {
|
||||
git rev-parse --show-toplevel >&/dev/null
|
||||
@ -43,7 +48,7 @@ function git_check_gitvcs() {
|
||||
|
||||
function: git_ensure_gitvcs ""
|
||||
function git_ensure_gitvcs() {
|
||||
git_check_gitvcs || edie "Ce n'est pas un dépôt git" || return
|
||||
git_check_gitvcs || die "$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git" || return
|
||||
}
|
||||
|
||||
function: git_list_branches ""
|
||||
@ -160,10 +165,14 @@ function git_check_cleancheckout() {
|
||||
[ -z "$(git status --porcelain 2>/dev/null)" ]
|
||||
}
|
||||
|
||||
git_cleancheckout_VERBOSE=1
|
||||
git_cleancheckout_DIRTY="Vous avez des modifications locales. Enregistrez ces modifications avant de continuer"
|
||||
function: git_ensure_cleancheckout ""
|
||||
function git_ensure_cleancheckout() {
|
||||
git_check_cleancheckout ||
|
||||
edie "Vous avez des modifications locales. Enregistrez ces modifications avant de continuer" || return
|
||||
git_check_cleancheckout && return
|
||||
[ -n "$git_cleancheckout_VERBOSE" ] &&
|
||||
git status --porcelain 2>/dev/null
|
||||
die "$git_cleancheckout_DIRTY" || return
|
||||
}
|
||||
|
||||
function git__init_ff() {
|
||||
|
||||
421
wip/_rel
421
wip/_rel
@ -3,6 +3,11 @@
|
||||
source "$(dirname -- "$0")/../load.sh" || exit 1
|
||||
require: git
|
||||
|
||||
git_cleancheckout_DIRTY="\
|
||||
Vous avez des modifications locales.
|
||||
Enregistrez ces modifications avant de créer une release"
|
||||
|
||||
# configuration par défaut
|
||||
UPSTREAM=
|
||||
DEVELOP=develop
|
||||
FEATURE=wip/
|
||||
@ -11,58 +16,414 @@ MAIN=master
|
||||
TAG_SUFFIX=
|
||||
HOTFIX=hotfix-
|
||||
DIST=
|
||||
source "$MYDIR/pman${MYNAME#_rel}.conf"
|
||||
NOAUTO=
|
||||
|
||||
function load_config() {
|
||||
[ -z "$Config" -a -f .pman.conf ] && Config=.pman.conf
|
||||
if [ -n "$Config" ]; then
|
||||
source "$Config"
|
||||
else
|
||||
source "$MYDIR/pman${MYNAME#_rel}.conf"
|
||||
fi
|
||||
|
||||
setx CurrentBranch=git_get_branch
|
||||
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"
|
||||
|
||||
setx -a Branches=git_list_pbranches "$Origin"
|
||||
array_contains Branches "$SrcBranch" || die "$SrcBranch: branche source introuvable"
|
||||
array_contains Branches "$DestBranch" || die "$DestBranch: branche destination introuvable"
|
||||
|
||||
local branch
|
||||
ReleaseBranch=
|
||||
for branch in "${Branches[@]}"; do
|
||||
if [[ "$branch" == "$RELEASE"* ]]; then
|
||||
ReleaseBranch="$branch"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
function init_action() {
|
||||
:
|
||||
}
|
||||
|
||||
function list_action() {
|
||||
:
|
||||
function _filter_rel() {
|
||||
# enlever les commits "techniques" générés par ce script
|
||||
grep -v "Intégration de la branche $RELEASE" |
|
||||
grep -v "Branche $DEVELOP en version .*-SNAPSHOT"
|
||||
}
|
||||
|
||||
function _filter_changes() {
|
||||
# enlever les commits "inutiles" pour générer le fichier CHANGES.md
|
||||
grep -vE '^([+|] )?[0-9a-f]+ modifs\.mineures sans commentaires$' |
|
||||
grep -vE '^([+|] )?[0-9a-f]+ (cosmetic|typo|bug|fix|maj projet|maj deps)\$'
|
||||
}
|
||||
|
||||
function _format_md() {
|
||||
awk '
|
||||
$0 == "" || $0 ~ /^#/ { print; next }
|
||||
$1 == "+" {
|
||||
$1 = "*"
|
||||
$2 = "`" $2 "`"
|
||||
print; next
|
||||
}
|
||||
$1 == "|" {
|
||||
$1 = " *"
|
||||
$2 = "`" $2 "`"
|
||||
print; next
|
||||
}
|
||||
{
|
||||
$1 = "* `" $1 "`"
|
||||
print; next
|
||||
}
|
||||
'
|
||||
}
|
||||
|
||||
function _list_commits() {
|
||||
local source="${1:-$SrcBranch}" dest="${2:-$DestBranch}" mergebase
|
||||
setx mergebase=git merge-base "$dest" "$source"
|
||||
git log --oneline --graph "$mergebase..$source" |
|
||||
grep -vF '|\' | grep -vF '|/' | sed 's/\* //; s/^ /+ /' |
|
||||
_filter_rel
|
||||
}
|
||||
|
||||
function show_action() {
|
||||
local commits
|
||||
setx commits=_list_commits
|
||||
if [ -n "$commits" ]; then
|
||||
einfo "Commits à fusionner $SrcBranch --> $DestBranch"
|
||||
eecho "$commits"
|
||||
fi
|
||||
}
|
||||
|
||||
function merge_action() {
|
||||
die "action non implémentée"
|
||||
}
|
||||
|
||||
function _script_echo() {
|
||||
echo >>"$script"
|
||||
echo "$comment$(qvals echo "$@")" >>"$script"
|
||||
}
|
||||
|
||||
function _script_add() {
|
||||
[ $# -gt 0 ] && _script_echo "$*"
|
||||
cat >>"$script"
|
||||
}
|
||||
|
||||
function _script_start() {
|
||||
>"$script"
|
||||
_script_add <<EOF
|
||||
#!/bin/bash
|
||||
EOF
|
||||
chmod +x "$script"
|
||||
}
|
||||
|
||||
function _init_changelog() {
|
||||
setx date=date +%d/%m/%Y-%H:%M
|
||||
ac_set_tmpfile changelog
|
||||
echo >"$changelog" "\
|
||||
Vérifiez et complétez la liste des changements le cas échéant.
|
||||
Un fichier vide annule la création de la release
|
||||
Ces lignes ne seront pas incluses dans le fichier destination
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
"
|
||||
}
|
||||
|
||||
function release_action() {
|
||||
:
|
||||
local script=".git/rel-release.sh"
|
||||
local release="${RELEASE}$Version"
|
||||
local date changelog
|
||||
local -a push_branches push_tags
|
||||
|
||||
case "$SrcType" in
|
||||
hotfix)
|
||||
enote "\
|
||||
Vous allez intégrer la branche de hotfix ${COULEUR_BLEUE}$SrcBranch${COULEUR_NORMALE}
|
||||
dans la branche destination ${COULEUR_VERTE}$DestBranch${COULEUR_NORMALE}"
|
||||
ask_yesno "Voulez-vous continuer?" O || die
|
||||
|
||||
_init_changelog
|
||||
echo "## Hotfix $Version du $date" >>"$changelog"
|
||||
;;
|
||||
release)
|
||||
enote "\
|
||||
Vous allez intégrer la branche de release ${COULEUR_BLEUE}$SrcBranch${COULEUR_NORMALE}
|
||||
dans la branche destination ${COULEUR_VERTE}$DestBranch${COULEUR_NORMALE}"
|
||||
ask_yesno "Voulez-vous continuer?" O || die
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
function release_upstream_action() {
|
||||
merge_action "$@"
|
||||
}
|
||||
|
||||
function release_feature_action() {
|
||||
merge_action "$@"
|
||||
}
|
||||
|
||||
function _create_release_branch() {
|
||||
local date changelog
|
||||
|
||||
_init_changelog
|
||||
echo >>"$changelog" "\
|
||||
## Release $Version du $date
|
||||
"
|
||||
_list_commits | _filter_changes | _format_md >>"$changelog"
|
||||
"${EDITOR:-nano}" +7 "$changelog"
|
||||
[ -s "$changelog" ] || exit_with ewarn "Création de la release annulée"
|
||||
|
||||
_script_start
|
||||
|
||||
# créer la branche de release et basculer dessus
|
||||
_script_add "* create branch $ReleaseBranch" <<EOF
|
||||
$(qvals git checkout -b "$ReleaseBranch" "$SrcBranch")$or_die
|
||||
EOF
|
||||
|
||||
# créer le changelog
|
||||
_script_add "* update CHANGES.md" <<EOF
|
||||
[ -s CHANGES.md ] && echo >>CHANGES.md
|
||||
$(qvals echo "$(awk <"$changelog" '
|
||||
BEGIN { p = 0 }
|
||||
p == 0 && $0 == "" { p = 1; next }
|
||||
p == 1 { gsub(/\$/, "\\$", $0); print }
|
||||
')") >>CHANGES.md
|
||||
git add CHANGES.md
|
||||
EOF
|
||||
|
||||
# mettre à jour la version
|
||||
_script_add "* update VERSION.txt" <<EOF
|
||||
$(qvals echo "$Version") >VERSION.txt
|
||||
git add VERSION.txt
|
||||
EOF
|
||||
|
||||
# Enregistrer les changements
|
||||
_script_add "* commit" <<EOF
|
||||
$(qvals git commit -m "Init changelog & version $Version")
|
||||
EOF
|
||||
}
|
||||
|
||||
function _set_active() {
|
||||
if [ -n "$1" ]; then
|
||||
comment=; or_die=" || exit 1"
|
||||
else
|
||||
comment="#"; or_die=
|
||||
fi
|
||||
}
|
||||
|
||||
function _merge_release_branch() {
|
||||
local dest="$1" tag="$2"
|
||||
|
||||
# basculer sur la branche
|
||||
_script_add "* switch to branch $dest" <<EOF
|
||||
$comment$(qvals git checkout "$dest")$or_die
|
||||
EOF
|
||||
|
||||
# fusionner la branche de release
|
||||
_script_add "* merge branch $ReleaseBranch" <<EOF
|
||||
$comment$(qvals git merge "$ReleaseBranch" -m "Intégration de la branche $ReleaseBranch" --no-ff)$or_die
|
||||
EOF
|
||||
array_addu push_branches "$dest"
|
||||
|
||||
# tagger la release
|
||||
if [ -n "$tag" ]; then
|
||||
_script_add "* create tag $tag" <<EOF
|
||||
$comment$(qvals git tag --force "$tag")$or_die
|
||||
EOF
|
||||
array_addu push_tags "$tag"
|
||||
fi
|
||||
}
|
||||
|
||||
function _delete_release_branch() {
|
||||
_script_add "* delete branch $ReleaseBranch" <<EOF
|
||||
$comment$(qvals git branch -D "$ReleaseBranch")$or_die
|
||||
EOF
|
||||
}
|
||||
|
||||
function _push_branches() {
|
||||
local origin branch
|
||||
_script_echo "* push branches"
|
||||
for branch in "${push_branches[@]}"; do
|
||||
origin="$Origin"
|
||||
[ -n "$origin" ] || setx origin=git_get_branch_remote "$branch"
|
||||
[ -n "$origin" ] || origin=origin
|
||||
setx rbranch=git_get_branch_rbranch "$branch" "$origin"
|
||||
if [ -n "$rbranch" ]; then
|
||||
rbranch="${rbranch#refs/remotes/$origin/}"
|
||||
_script_add <<EOF
|
||||
$comment$(qvals git push "$origin" "$branch:$rbranch")$or_die
|
||||
EOF
|
||||
else
|
||||
_script_add <<EOF
|
||||
$comment$(qvals git push --set-upstream "$origin" "$branch")$or_die
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
function _push_tags() {
|
||||
local origin tag
|
||||
_script_echo "* push tags"
|
||||
for tag in "${push_tags[@]}"; do
|
||||
origin="$Origin"
|
||||
[ -n "$origin" ] || origin=origin
|
||||
_script_add <<EOF
|
||||
$comment$(qvals git push "$origin" tag "$tag")$or_die
|
||||
EOF
|
||||
done
|
||||
}
|
||||
|
||||
function release_develop_action() {
|
||||
local script=".git/rel-release.sh"
|
||||
local -a push_branches push_tags
|
||||
|
||||
if [ -n "$ReleaseBranch" ]; then
|
||||
release_release_action "$@"; return $?
|
||||
fi
|
||||
|
||||
ReleaseBranch="${RELEASE}$Version"
|
||||
if [ -n "$Merge" ]; then
|
||||
enote "\
|
||||
Ce script va:
|
||||
- créer la branche de release ${COULEUR_VERTE}$ReleaseBranch${COULEUR_NORMALE} <-- ${COULEUR_BLEUE}$SrcBranch${COULEUR_NORMALE}
|
||||
- la provisionner avec une description des changements
|
||||
- la fusionner dans la branche destination ${COULEUR_ROUGE}$DestBranch${COULEUR_NORMALE}${Push:+
|
||||
- pousser les branches modifiées}"
|
||||
else
|
||||
enote "\
|
||||
Ce script va:
|
||||
- créer la branche de release ${COULEUR_VERTE}$ReleaseBranch${COULEUR_NORMALE} <-- ${COULEUR_BLEUE}$SrcBranch${COULEUR_NORMALE}
|
||||
- la provisionner avec une description des changements
|
||||
Vous devrez:
|
||||
- mettre à jour les informations de release puis relancer ce script"
|
||||
fi
|
||||
ask_yesno "Voulez-vous continuer?" O || die
|
||||
|
||||
local comment or_die
|
||||
_set_active 1
|
||||
_create_release_branch
|
||||
_set_active "$Merge"
|
||||
_merge_release_branch "$DestBranch" "$Version"
|
||||
_merge_release_branch "$SrcBranch"
|
||||
_delete_release_branch
|
||||
_set_active "$Push"
|
||||
_push_branches
|
||||
_push_tags
|
||||
|
||||
if ! "$script"; then
|
||||
eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées"
|
||||
else
|
||||
rm "$script"
|
||||
fi
|
||||
}
|
||||
|
||||
function release_release_action() {
|
||||
enote "\
|
||||
Vous allez:
|
||||
- fusionner la branche de release ${COULEUR_VERTE}$ReleaseBranch${COULEUR_NORMALE}
|
||||
dans la branche destination ${COULEUR_ROUGE}$DestBranch${COULEUR_NORMALE}"
|
||||
ask_yesno "Voulez-vous continuer?" O || die
|
||||
}
|
||||
|
||||
function release_hotfix_action() {
|
||||
release_action "$@"
|
||||
}
|
||||
|
||||
function release_main_action() {
|
||||
merge_action "$@"
|
||||
}
|
||||
|
||||
function release_dist_action() {
|
||||
merge_action "$@"
|
||||
}
|
||||
|
||||
chdir=
|
||||
Remote=
|
||||
action=list
|
||||
Config=
|
||||
Origin=
|
||||
Action=release
|
||||
Merge=1
|
||||
Push=1
|
||||
Version=
|
||||
args=(
|
||||
"faire une nouvelle release"
|
||||
" -rv VERSION"
|
||||
"faire une nouvelle release à partir de la branche source"
|
||||
" -gv VERSION [source]"
|
||||
-d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations"
|
||||
-o:,--remote Remote= "++spécifier le remote vers lequel pousser les branches"
|
||||
--init action=init "++initialiser les branches $DEVELOP et $MAIN"
|
||||
--list action=list "lister les modifications qui seraient intégrées dans la release"
|
||||
-g,--release action=release "faire la release"
|
||||
-v:,--version Version= "spécifier la version de la release"
|
||||
-m,--merge Merge=1 "merger la branche de release après l'avoir créée"
|
||||
-c:,--config:CONFIG Config= "++\
|
||||
fichier de configuration des branches.
|
||||
par défaut, utiliser le fichier .pman.conf dans le répertoire du dépôt s'il existe"
|
||||
-o:,--origin Origin= "++\
|
||||
origine à partir de laquelle les branches distantes sont considérées"
|
||||
--init Action=init "++\
|
||||
initialiser les branches $DEVELOP et $MAIN
|
||||
le nom des branches peut différer si un fichier de configuration est fourni"
|
||||
-s,--show Action=show "\
|
||||
lister les modifications qui seraient intégrées dans la release"
|
||||
--release Action=release "créer la release. c'est l'action par défaut"
|
||||
-k,--no-merge Merge= "\
|
||||
ne pas fusionner la branche de release après l'avoir créée. implique --no-push"
|
||||
-m,--merge Merge=1 "++\
|
||||
fusionner la branche de release après l'avoir créée.
|
||||
c'est l'option par défaut"
|
||||
-n,--no-push Push= "\
|
||||
ne pas pousser les branches vers leur origine après la création de la release"
|
||||
-p,--push Push=1 "++\
|
||||
pousser les branches vers leur origine après la création de la release.
|
||||
c'est l'option par défaut"
|
||||
-v:,--version Version= "\
|
||||
spécifier la version de la release à créer"
|
||||
)
|
||||
parse_args "$@"; set -- "${args[@]}"
|
||||
|
||||
# commencer dans le répertoire indiqué
|
||||
if [ -n "$chdir" ]; then
|
||||
cd "$chdir" || die
|
||||
fi
|
||||
|
||||
git_check_gitvcs || die "$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git"
|
||||
setx branch=git_get_branch
|
||||
case "$branch" in
|
||||
"$UPSTREAM") current=upstream;;
|
||||
"$DEVELOP") current=develop;;
|
||||
"$FEATURE"*) current=feature;;
|
||||
"$RELEASE"*) current=release;;
|
||||
"$MAIN") current=main;;
|
||||
"$HOTFIX"*) current=hotfix;;
|
||||
"$DIST") current=dist;;
|
||||
*) ewarn "$branch: branche courante non reconnue";;
|
||||
esac
|
||||
# se mettre à la racine du dépôt git
|
||||
git_ensure_gitvcs
|
||||
setx gitdir=git_get_toplevel
|
||||
cd "$gitdir" || die
|
||||
|
||||
case "$action" in
|
||||
init) init_action "$@";;
|
||||
list) list_action "$@";;
|
||||
# charger la configuration
|
||||
load_config "$1"
|
||||
if [ -n "$Merge" -a -n "$NOAUTO" ]; then
|
||||
ewarn "L'option --no-merge a été forcée puisque ce dépôt ne supporte pas les releases automatiques"
|
||||
Merge=
|
||||
fi
|
||||
[ -z "$Merge" ] && Push=
|
||||
|
||||
# puis faire l'action que l'on nous demande
|
||||
case "$Action" in
|
||||
init)
|
||||
init_action "$@"
|
||||
;;
|
||||
show)
|
||||
git_check_cleancheckout || ewarn "$git_cleancheckout_DIRTY"
|
||||
ensure_branches
|
||||
show_action "$@"
|
||||
;;
|
||||
release)
|
||||
git_ensure_cleancheckout
|
||||
ensure_branches
|
||||
[ -n "$Version" ] || die "Vous devez spécifier la version de la release"
|
||||
release_action "$@"
|
||||
|
||||
# Ici, les variables suivantes sont disponibles: CurrentBranch, Branches,
|
||||
# SrcBranch, SrcType, DestBranch, ReleaseBranch
|
||||
"release_${SrcType}_action" "$@"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -14,3 +14,5 @@ TAG_SUFFIX=
|
||||
HOTFIX=hotfix-
|
||||
# branche de distribution
|
||||
DIST=
|
||||
# désactiver les releases automatiques?
|
||||
NOAUTO=
|
||||
|
||||
@ -8,3 +8,4 @@ MAIN=dist74
|
||||
TAG_SUFFIX=p74
|
||||
HOTFIX=hotf74-
|
||||
DIST=
|
||||
NOAUTO=
|
||||
|
||||
@ -8,3 +8,4 @@ MAIN=dist82
|
||||
TAG_SUFFIX=p82
|
||||
HOTFIX=hotf82-
|
||||
DIST=
|
||||
NOAUTO=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user