dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 21:58:00 +00:00
Code Issues Releases Wiki Activity

git: Add revert to special action contexts

Browse Source 
revert is very similar to cherry-pick and has a sequence variant.
This commit is contained in:
Zhiming Wang 2016-01-17 13:22:54 -08:00 committed by Kaleb Elwert
parent 0f3a5f745e
commit d25b251ef7
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/git/README.md
View File

@ -389,6 +389,8 @@ The following contexts must be enabled with the following zstyle:
| rebase | value | Rebasing | rebase | value | Rebasing
| rebase-interactive | value | Rebasing interactively | rebase-interactive | value | Rebasing interactively
| rebase-merge | value | Rebasing merge | rebase-merge | value | Rebasing merge
| revert | value | Reverting
| revert-sequence | value | Reverting sequence
First, format the repository state attributes. For example, to format the branch First, format the repository state attributes. For example, to format the branch
and remote names, define the following styles. and remote names, define the following styles.

16
modules/git/functions/git-info
View File

@ -5,7 +5,7 @@
# Sorin Ionescu <sorin.ionescu@gmail.com> # Sorin Ionescu <sorin.ionescu@gmail.com>
# #
# Gets the Git special action (am, bisect, cherry, merge, rebase). # Gets the Git special action (am, bisect, cherry, merge, rebase, revert).
# Borrowed from vcs_info and edited. # Borrowed from vcs_info and edited.
function _git-action { function _git-action {
local action_dir local action_dir
@ -18,6 +18,8 @@ function _git-action {
local rebase_formatted local rebase_formatted
local rebase_interactive_formatted local rebase_interactive_formatted
local rebase_merge_formatted local rebase_merge_formatted
local revert_formatted
local revert_sequence_formatted
for action_dir in \ for action_dir in \
"${git_dir}/rebase-apply" \ "${git_dir}/rebase-apply" \
@ -80,6 +82,18 @@ function _git-action {
return 0 return 0
fi fi
if [[ -f "${git_dir}/REVERT_HEAD" ]]; then
if [[ -d "${git_dir}/sequencer" ]] ; then
zstyle -s ':prezto:module:git:info:action:revert-sequence' format 'revert_sequence_formatted' || revert_sequence_formatted='revert-sequence'
print "$revert_sequence_formatted"
else
zstyle -s ':prezto:module:git:info:action:revert' format 'revert_formatted' || revert_formatted='revert'
print "$revert_formatted"
fi
return 0
fi
if [[ -f "${git_dir}/BISECT_LOG" ]]; then if [[ -f "${git_dir}/BISECT_LOG" ]]; then
zstyle -s ':prezto:module:git:info:action:bisect' format 'bisect_formatted' || bisect_formatted='bisect' zstyle -s ':prezto:module:git:info:action:bisect' format 'bisect_formatted' || bisect_formatted='bisect'
print "$bisect_formatted" print "$bisect_formatted"