mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mk/complete-tcsh' into maint

Browse Source 
Command line completion for "tcsh" emitted an unwanted space
after completing a single directory name.

* mk/complete-tcsh:
  Prevent space after directories in tcsh completion
This commit is contained in:
Junio C Hamano
2013-01-28 11:11:51 -08:00
parent 85fd059a89 92f1c04243
commit c1640aa5d3
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
contrib/completion/git-completion.tcsh
View File

@ -13,6 +13,7 @@
# #
# To use this completion script: # To use this completion script:
# #
# 0) You need tcsh 6.16.00 or newer.
# 1) Copy both this file and the bash completion script to ${HOME}. # 1) Copy both this file and the bash completion script to ${HOME}.
# You _must_ use the name ${HOME}/.git-completion.bash for the # You _must_ use the name ${HOME}/.git-completion.bash for the
# bash script. # bash script.
@ -24,6 +25,15 @@
# set autolist=ambiguous # set autolist=ambiguous
# It will tell tcsh to list the possible completion choices. # It will tell tcsh to list the possible completion choices.
set __git_tcsh_completion_version = `\echo ${tcsh} | \sed 's/\./ /g'`
if ( ${__git_tcsh_completion_version[1]} < 6 || \
( ${__git_tcsh_completion_version[1]} == 6 && \
${__git_tcsh_completion_version[2]} < 16 ) ) then
echo "git-completion.tcsh: Your version of tcsh is too old, you need version 6.16.00 or newer. Git completion will not work."
exit
endif
unset __git_tcsh_completion_version
set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash
set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash
@ -64,9 +74,7 @@ fi
_\${1} _\${1}
IFS=\$'\n' IFS=\$'\n'
if [ \${#COMPREPLY[*]} -gt 0 ]; then if [ \${#COMPREPLY[*]} -eq 0 ]; then
echo "\${COMPREPLY[*]}" | sort | uniq
else
# No completions suggested. In this case, we want tcsh to perform # No completions suggested. In this case, we want tcsh to perform
# standard file completion. However, there does not seem to be way # standard file completion. However, there does not seem to be way
# to tell tcsh to do that. To help the user, we try to simulate # to tell tcsh to do that. To help the user, we try to simulate
@ -85,17 +93,18 @@ else
# We don't support ~ expansion: too tricky. # We don't support ~ expansion: too tricky.
if [ "\${TO_COMPLETE:0:1}" != "~" ]; then if [ "\${TO_COMPLETE:0:1}" != "~" ]; then
# Use ls so as to add the '/' at the end of directories. # Use ls so as to add the '/' at the end of directories.
RESULT=(\`ls -dp \${TO_COMPLETE}* 2> /dev/null\`) COMPREPLY=(\`ls -dp \${TO_COMPLETE}* 2> /dev/null\`)
echo \${RESULT[*]} fi
fi
fi
# If there is a single completion and it is a directory, # tcsh does not automatically remove duplicates, so we do it ourselves
# we output it a second time to trick tcsh into not adding a space echo "\${COMPREPLY[*]}" | sort | uniq
# after it.
if [ \${#RESULT[*]} -eq 1 ] && [ "\${RESULT[0]: -1}" == "/" ]; then # If there is a single completion and it is a directory, we output it
echo \${RESULT[*]} # a second time to trick tcsh into not adding a space after it.
fi if [ \${#COMPREPLY[*]} -eq 1 ] && [ "\${COMPREPLY[0]: -1}" == "/" ]; then
fi echo "\${COMPREPLY[*]}"
fi
fi fi
EOF EOF