1
0
Fork 0
mirror of synced 2024-09-19 12:02:53 -04:00
Commit graph

72 commits

Author SHA1 Message Date
Eric Nielsen
d0f1bc274f [prompt] Don't expand git_info in eriner theme
to avoid the git-info vulnerability to execute an arbitrary command, as
reported in #158.

Fixes #158 (for eriner theme)
2017-04-17 16:40:34 -05:00
Eric Nielsen
d771fd88fb [prompt] Range segment in eriner as in magicmace
This reverts commit eee6e911d2.

As suggested in
https://github.com/Eriner/zim/pull/142#issuecomment-283806756 (and
"thumb-upped" by Tmplt). The Ranger segment was introduced in eriner
theme by Tmplt in https://github.com/Eriner/zim/pull/64. He also added
it to the magicmace theme.
2017-04-17 16:31:07 -05:00
Eric Nielsen
f3e673a52b Rewrite steeef theme using git-info
This uses the verbose mode to be able to display indexed, unindexed and
untracked files indicators. This is the last theme left to be migrated
to git-info, and the first one to use its verbose mode.

Originally, the theme also supported svn via vcs_info. The svn support
is lost in this rewrite. Maybe if a new svn-info module is introduced to
Zim...

Closes #157
2017-03-29 19:40:07 -07:00
Eric Nielsen
ae771c878f Rewrite minimal theme using git-info
As previous migrations of themes to git-info, this does not use its
verbose mode, so a repo with just untracked files is not considered
dirty.

It uses the newly-introduced `diverged` context and `coalesce` function
from git-info.

Closes #152
2017-03-27 13:56:47 -07:00
Eric Nielsen
76cf486d5d Only evaluate prompt_gitster_status once
replacing its contents directly into the `PROMPT`, instead of calling
the function continuously.

Closes #150
2017-03-27 13:56:47 -07:00
Eric Nielsen
4b95df9a5f Fix magicmace errors when git-info not enabled
and add a comment stating that the theme requires the `git-info` module.
Also make better usage of the arithmetic command `(( ))`.

Closes #146
2017-03-08 06:20:19 -08:00
Eric Nielsen
176d2ab4d3 Fix gitster theme errors when git-info not enabled
and add a comment stating that the theme requires the `git-info` module.

Closes #145, fixes #144
2017-03-08 06:20:02 -08:00
Eric Nielsen
597d611d7b Fix eriner theme errors when git-info not enabled
as it was incorrectly testing for the `${+functions[git-info]}`.

Closes #142
2017-03-08 06:19:56 -08:00
Eric Nielsen
eee6e911d2 Add Ranger segment to eriner theme
instead of having the Ranger indicator at the status segment, likewise
the magicmace theme.
2017-03-08 06:17:39 -08:00
Eric Nielsen
a469e147cc Rewrite eriner theme using the Zim git-info module
Based on my rewrite of the Agnoster theme, uses simpler segment drawing
functions and only relies on local variables. Uses git-info module in
non-verbose mode, so a repo with only untracked files will not count as
dirty (but dirty state is computed faster). Also took the freedom of
adding an extra space character after the 'r' for the Ranger segment,
and after the dirty indicator for the Git segment. Everything else looks
and behaves exactly the same as the original prompt.
2017-03-08 06:17:39 -08:00
Matt Hamilton
5ef14a64f1 [prompt] pure: update submodule 2017-03-08 06:17:25 -08:00
Matt Hamilton
9416c7de90 [prompt] liquidprompt: update submodule 2017-03-08 06:17:08 -08:00
Matt Hamilton
9d9b6c2ec9 [prompt] lean: update submodule 2017-03-08 06:16:56 -08:00
Matt Hamilton
bf5e3a8c6b [prompt] lean: update submodule 2017-01-21 08:23:43 -08:00
Matt Hamilton
dcc066c1fa [prompt] pure: update submodule 2017-01-21 08:23:28 -08:00
Eric Nielsen
c1b02c06d0 Remove git_prompt_info and parse_git_dirty
as they were only being used by gitster prompt theme and kept for
Oh-My-Zsh compatibility. The newly introduced git-info module (inspired
by the git-info Prezto function) provides a more powerful
implementation than the Oh-My-Zsh inspired git_prompt_info.

Updated gitster to use the git-info module.

