feat(custom-commands): add an optional --target-branch flag to cmr command

This commit is contained in:
Oliver
2026-01-04 10:37:16 +01:00
parent 7a61ac5437
commit fd21e245c6
2 changed files with 15 additions and 3 deletions

View File

@@ -26,7 +26,7 @@ _cmr() {
setopt extended_glob setopt extended_glob
local -a opts local -a opts
opts=('--draft') opts=('--draft' '--target-branch')
# Option completion # Option completion
if [[ $words[CURRENT] == -* ]]; then if [[ $words[CURRENT] == -* ]]; then
@@ -34,6 +34,16 @@ _cmr() {
return return
fi fi
# Check if previous word was --target-branch
local prev_word="${words[CURRENT-1]}"
if [[ "$prev_word" == "--target-branch" ]]; then
# Complete with git branches
local -a branches
branches=(${(f)"$(git branch -a 2>/dev/null | sed 's/^[* ]*//' | sed 's/^remotes\/origin\///' | sort -u)"})
_describe 'branches' branches
return
fi
# Cache path # Cache path
: ${CMR_USER_CACHE:="$HOME/.cache/cmr_users"} : ${CMR_USER_CACHE:="$HOME/.cache/cmr_users"}

View File

@@ -59,12 +59,10 @@ function v() {
} }
function dcu() { function dcu() {
od
docker-compose up --build $1 $2 $3 $4 $5 $6 $7 $8 $9 docker-compose up --build $1 $2 $3 $4 $5 $6 $7 $8 $9
} }
function dcud () { function dcud () {
od
docker-compose up -d --build $1 $2 $3 $4 $5 $6 $7 $8 $9 docker-compose up -d --build $1 $2 $3 $4 $5 $6 $7 $8 $9
} }
@@ -194,6 +192,10 @@ function cmr() {
target_branch="master" target_branch="master"
fi fi
if [[ $1 == "--target-branch" ]]; then
target_branch=$2
fi;
glab mr create -a oliver $reviewers --target-branch=$target_branch -t "Merge branch: '$(git branch --show-current)' into $target_branch" --fill -y $draft glab mr create -a oliver $reviewers --target-branch=$target_branch -t "Merge branch: '$(git branch --show-current)' into $target_branch" --fill -y $draft
} }