diff options
| author | Karel Kočí <cynerd@email.cz> | 2017-10-05 23:37:03 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2017-10-05 23:38:36 +0200 |
| commit | e79776c14c86e37f89087504f765638f2c20eb96 (patch) | |
| tree | 3f8ff371c7ecf8b3f3a0eb509ce269c180476b77 /zshrc | |
| parent | 3bf384e3ee04e3a82cfb65a73b11cce9f0320519 (diff) | |
| parent | 2fc8d93ef509f583f6977588c7b3fb2cf8ebd332 (diff) | |
| download | myconfigs-e79776c14c86e37f89087504f765638f2c20eb96.tar.gz myconfigs-e79776c14c86e37f89087504f765638f2c20eb96.tar.bz2 myconfigs-e79776c14c86e37f89087504f765638f2c20eb96.zip | |
Merge branch 'master' into server
Diffstat (limited to 'zshrc')
| -rw-r--r-- | zshrc | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -10,6 +10,7 @@ zstyle ':completion:*' cache-path ~/.cache/zsh zstyle :compinstall filename '/home/kkoci/.zshrc' zstyle -e ':completion:*:default' list-colors 'reply=("${PREFIX:+=(#bi)($PREFIX:t)(?)*==32=33}:${(s.:.)LS_COLORS}")' zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} +fpath=(~/.zsh_completions $fpath) autoload -Uz compinit && compinit autoload -Uz colors && colors @@ -65,9 +66,9 @@ lrbell_active_window_id() { lrbell_begin() { lrbell_timestamp=$EPOCHSECONDS - lrbell_message="`pwd`: $1" if [ -n "$DISPLAY" ]; then - lrbell_window_id=$(lrbell_active_window_id) + lrbell_message="`pwd`: $1" + lrbell_window_id="$(lrbell_active_window_id)" fi } lrbell_end() { @@ -85,6 +86,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*) |