1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 08:50:08 +00:00
Commit graph

548 commits

Author SHA1 Message Date
Robby Russell
36884cca36 Merge pull request #4189 from bmdhacks/master
agnoster: speed up git prompt
2015-09-19 09:05:41 -07:00
Robby Russell
3b5300c2b3 Merge pull request #4252 from Fice-T/master
Fix graphical bug in cypher theme when return status is non-zero
2015-09-19 09:02:55 -07:00
Robby Russell
576453cdb5 Merge pull request #4173 from sharkySharks/master
Devanagari Om fixed in dogenpunk theme
2015-09-19 09:00:20 -07:00
Robby Russell
bb5bc64e2a Merge pull request #4155 from honnix/fix_color
[theme] Fix color problem of steeef theme
2015-09-19 08:59:49 -07:00
Robby Russell
adaf89caa8 Merge pull request #4113 from apjanke/gnzh-remove-eval
gnzh theme: fix "eval" and related scope problems.
2015-09-19 08:53:14 -07:00
Robby Russell
1324e6126c Merge pull request #4050 from mbologna/michelebologna_fix_git_prompt
Change to use omz git_prompt* functions
2015-09-19 08:51:37 -07:00
Andrew Janke
d009f24ac3 gnzh theme: fix "eval" and related problems.
Switch to normal zsh %F/%f prompt escapes to avoid "eval" and extra variables.
Wrap whole thing in anonymous function so the existing `local`
statements actually work. Then switch '...' to eager "..." so
stuff actually works with local variables. And local-ize the
remaining variables that are used only in prompt construction.
2015-09-04 10:34:41 -04:00
Fice-T
c66c3aef81 Fix graphical bug in cypher theme when return status is non-zero
- When the previous command's return status is non-zero and the prompt
  is redrawn, graphical errors sometimes arise due to the fg{red} not
  being escaped.
2015-08-16 22:53:07 -06:00
Brian Degenhardt
b875df8970 agnoster: speed up git prompt
Problem

On detached-refs, the git prompt is very slow because it uses a command
to output all refs, which takes 32s on the twitter internal git repo.

Solution

Use git-rev-parse instead of git-show-ref to only output the head ref.
Runtime drops to 0.03 seconds.

Note

Interestingly, git-rev-parse isn't slow without the --head arguement so
I'll probably be cooking up a patch for the git team to speed this up
eventually, but it's still pointless to sigpipe git as it walks the
filesystem.
2015-07-27 14:19:23 -07:00
Sharky
cacc6c34b7 replaced Om spelling so letters would not overlap 2015-07-19 12:33:37 -05:00
Sharky
5a1dd14f13 removed incorrect Devanagari conjunct symbol at end of Om 2015-07-19 11:50:43 -05:00
Alex Talker
a3f0439de3 Fix little typo that makes the statement useless. 2015-07-19 13:56:10 +03:00
Hongxin Liang
46d13384db [theme] Fix color problem of steeef theme
steeef theme sets colors depending on $TERM, however if %F is
used, it must be closed by %f instead of %{$reset_color%}.

Further on, all %f directives have been replaced by %F and color
support of current TERM is checked more properly.
2015-07-13 18:43:00 +02:00
Michele Bologna
68b792bbb6 Change to use omz git_prompt* functions
Removed references for official git __git_ps1() functions.
Change to use omz function git_prompt* functions like:
- git_prompt_info() -> branch name
- git_prompt_status() -> check if untracked, modified, added,
  stashed file are in the current git repo
- git_remote_status() -> check if current repo is ahead, behind,
  or diverged.
These functions returns string automatically added to your PS1;
these are customizable via exporting ZSH_THEME_GIT_PROMPT*
2015-06-16 10:56:19 +02:00
Robby Russell
5fba46a8c4 Merge pull request #3821 from tresni/fix_minimal
Fix minimal.zsh-theme's check for in_svn and add support for mercurial
2015-06-14 22:16:21 -07:00
Robby Russell
3d2bf227ea Merge pull request #4001 from ivanfoo/fixOddCharsOnMac
Fixed odd chars on mac for agnoster theme
2015-06-14 22:01:07 -07:00
ivanfoo
c6460ef3e7 Fixed odd chars on mac for agnoster theme 2015-06-15 00:25:22 +02:00
Michele Bologna
81eec406c8 * Added header with help and information
* Moved git information to left prompt, with
  support for:
    * +ZSH_THEME_GIT_PROMPT_UNTRACKED, MODIFIED,
    STASHED, ADDED, UPSTREAM STATUS
    (if applicable)