Closes #124
2017-01-19 05:10:19 -08:00
Eric Nielsen
708f17b18f Update magicmace theme to use the git-info module 2017-01-16 10:26:17 -08:00
Matt Hamilton
cb8617d3f4 [prompt] pure: update submodule
Closes #113
2017-01-05 22:34:00 -08:00
Matt Hamilton
1073feb097 [prompt] lean: update submodule 2017-01-05 22:33:37 -08:00
Matt Hamilton
02a68bea57 [prompt] lean: update submodule
Closes #110
2016-12-11 09:48:47 -08:00
Matt Hamilton
5798afae97 [prompt] pure: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
edfa747047 [prompt] liquidprompt: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
7da3437b3f [prompt] lean: update submodule 2016-12-01 23:51:59 -08:00
Matt Hamilton
ee9559eb74 [prompt] pure: update submodule 2016-10-25 16:17:14 -07:00
Matt Hamilton
99a45de4d6 [prompt] liquidprompt: update submodule 2016-10-25 16:16:57 -07:00
Matt Hamilton
e209799a5c [prompt] pure: update submodule 2016-09-27 16:40:00 -07:00
Matt Hamilton
b5134b8ab2 [prompt] liquidprompt: update submodule 2016-09-27 16:39:35 -07:00
Eric Nielsen
40ef228286 [prompt] magicmace: fix tab completion
The offender was `print -P`, where `-P` does [prompt
expansion](http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Prompt-Expansion).

I took the freedom to also change a few things:
Move the `add-zsh-hook precmd` up,
add `prompt_magicmace_` prefix to all function names,
add `COLOR_` prefix to all color global variables,
and move assignment to `PROMPT` to `prompt_magicmace_setup`.

Fixes #70, Closes #81
2016-09-27 15:58:45 -07:00
Matt Hamilton
a9c8269291 [prompt] pure: update submodule 2016-09-04 08:46:06 -07:00
Fernando Barillas
1b44eb6404 [prompt] Add lean prompt: github.com/miekg/lean
Closes #71
2016-08-15 20:31:17 -07:00
Matt Hamilton
8ac887e8e9 [prompt] pure: update submodule 2016-07-27 19:41:05 -07:00
Tmplt
0a33a3de90 [prompt] magicmace: add theme
Closes #69
2016-07-27 19:36:43 -07:00
Matt Hamilton
474b7e1add [prompt] pure: update submodule 2016-07-26 13:50:52 -07:00
Matt Hamilton
1af72f41a2 [prompt] liquidprompt: update submodule 2016-07-26 13:50:34 -07:00
nshtg
3a37a3f0e1 [prompt] steeef: always update git information
steeef would not update the git information if we stayed in the same directory.

Fixes #66. Closes #67.
2016-07-26 13:48:39 -07:00
Amin Bandali
6b2dad4bd1 [prompt] steeef: '#' prompt for privileged users
Use `%(!.#.$)` which will display `$` for normal users and `#` for privileged users

Closes #65
2016-07-26 13:36:12 -07:00
Tmplt
5f7a75a969 [prompt] add ranger indicator to eriner theme
closes #64
2016-07-17 08:18:49 -07:00
Matt Hamilton
926b47a65d [prompt] update "liquidprompt" theme submodule 2016-06-03 21:27:11 -07:00
Matt Hamilton
296c457ead [prompt] update "pure" theme submodule 2016-05-02 07:36:18 -07:00
Cenk Gündoğan
fcc4c573a8 [prompt] fix gitster path to reflect git repo
allow optional parameter for short_pwd

Closes #41
2016-04-02 13:33:01 -07:00
Matt Hamilton
983919fce4 [prompt] update "pure" theme submodule 2016-03-27 18:48:11 -04:00
Matt Hamilton
f404c5ba9f [prompt] update "pure" theme submodule 2016-02-17 10:09:36 -05:00
Matt Hamilton
9468a6219a [prompt] update "pure" theme submodule 2016-02-07 23:42:16 -05:00
Matt Hamilton
cb12222811 use 'command git' in prompts
Fixes Zim issue with interation with any functions or aliases that wrap
'git'. See issue #30 for more information.
2016-02-04 15:08:22 -05:00
Matt Hamilton
0dc32b8957 update submodules 2016-01-20 22:10:39 -05:00
Matt Hamilton
5bc9889ca4 update submodules 2016-01-18 17:39:30 -05:00
Matt Hamilton
d13614e3bb [prompt] change unset variable test
The old test, [[ ${var} ]] tests for unset AND zero-length strings.

Checking for zero length strings probably isn't that important. It is
enough to ensure that the variable is set.

Closes #18
2016-01-08 09:16:22 -05:00
Matt Hamilton
9f838982fb [prompt] syntax refactor 2016-01-07 08:10:29 -05:00
caedus75
b46edd43a8 [prompt] add setup function to themes
proper setup and preview of themes with 'prompt' function

closes #12, closes #15
2016-01-07 08:07:11 -05:00
Matt Hamilton
5f68411637 [prompt] gitster: use short_pwd 2016-01-06 09:41:40 -05:00