diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2009-08-07 19:03:39 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2009-08-07 19:03:39 +0300 |
| commit | 18e091fb645183dc3c40d3edf0ddbfe63ab99623 (patch) | |
| tree | c93bc55e7f22471e2eace8b1578c9994ad1d8166 /git-prompt.sh | |
| parent | Clear up code for host color. (diff) | |
| download | git-prompt-18e091fb645183dc3c40d3edf0ddbfe63ab99623.tar.gz git-prompt-18e091fb645183dc3c40d3edf0ddbfe63ab99623.tar.bz2 git-prompt-18e091fb645183dc3c40d3edf0ddbfe63ab99623.zip | |
fixed: SVN and HG moduels were broken (+/-1 array index)
Diffstat (limited to 'git-prompt.sh')
| -rwxr-xr-x | git-prompt.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index 9df71e4..9660e96 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -334,9 +334,10 @@ parse_svn_status() { unset status modified added clean init added mixed untracked op detached eval `svn status 2>/dev/null | sed -n ' - s/^A \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}+1]=\"\1\";/p - s/^M \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}+1]=\"\1\";/p - s/^\? \([^.].*\)/untracked=untracked; untracked_files[${#untracked_files[@]}+1]=\"\1\";/p + s/^# modified: '"$file_regex"'/ [[ \" ${added_files[*]} \" =~ \" \1 \" ]] || added_files[${#added_files[@]}]=\"\1\"/p + s/^A \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p + s/^M \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p + s/^\? \([^.].*\)/untracked=untracked; untracked_files[${#untracked_files[@]}]=\"\1\";/p ' ` # TODO branch detection if standard repo layout @@ -356,11 +357,11 @@ parse_hg_status() { eval `hg status 2>/dev/null | sed -n ' - s/^M \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}+1]=\"\1\";/p - s/^A \([^.].*\)/added=added; added_files[${#added_files[@]}+1]=\"\1\";/p + s/^M \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p + s/^A \([^.].*\)/added=added; added_files[${#added_files[@]}]=\"\1\";/p s/^R \([^.].*\)/added=added;/p s/^! \([^.].*\)/modified=modified;/p - s/^? \([^.].*\)/untracked=untracked; untracked_files[${#untracked_files[@]}+1]=\\"\1\\";/p + s/^? \([^.].*\)/untracked=untracked; untracked_files[${#untracked_files[@]}]=\\"\1\\";/p '` branch=`hg branch 2> /dev/null` |