summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-25 21:10:00 +0300
committerLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-25 21:10:00 +0300
commit97a0d52546b6c206d8cb80ba8e756b5bc9c1f0fc (patch)
treefd75f4d05b9d77f8c4b0adc498377e97e4af1822
parentfix: wrang state. +cleanup (diff)
downloadgit-prompt-97a0d52546b6c206d8cb80ba8e756b5bc9c1f0fc.tar.gz
git-prompt-97a0d52546b6c206d8cb80ba8e756b5bc9c1f0fc.tar.bz2
git-prompt-97a0d52546b6c206d8cb80ba8e756b5bc9c1f0fc.zip
fix: svn state
-rw-r--r--prompt22
1 files changed, 12 insertions, 10 deletions
diff --git a/prompt b/prompt
index 0de07c8..b1cfd7a 100644
--- a/prompt
+++ b/prompt
@@ -136,7 +136,7 @@ set_shell_title() {
*)
;;
esac
-}
+ }
export -f set_shell_title
@@ -144,7 +144,7 @@ set_shell_title() {
id=`id -un`
id=${id#$default_user}
-###################################################### TTY
+########################################################### TTY
tty=`tty`
tty=`echo $tty | sed "s:/dev/pts/:p:; s:/dev/tty::" ` # RH tty devs
tty=`echo $tty | sed "s:/dev/vc/:vc:" ` # gentoo tty devs
@@ -195,7 +195,7 @@ set_shell_title() {
host=${host%.$default_domain}
-########################################################### WHO_WHERE
+#################################################################### WHO_WHERE
# who_ware. Is constant. Looks like
# [user@]host[-tty]
@@ -239,15 +239,18 @@ parse_svn_dir() {
`
### get status
+ unset status modified added clean init added mixed untracked op detached
eval `svn -q status 2>/dev/null |
sed -n "
s/^A /modified=modified; modified_files+=\" \"/p
s/^M /modified=modified; modified_files+=\" \"/p
"
`
+ # TODO untracked files; untracked state; branch detection if standart repo layout
- vcs_info=svn:$rev
-}
+ [[ -z $modified ]] && [[ -z $untracked ]] && clean=clean
+ vcs_info=svn:r$rev
+ }
parse_git_dir() {
@@ -359,7 +362,7 @@ parse_git_dir() {
vcs_info="$branch$white=$rawhex"
fi
-}
+ }
parse_vcs_dir() {
@@ -368,8 +371,7 @@ parse_vcs_dir() {
unset status modified untracked added init detached
unset file_list modified_files untracked_files added_files
- parse_git_dir || parse_svn_dir
- [[ $vcs ]] || return
+ parse_git_dir || parse_svn_dir || return
### status: choose primary (for branch color)
@@ -398,10 +400,10 @@ parse_vcs_dir() {
### fringes (added depended on location)
head_local="${head_local+$vcs_color $head_local\n}"
tail_local="${tail_local+$vcs_color $tail_local}${dir_color}"
-}
+ }
-############################################################### PROMPT_COMMAND
+###################################################################### PROMPT_COMMAND
prompt_command_function() {
rc="$?"