From 3f75c1df72d8920fde8b4012af8201268985c33a Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 13 Dec 2017 22:37:05 +0300 Subject: [PATCH] .shellrc: Split cdremote into cdgitpath cdgitpath can now cd into a path in any config key. cdremote performs cd to a path in a remote. --- .shellrc | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/.shellrc b/.shellrc index ff0e127..14eb24d 100644 --- a/.shellrc +++ b/.shellrc @@ -179,6 +179,23 @@ chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; } if test -x /usr/bin/git >/dev/null 2>&1; then + # chdir to a directory + cdgitpath() { + if [ -z "$1" -o -n "$2" ]; then + echo "Usage: cdgitpath path_key" >&2 + return 1 + else + path_key="$1" + fi + + if [ -z "$path_key" ]; then + echo "Usage: cdgitpath path_key" >&2 + return 1 + fi + + cd "`git config --get --path $path_key`" + } + # chdir to a remote's directory (if the remote is on the local FS) cdremote() { if [ -z "$1" ]; then @@ -197,7 +214,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then return 1 fi - cd "`git config --get remote.$remote.url`" + cdgitpath remote.$remote.url } if test -n "$BASH_VERSION"; then @@ -213,6 +230,24 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # push-to-all-remotes - do branch name completion _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; } + _cdgitpath_complete_loader() { + _completion_loader git + complete -F _cdgitpath_complete cdgitpath git-open + unset _cdgitpath_complete_loader + return 124 + } + + _cdgitpath_complete() { + local cword="${COMP_CWORD}" cur="${COMP_WORDS[COMP_CWORD]}"; + COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`) + } + + _git_open() { + _cdgitpath_complete + } + + complete -F _cdgitpath_complete_loader cdgitpath git-open + # list remotes with URLs matching a regexp _list_remotes() { if [ -z "$1" -o -n "$2" ]; then @@ -228,7 +263,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then done } - # completion for cdremote and git-open - list remotes with a pattern + # completion for cdremote and git-open-remote - list remotes with a pattern _list_remotes_completion() { local cur="${COMP_WORDS[COMP_CWORD]}"; _list_remotes "$1" @@ -239,16 +274,22 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # completion for cdremote - list remotes with directories as URLs _cdremote_complete() { _list_remotes_completion '^\(/\|\.\./\)' # (/ or ../ at the beginning) + if [ ${#COMPREPLY[*]} -eq 0 ]; then + _list_remotes_completion . + fi } complete -F _cdremote_complete cdremote - # completion for git-open - list remotes with http(s) URLs - _git_open() { + # completion for git-open-remote - list remotes with http(s) URLs + _git_open_remote() { _list_remotes_completion '^http\(s\)\?://' + if [ ${#COMPREPLY[*]} -eq 0 ]; then + _list_remotes_completion . + fi } - complete -F _git_open git-open + complete -F _git_open_remote git-open-remote fi fi -- 2.39.5