Commit Graph

230 Commits (0b56d123ec3c88ee81178134c14c327cb8f86db1)

Author SHA1 Message Date
🐈 d1fbc1b889
Hide errors from git ls-files 6 years ago
Dominik Ritter 6ccdfdf37e
Merge pull request #981 from pgierz/os_release_fix
[Bugfix] Fix for #974
6 years ago
Dominik Ritter 938b0d49a1 Avoid externals when parsing the os release on linux 6 years ago
Matthew Judy 574ee6dc1c Port #1071 to `master` (fatal errors emitted by untracked file check in vcs.zsh) 6 years ago
Dominik Ritter 724781e896
Merge pull request #1065 from dritter/protect_locale
Protect locale
6 years ago
Dominik Ritter fd660f4b92 Fix checking for untracked files
Now the untracked files are always checked from
the root folder of the repo.
6 years ago
Dominik Ritter a6e60def4b Fix stashes display
Changing directories while checking for untracked files broke
the display of git stashes. The hook was not called any more.
This is why we disabled checking for untracked files within a
.git folder.
6 years ago
Dominik Ritter 645b974677 Fix error if user cds into a .git directory
In this case is was previously not possible to get the untracked
status. Now we temporarily change the directory to the repo root
folder and then get the list of untracked files.
6 years ago
Dominik Ritter a90258a9ee Avoid warning when inside of .git dir
We cannot detect untracked files when we are inside of
a .git directory.
6 years ago
Dominik Ritter 3256258ebf Count stashes via ZSH 6 years ago
Dominik Ritter 2038e2650c Avoid aliases 6 years ago
Dominik Ritter 48f0cc11ef Get rid of externals when truncating branch name 6 years ago
Dominik Ritter 3d960a5169 Protect users locale 6 years ago
Dominik Ritter c3f9d04354 When checking for untracked or modified files, take submodules into account 6 years ago
Dominik Ritter 44b4b66925 Speedup VCS segment
Now the untracked files are detected via `git ls-files`, which is
much faster than `git status`. Additionally, we flipped the default
for checking submodules. They are now NOT checked by default, as most
users probably do not use git submodules.
6 years ago
Dominik Ritter d07507c1eb Make use of git dir determined by VCS_INFO subsystem
instead of determine the git dir manually.
6 years ago
Dominik Ritter 9a67ca5bc3 Get branch name from VCS_INFO subsystem when collecting remote branch 6 years ago
Dominik Ritter fea5f616d1 Get branch name from VCS_INFO subsystem when collecting ahead/behind info 6 years ago
Dominik Ritter cd0ad84b01 Get rid of wc dependency when showing ahead/behind info 6 years ago
Paul Gierz 735994f82e Fix for #974 6 years ago
Dominik Ritter 8e966e3636 Change bright colors to old color codes
Before this, there was no difference in that colors, as we always used
the bright color codes.
6 years ago
Dominik Ritter 6e78f7e793 Merge remote-tracking branch 'eloo/master' into prepare_066 6 years ago
Joseph Weigl 34bf8edc89
Add fallback icon for linux distros 6 years ago
Dominik Ritter c7e543ff23 Merge branch 'fix_colors' into prepare_066 6 years ago
Dominik Ritter 424d41761d Write comparison with double quotes 6 years ago
Dominik Ritter 39fe5217c6 Pad colors with zeroes 6 years ago
Dominik Ritter 19235b2359 Always use color codes instead of named colors
This Code was to check if the color is supported by the Terminal
Emulator. This is not necessary, if we always use the numerical code.
This makes the code much clearer.
6 years ago
Dominik Ritter beacb0ad35 Fix bright colors
Remove old code that set bright colors equal to normal colors. This code
was ancient and led to bright colors being unusable. The code originates
from 0e37d8ef86.
6 years ago
Dominik Ritter 0acede2fdc Make colors a global array
That way it must not be defined in every function call.
6 years ago
Dominik Ritter eadbd09368 Write comparisons with double equals 6 years ago
Dominik Ritter 9cf76f99a5 Fix bright colors
Remove old code that set bright colors equal to normal colors. This code
was ancient and led to bright colors being unusable. The code originates
from 0e37d8ef86.
6 years ago
Dominik Ritter ebbdb3c1c0 Make purpose clear of backgroundColor and foregroundColor functions
The functions just start the colors, they do not end them. It seems
too much to have a function that terminates a color.
6 years ago
Dominik Ritter e35f7a0c48 Merge branch 'fix_colors' into prepare_066 6 years ago
Dominik Ritter 345cf87b8f Add missing colors to fix color comparison
Added magenta and cyan that were only present with their alternative
names (fuchsia and aqua). See https://en.wikipedia.org/wiki/X11_color_names#Clashes_between_web_and_X11_colors_in_the_CSS_color_scheme
6 years ago
Ythildir 5ce384fb31 Test more readable 6 years ago
Ythildir e39e024e74 Resolve #918 Transparent background
Now function getColorCode consider value 'none' like a good value.
When it's use to set background the segment become transparent
6 years ago
Ben Klein 45b0d68ec4
Replace `typeset` check with shellvar flag
More performance without changing functionality.
6 years ago
blackb1rd 592e765a95 Fix os detection for MSYS2 6 years ago
Dominik Ritter 595bdb4fa3 Use cog glyph on all modes 6 years ago
Dominik Ritter a2d8cccd09 Add a Laravel version segment 6 years ago
Dominik Ritter 5eedb2586b Merge remote-tracking branch 'Maxattax97/next' into staging_065 6 years ago
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 6 years ago
Dominik Ritter e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
6 years ago
Dominik Ritter 4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
6 years ago
Dominik Ritter 154e923033 Merge remote-tracking branch 'floor114/next' into staging_065 6 years ago
Dominik Ritter 45ae153700 Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into staging_065
Conflicts were:
- functions/vcs.zsh: Two commits avoided wrapper behaviour. #685
in grep, #797 in git.
6 years ago
Max O'Cull fcea56be5c Fix Linux distribution detection 6 years ago
Tim Otlik 557f5993ea
add cog symbol to dir segment if folder is /etc* 6 years ago
Ben Hilburn 7234d52ebd
Merge pull request #791 from dritter/local_variables
Make variables local
7 years ago
Taras Shpachenko 111d152d48 Add vcs branch name truncating. 7 years ago