Revert 9cd652d..8f9dc33

This rolls back to commit 9cd652d.

Author: Artoria2e5

README.md

@@ -13,8 +13,8 @@ bashrc\_repo
 ---
 Provides repo branch/status PS1 function.
 
-By default, it reads bashrc\_foo to load the repo status function for
-foo version control system.
+By default, it reads bashrc\_foo to load the repo status function for foo version
+control system.
 
 ###bashrc\_git
 Provides git branch and status info in the PS1.
@@ -32,8 +32,8 @@ The master branch of this repo can be easily ported to other platforms with bash
 
 If you use BSD coreutils, just change `ls --color=auto` to `ls -G`.<br />
 If you use OS X or wants to make an OS X distribution, you had better
-include the workaround mentioned [Here](https://github.com/AOSC-Dev/BASH_PS1_MISC/issues/3),
-the issue #3, in order to avoid "Please install XCode
-Developer Tools" from appearing too many times.
+include the workaround mentioned [Here](https://github.com/AOSC-Dev/BASH_PS
+1_MISC/issues/3), the issue #3, in order to avoid "Please install XCode
+ Developer Tools" from appearing too many times.
 
 This package provides an example: [Bash 4.3 for OS X](http://pan.baidu.com/s/1c0xlkFu)

bashrc

@@ -56,16 +56,16 @@ _ret_prompt() {
 }
 
 _ret_same() { return $?; }
-. /etc/bashrc_repo &>/dev/null || alias _git_branch='_ret_same' # Fallback
+. /etc/bashrc_repo &>/dev/null || alias _repo_status='_ret_same' # Fallback
 # To be shipped together. See comments in bashrc_repo on _ret and _ret_status().
 
 # Use "\w" if you want the script to display full path
 # How about using cut to "\w($PWD)" to give path of a certain depth?
   # Well, forget it.
 if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u $NORMAL[ \W\$(_git_branch) ]$RED \$(_ret_prompt) $NORMAL"
+  PS1="$RED\u $NORMAL[ \W\$(_repo_status) ]$RED \$(_ret_prompt) $NORMAL"
 else
-  PS1="$GREEN\u $NORMAL[ \W\$(_git_branch) ]$GREEN \$(_ret_prompt) $NORMAL"
+  PS1="$GREEN\u $NORMAL[ \W\$(_repo_status) ]$GREEN \$(_ret_prompt) $NORMAL"
 fi
 
 # Extra Aliases for those lazy ones :)

bashrc_git

@@ -34,16 +34,15 @@ 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() {
-  _ret=$?
   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
-  return $_ret
 }
 
 

bashrc_hg

@@ -0,0 +1,29 @@
+# bashrc extra functions written for AOSC OSes, package "hg"
+# by Arthur Wang
+
+[ "$TERMCOLOR"=="8" ] && IRED="\e[0;31m" || IRED="\e[0;91m"
+
+# Aliases from https://gist.github.com/shukydvir/1112265
+alias hl='hg pull'
+alias hp='hg push'
+alias hd='hg diff'
+alias hc='hg commit'
+alias hco='hg checkout'
+alias hb='hg branch'
+alias hs='hg status'
+alias ha='hg add .'
+
+# From http://mediadoneright.com/content/ultimate-hg-ps1-bash-prompt
+# Modified for hg.
+_hg_branch() {
+  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"
+      else printf "\e[1m@$IRED$(hg branch)\e[0m"
+    fi
+    else false
+  fi
+}
+
+# A shorter one without color
+# alias _hg_branch="echo \" \$(hg branch 2>/dev/null)\""

bashrc_repo

@@ -0,0 +1,19 @@
+# bashrc_repo, the version control display for AOSC OSes PS1.
+# by Arthur Wang
+
+# This module is highly extensible. Just read the source.
+# Long-term TODO: svn, vns and bzr.
+
+# Get functions
+. /etc/bashrc_git &>/dev/null
+. /etc/bashrc_hg &>/dev/null
+
+# Output
+_repo_status() {
+  _ret=$?
+  _git_branch 2>/dev/null || _hg_branch 2>/dev/null
+  retuen $_ret
+}
+
+# If this file is simply copied into bashrc, then we don't need `return $_ret`.
+# Simply delete the `_ret=$?` in _ret_prompt().