modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

autoriser les feature branches qui commencent par wip/

This commit is contained in:
Jephté Clain 2024-01-11 08:57:53 +04:00
parent 5cc1826744
commit 7d7b88a427
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ulib/ptools
View File

@ -18,11 +18,11 @@ function is_any_branch() {
case "$spec" in case "$spec" in
m|master) m|master)
[ -n "$r" ] || r=1 [ -n "$r" ] || r=1
[ "$branch" == "master" ] && return 0 [ "$branch" == master ] && return 0
;; ;;
d|develop) d|develop)
[ -n "$r" ] || r=1 [ -n "$r" ] || r=1
[ "$branch" == "develop" ] && return 0 [ "$branch" == develop ] && return 0
;; ;;
r|release) r|release)
[ -n "$r" ] || r=1 [ -n "$r" ] || r=1
@ -34,20 +34,21 @@ function is_any_branch() {
;; ;;
f|feature|t|topic) f|feature|t|topic)
[ -n "$r" ] || r=1 [ -n "$r" ] || r=1
[ "$branch" == "master" ] && continue [ "$branch" == master ] && continue
[ "$branch" == "develop" ] && continue [ "$branch" == develop ] && continue
[[ "$branch" == release-* ]] && continue [[ "$branch" == release-* ]] && continue
[[ "$branch" == hotfix-* ]] && continue [[ "$branch" == hotfix-* ]] && continue
[ -n "$annex" -a "$branch" == "git-annex" ] && continue [ -n "$annex" -a "$branch" == "git-annex" ] && continue
[[ "$branch" == wip/* ]] && return 0
[[ "$branch" == */* ]] && continue [[ "$branch" == */* ]] && continue
return 0 return 0
;; ;;
-m|-master) -m|-master)
[ -n "$r" ] || r=0 [ -n "$r" ] || r=0
[ "$branch" == "master" ] && return 1;; [ "$branch" == master ] && return 1;;
-d|-develop) -d|-develop)
[ -n "$r" ] || r=0 [ -n "$r" ] || r=0
[ "$branch" == "develop" ] && return 1;; [ "$branch" == develop ] && return 1;;
-r|-release) -r|-release)
[ -n "$r" ] || r=0 [ -n "$r" ] || r=0
[[ "$branch" == release-* ]] && return 1;; [[ "$branch" == release-* ]] && return 1;;
@ -56,11 +57,12 @@ function is_any_branch() {
[[ "$branch" == hotfix-* ]] && return 1;; [[ "$branch" == hotfix-* ]] && return 1;;
-f|-feature|-t|-topic) -f|-feature|-t|-topic)
[ -n "$r" ] || r=0 [ -n "$r" ] || r=0
[ "$branch" == "master" ] && continue [ "$branch" == master ] && continue
[ "$branch" == "develop" ] && continue [ "$branch" == develop ] && continue
[[ "$branch" == release-* ]] && continue [[ "$branch" == release-* ]] && continue
[[ "$branch" == hotfix-* ]] && continue [[ "$branch" == hotfix-* ]] && continue
[ -n "$annex" -a "$branch" == "git-annex" ] && continue [ -n "$annex" -a "$branch" == "git-annex" ] && continue
[[ "$branch" == wip/* ]] && return 1
[[ "$branch" == */* ]] && continue [[ "$branch" == */* ]] && continue
return 1 return 1
;; ;;
@ -89,7 +91,7 @@ function list_feature_branches() {
grep -vF develop | grep -vF develop |
grep -v '^release-' | grep -v '^release-' |
grep -v '^hotfix-' | grep -v '^hotfix-' |
grep -v '/' | grep -Pv '(?<!^wip)/' |
if git_have_annex; then if git_have_annex; then
grep -vF git-annex grep -vF git-annex
else else