vcs: fixed conflict with git-completion

Author: Artoria2e5

autobuild/build

@@ -8,7 +8,7 @@ rm autobuild/conffiles
 # HACK: generate conffiles
 cd abdist
 IFS=$'\n'
-for i in $(find .); do
+for i in $(find . -type f); do
     echo "${i/.\/}" >> autobuild/conffiles
 done
 IFS=$' \t\n'

bashrc.d/.vcs_git

@@ -30,18 +30,17 @@ alias __git_branch="git branch 2>/dev/null | grep '*' | sed 's/*\ //g'"
 
 # From http://mediadoneright.com/content/ultimate-git-ps1-bash-prompt
 # Modified.
-_git_branch() {
-  if git branch &>/dev/null
-  then if LANG=C git status | grep "nothing to commit" &>/dev/null
-      then printf "\e[1m@\e[0;32m$(__git_branch)\e[0m"
-      elif LANG=C git status | grep "nothing added to commit" &>/dev/null # Untracked
-        then printf "\e[1m@\e[0;35m$(__git_branch)\e[0m"
-      else printf "\e[1m@$IRED$(__git_branch)\e[0m" # Change not added/not merged yet
-    fi
-    else false # Necessary, read bashrc_repo.
-  fi
+_git_status() {
+	git branch &>/dev/null || return 1
+	if LANG=C git status | grep -q "nothing to commit"; then 
+		 printf "\e[1m@\e[0;32m$(__git_branch)\e[0m"
+	elif LANG=C git status | grep -q "nothing added to commit"; then # Untracked
+		 printf "\e[1m@\e[0;35m$(__git_branch)\e[0m"
+	else  # Change not added/not merged yet
+		 printf "\e[1m@$IRED$(__git_branch)\e[0m"
+	fi
 }
 
 
 # A shorter one without color
-# alias _git_branch="echo \" \$(__git_branch)\""
+# alias _git_status='_st="$(__git_branch)"; ((!PIPESTATUS[0])) && echo "@$_st"'

bashrc.d/.vcs_hg

@@ -15,7 +15,7 @@ alias ha='hg add .'
 
 # From http://mediadoneright.com/content/ultimate-hg-ps1-bash-prompt
 # Modified for hg.
-_hg_branch() {
+_hg_status() {
   if hg branch &>/dev/null 
     then if LANG=C hg status | grep " " &>/dev/null
       then printf "\e[1m@\e[0;32m$(hg branch)\e[0m"
@@ -26,4 +26,4 @@ _hg_branch() {
 }
 
 # A shorter one without color
-# alias _hg_branch="echo \" \$(hg branch 2>/dev/null)\""
+# alias _hg_status='_st="$(hg branch)" && echo "@$st"'

bashrc.d/20-vcs

@@ -26,7 +26,7 @@ _vcs_status() {
 	_ret=$?
 	local _vcs
 	for _vcs in $_vcs_mods; do
-		_"$_vcs"_branch && break
+		_"$_vcs"_status && break
 	done
 	return $_ret
 }