summaryrefslogtreecommitdiff
path: root/contrib/p4
diff options
context:
space:
mode:
authorDavid Paleino <dapal@debian.org>2010-06-16 18:20:29 +0200
committerDavid Paleino <dapal@debian.org>2010-06-16 18:20:29 +0200
commitf9748115fb4b2950fb4df7535fb723c4affde078 (patch)
tree20875f42b219a5d56e8a7e98840f6dbced003ae0 /contrib/p4
parente5a9b6220e93ca656fd9774c6aefa78241edca6f (diff)
downloadbash-completion-f9748115fb4b2950fb4df7535fb723c4affde078.tar.gz
Imported Upstream version 1.2upstream/1.2
Diffstat (limited to 'contrib/p4')
-rw-r--r--contrib/p414
1 files changed, 6 insertions, 8 deletions
diff --git a/contrib/p4 b/contrib/p4
index 4e7fc3d3..0795a28e 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -3,11 +3,10 @@
have p4 &&
_p4()
{
- local cur prev prev2 p4commands p4filetypes
+ local cur prev preprev p4commands p4filetypes
COMPREPLY=()
- cur=`_get_cword`
- prev=${COMP_WORDS[COMP_CWORD-1]}
+ _get_comp_words_by_ref cur prev preprev
# rename isn't really a command
p4commands="$( p4 help commands | awk 'NF>3 {print $1}' )"
@@ -18,7 +17,7 @@ _p4()
if [ $COMP_CWORD -eq 1 ]; then
COMPREPLY=( $( compgen -W "$p4commands" -- "$cur" ) )
elif [ $COMP_CWORD -eq 2 ]; then
- case "$prev" in
+ case $prev in
help)
COMPREPLY=( $( compgen -W "simple commands \
environment filetypes jobview revisions \
@@ -31,10 +30,9 @@ _p4()
;;
esac
elif [ $COMP_CWORD -gt 2 ]; then
- prev2=${COMP_WORDS[COMP_CWORD-2]}
- case "$prev" in
+ case $prev in
-t)
- case "$prev2" in
+ case $preprev in
add|edit|reopen)
COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
;;
@@ -49,7 +47,7 @@ _p4()
return 0
} &&
-complete -F _p4 $default p4 g4
+complete -F _p4 -o default p4 g4
# Local variables:
# mode: shell-script