diff options
| author | Atem18 <messer.kevin@gmail.com> | 2013-12-01 23:45:55 +0100 |
|---|---|---|
| committer | Atem18 <messer.kevin@gmail.com> | 2013-12-01 23:45:55 +0100 |
| commit | 06bd72f842480d9556a1cc28cc340f1be7e7c79b (patch) | |
| tree | baeb90abad8afab94f0535fe8f949b1d8df591be /themes/agnoster.zsh-theme | |
| parent | 84e178fa3d5e6e5bc36cb353c5c051d4f12ec35d (diff) | |
| parent | 5643fac8870c2df284f1ccceab35fb1fe343fa3f (diff) | |
| download | zsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.tar.gz zsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.tar.bz2 zsh-06bd72f842480d9556a1cc28cc340f1be7e7c79b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'themes/agnoster.zsh-theme')
| -rw-r--r-- | themes/agnoster.zsh-theme | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index 762f63c5b..01cdc80e5 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -95,38 +95,38 @@ prompt_git() { } prompt_hg() { - local rev status - if $(hg id >/dev/null 2>&1); then - if $(hg prompt >/dev/null 2>&1); then - if [[ $(hg prompt "{status|unknown}") = "?" ]]; then - # if files are not added - prompt_segment red white - st='±' - elif [[ -n $(hg prompt "{status|modified}") ]]; then - # if any modification - prompt_segment yellow black - st='±' - else - # if working copy is clean - prompt_segment green black - fi - echo -n $(hg prompt "☿ {rev}@{branch}") $st - else - st="" - rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') - branch=$(hg id -b 2>/dev/null) - if `hg st | grep -Eq "^\?"`; then - prompt_segment red black - st='±' - elif `hg st | grep -Eq "^(M|A)"`; then - prompt_segment yellow black - st='±' - else - prompt_segment green black - fi - echo -n "☿ $rev@$branch" $st - fi - fi + local rev status + if $(hg id >/dev/null 2>&1); then + if $(hg prompt >/dev/null 2>&1); then + if [[ $(hg prompt "{status|unknown}") = "?" ]]; then + # if files are not added + prompt_segment red white + st='±' + elif [[ -n $(hg prompt "{status|modified}") ]]; then + # if any modification + prompt_segment yellow black + st='±' + else + # if working copy is clean + prompt_segment green black + fi + echo -n $(hg prompt "☿ {rev}@{branch}") $st + else + st="" + rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') + branch=$(hg id -b 2>/dev/null) + if `hg st | grep -Eq "^\?"`; then + prompt_segment red black + st='±' + elif `hg st | grep -Eq "^(M|A)"`; then + prompt_segment yellow black + st='±' + else + prompt_segment green black + fi + echo -n "☿ $rev@$branch" $st + fi + fi } # Dir: current working directory |