(master) cleaned up the add command. Added tab completion.

Author: cmcculloh

add.sh

@@ -1,30 +1,80 @@
+#!/bin/bash
+## /*
+#	@usage add [file-name]
+#
+#	@description
+#	This script makes staging files for commit much easier. It fully supports
+#	tab completion in a way that the built in git add does not. Also, if you
+#	prefer to use a menu over tab completion, it supports that too.
+#	description@
+#
+#
+#	@examples
+#	1) add
+#	   # Will show a list of files available for staging.
+#	2) add fi[tab]
+#	   # tab completes the rest of the file name
+#	3) add file-path/file.sh
+#	   # deduces if you are doing an add or rm and then does the operation.
+#	examples@
+#
+#	@dependencies
+#	functions/0300.menu.sh
+#	dependencies@
+#
+#	@file add.sh
+## */
 $loadfuncs
 
 
 echo ${X}
 
-#need to clean this list up
-list=($(git status --porcelain | tr " " -))
-msg="Please choose a file to stage. Files preceeded by a '-' are not staged; otherwise they are already staged"
-__menu --prompt="$msg" ${list[@]}
+_file_selection=
+while (( "$#" )); do
+	_file_selection=$1
+
+	shift 1
+done
 
 gitcommand="add"
-#determine if we are adding or deleting
-if [[ "$_menu_sel_value" =~ D ]]
-then
-	gitcommand="rm"
-fi
+list=($(git status --porcelain | tr " " -))
+#clean the list up so already added files aren't options
+list=( ${list[@]/M--*/} )
+list=( ${list[@]/D--*/} )
+list=( ${list[@]/A--*/} )
 
-# clean the flags out of the file name
-shopt -s extglob #http://www.gnu.org/software/bash/manual/html_node/The-Shopt-Builtin.html
-item=${_menu_sel_value/@(M--|-M-|D--|-D-|\?\?-)/}
+#no file specified, show menu
+if [ -z "$_file_selection" ]; then
+	msg="Please choose a file to stage."
+	__menu --prompt="$msg" ${list[@]}
+
+	#determine if we are adding or deleting
+	if [[ "$_menu_sel_value" =~ D ]]
+	then
+		gitcommand="rm"
+	fi
+
+	# clean the flags out of the file name
+	shopt -s extglob #http://www.gnu.org/software/bash/manual/html_node/The-Shopt-Builtin.html
+	_file_selection=${_menu_sel_value/@(M--|-M-|D--|-D-|\?\?-)/}
+else
+	#they passed in the branch, now determine if we need to do an add or a delete
+	for e in "${list[@]}"; do
+		if [[ "$e" =~ "$_file_selection" ]]; then
+			if [[ "$e" =~ D ]]; then
+				gitcommand="rm"
+			fi
+		fi
+	done
+
+fi
 
 echo
 echo
-echo "Staging file ${COL_GREEN}${item}${COL_NORM} for commit."
+echo "Staging file ${COL_GREEN}${_file_selection}${COL_NORM} for commit."
 echo ${O}${H2HL}
-echo "$ git ${gitcommand} ${item}"
-git ${gitcommand} ${item}
+echo "$ git ${gitcommand} ${_file_selection}"
+git ${gitcommand} ${_file_selection}
 echo ${O}${H2HL}${X}
 echo
 echo

cfg/completion.cfg

@@ -15,6 +15,13 @@ _tab_branches() {
 	return 0
 }
 
+_tab_files() {
+	COMPREPLY=()
+	curw=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=($(compgen -W '$(git status --porcelain | tr -d " M " | tr -d "M  " | tr -d " D " | tr -d "D  " | tr -d " A " | tr -d "A  ")' -- $curw))
+	return 0
+}
+
 # tab completion for commands that specify branches
 complete -F _tab_branches checkout
 complete -F _tab_branches contains
@@ -25,3 +32,4 @@ complete -F _tab_branches new
 complete -F _tab_branches pull
 complete -F _tab_branches push
 complete -F _tab_branches trackbranch
+complete -F _tab_files add