diff --git a/contrib/bash_completion b/contrib/bash_completion
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -9,7 +9,7 @@ shopt -s extglob
 				 -e '/^ [^ ]/!d; s/^ //; s/[,:]//g;'))
 
     commands="${all[*]##debug*}"
-    result=$(compgen -W "${commands[*]}" -- "$cur")
+    result=$(compgen -W "$commands" -- "$cur")
 
     # hide debug commands from users, but complete them if
     # there is no other possible command
@@ -39,7 +39,7 @@ shopt -s extglob
 
 _hg_status()
 {
-    local files="$( hg status -$1 | cut -b 3- )"
+    local files="$( hg status -$1 . | cut -b 3- )"
     COMPREPLY=(${COMPREPLY[@]:-} $( compgen -W "$files" -- "$cur" ))
 }
 
@@ -167,17 +167,6 @@ shopt -s extglob
 	debugdata)
 	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -X "!*.d" -- "$cur" ))
 	;;
-	cat)
-	    local count=$(_hg_count_non_option '-o|--output')
-	    if [ $count = 2 ]; then
-		_hg_tags
-	    else
-		COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" ))
-	    fi
-	;;
-	*)
-	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" ))
-	;;
     esac
 
 }