aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bashrc24
-rw-r--r--zshrc21
2 files changed, 45 insertions, 0 deletions
diff --git a/bashrc b/bashrc
index ef4e60c..aee1c22 100644
--- a/bashrc
+++ b/bashrc
@@ -37,3 +37,27 @@ case "$TERM" in
;;
esac
+# Completions ##################################################
+
+# Some completion functions
+_gitbmerge() {
+ local cur prev
+ _init_completion || return
+ [ $COMP_CWORD -gt 1 ] && return # Complete only single dependency
+ COMPREPLY=()
+ local GDIR="$(pwd)"
+ while [ ! -d "$GDIR/.git" ]; do
+ [ -z "$GDIR" ] && return
+ GDIR="${GDIR%/*}"
+ done
+ GDIR="$GDIR/.git"
+ [ -f "$GDIR" ] && GDIR="$(cat "$GDIR")" # This just points to some other directory
+ [ -d "$GDIR/refs/heads" ] || return # No completion if there is no local branch
+ local ops=""
+ for B in "$GDIR"/refs/heads/*; do
+ # TODO skip branch on HEAD
+ ops="$ops ${B#$GDIR/refs/heads/}"
+ done
+ COMPREPLY+=($(compgen -W "${ops}" -- ${cur}))
+}
+complete -F _gitbmerge gitbmerge
diff --git a/zshrc b/zshrc
index 150d286..dceef1b 100644
--- a/zshrc
+++ b/zshrc
@@ -90,6 +90,27 @@ lrbell_end() {
add-zsh-hook preexec lrbell_begin
add-zsh-hook precmd lrbell_end
+# Completions ##################################################
+
+_gitbmerge() {
+ (( CURRENT > 2)) && return # Complete only single dependency
+ local GDIR="$(pwd)"
+ while [ ! -d "$GDIR/.git" ]; do
+ [ -z "$GDIR" ] && return
+ GDIR="${GDIR%/*}"
+ done
+ GDIR="$GDIR/.git"
+ [ -f "$GDIR" ] && GDIR="$(cat "$GDIR")" # This just points to some other directory
+ [ -d "$GDIR/refs/heads" ] || return # No completion if there is no local branch
+ local branches=()
+ for B in "$GDIR"/refs/heads/*; do
+ # TODO skip branch on HEAD
+ branches+=("${B#$GDIR/refs/heads/}")
+ done
+ _describe -t branches 'gitbmerge' branches
+}
+compdef _gitbmerge gitbmerge
+
################################################################
case "$TERM" in
xterm*|*rxvt*)