* Removed right prompt
* Refactored following Google's guidelines for
  scripts [ http://goo.gl/oJSXH2 ]
    * Using local variables where applicable
2015-06-11 21:13:48 +02:00
leif.hanack
70c4a27fd6 Added a possibility to display the remote branch and the number of commits you are ahead or behind 2015-06-10 14:36:54 +02:00
Samuel Parkinson
de56943a0e Improved the _git_time_since_commit function.
Check for at least one commit using a `git log` limit of one.

Improves the performance inside git repos with a large history.
2015-06-10 14:36:53 +02:00
Andrew Janke
3cc3084f5f Fix typo in $VCS_CLEAN_COLOR in adben theme 2015-06-10 14:36:53 +02:00
Mark Mendoza
a98501d2ce Grep bug in Agnoster 2015-06-10 14:36:52 +02:00
Robby Russell
4224c2a1af Merge pull request #3494 from AlexTalker/short-host
Fix echo nothing if $SHORT_HOST doesn't exist.
2015-06-05 08:07:12 -07:00
Robby Russell
51e366e546 Merge pull request #3339 from Xophmeister/master
Minor cosmetic fix to minimal theme
2015-06-05 08:06:32 -07:00
Brian Hartvigsen
5c9c373cd7 Fix minimal.zsh-theme's check for in_svn and add support for mercurial 2015-04-28 00:05:11 -07:00
Robby Russell
aa9325a0b3 Merge pull request #3025 from DanielOaks/ys-newness
Let 'ys' theme use hg repo info too
2015-02-22 10:30:20 -08:00
Robby Russell
b91ca24df4 Merge pull request #3394 from zghember/master
Update theme "jispwoso" to support ret status and git
2015-02-22 10:28:42 -08:00
Robby Russell
d80f620e63 Merge pull request #3561 from jakobj/master
removed superfluous vcs_info_msg in trapd00r theme
2015-02-22 10:10:17 -08:00
Robby Russell
377b1f9089 Merge pull request #3580 from LukasDoe/master
Modify theme to optimize the usability, when you use solarized dark as s...
2015-02-22 10:08:34 -08:00
Roderick Randolph
46e6e2e23a Fixes incorrect prompt arrow color
Fixes a bug where color of status arrow in prompt is red even when the exit code was zero (or success). This fix correclty returns green arrow on success and red for non-success exit code.
2015-02-16 12:22:18 -05:00
Alex Talker
8cf04ed3d7 Fix echo nothing if $SHORT_HOST doesn't exist. 2015-02-15 20:44:35 +03:00
Matthias Doering
7c00bcdb82 Modify theme to optimize the usability, when you use solarized dark as shell color scheme. 2015-02-14 10:34:22 -08:00
Robby Russell
aab7532747 Merge pull request #3566 from mcornella/pfault-master
Repost #2606: fix git status in rkj-repos theme
2015-02-10 11:21:45 -08:00
Robby Russell
17216bee9c Merge pull request #3143 from roramirez/theme-linux
remove path not found for linuxonly theme
2015-02-10 11:21:12 -08:00
Martin Schrodi
f04246aa48 rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella) 2015-02-10 19:35:00 +01:00
Martin Schrodi
c3940cf44a Fixed breakage in new git repo without commits 2015-02-10 19:35:00 +01:00
Marc Cornellà
2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
Jakob Jordan
6bccb1a7b0 removed superfluous vcs_info_msg in trapd00r theme
in the trapd00r theme vcs info is already displayed on the first line if in a version controlled directory. the second vcs info was displayed at the end of the second line without providing additional information. this was removed.
2015-02-09 18:18:15 +01:00
zghember
8105d4acc9 Merge commit '175b4a807383530aa75145b5b6fdedb3ce1f11f2' 2015-01-03 14:41:34 +08:00
David Feinberg
02d647773a added node- before node version for consistency 2014-12-14 18:28:06 -08:00
David Feinberg
77da20997e mira theme shows active node, ruby and java versions 2014-12-14 18:19:00 -08:00
Robby Russell
07c013c671 Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz
add current bookmark to rkj-repos theme
2014-12-14 16:34:49 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
2014-12-14 16:32:11 -08:00
zghember
6fd0b73e9a Merge commit '141c2e593401f245a9f9bb0799ada8bf14b677d7' 2014-12-15 00:23:34 +08:00
zghember
6f70d288cc Update theme "jispwoso" to support ret status and git 2014-12-11 19:47:29 +08:00
Anatoly Bubenkov
9bab8ccb89 add current bookmark to rkj-repos theme 2014-12-10 13:40:34 +01:00
Robby Russell
60a41a866a Merge pull request #3283 from jaapz/master
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
2014-11-27 20:01:28 -08:00
Christopher Harrison
663d43241c Minor cosmetic fix to minimal theme
Set the closing square-brace's FG colour to white, to match the opening brace, when the repo directory is dirty.
2014-11-24 09:56:47 +00:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Jarin Udom
d0f3fb3a4f Merge simplified superjarin theme 2014-11-10 18:42:31 -08:00