linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 21:39:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitfast: update plugin (#7152)

Browse source 
* Stop loading git plugin
* Update completion and git-prompt to v2.10
* Update completion to v2.14
This commit is contained in:
Marc Cornellà 2019-04-08 20:06:17 +02:00 committed by GitHub
parent 728c8e7174
commit 8c95c2b6cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 747 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/gitfast/_git
View file

@ -9,7 +9,7 @@
# #
# If your script is somewhere else, you can configure it on your ~/.zshrc: # If your script is somewhere else, you can configure it on your ~/.zshrc:
# #
# zstyle ':completion:*:*:git:*' script ~/.git-completion.sh # zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
# #
# The recommended way to install this script is to copy to '~/.zsh/_git', and # The recommended way to install this script is to copy to '~/.zsh/_git', and
# then add the following to your ~/.zshrc file: # then add the following to your ~/.zshrc file:
@ -67,6 +67,15 @@ __gitcomp ()
esac esac
} }
__gitcomp_direct ()
{
emulate -L zsh
local IFS=$'\n'
compset -P '*[=:]'
compadd -Q -- ${=1} && _ret=0
}
__gitcomp_nl () __gitcomp_nl ()
{ {
emulate -L zsh emulate -L zsh

913
plugins/gitfast/git-completion.bash
View file

File diff suppressed because it is too large Load diff

9
plugins/gitfast/git-prompt.sh
View file

@ -82,6 +82,7 @@
# contains relative to newer annotated tag (v1.6.3.2~35) # contains relative to newer annotated tag (v1.6.3.2~35)
# branch relative to newer tag or branch (master~4) # branch relative to newer tag or branch (master~4)
# describe relative to older annotated tag (v1.6.3.1-13-gdd42c2f) # describe relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
# tag relative to any older tag (v1.6.3.1-13-gdd42c2f)
# default exactly matching tag # default exactly matching tag
# #
# If you would like a colored hint about the current dirty state, set # If you would like a colored hint about the current dirty state, set
@ -355,8 +356,8 @@ __git_ps1 ()
# incorrect.) # incorrect.)
# #
local ps1_expanded=yes local ps1_expanded=yes
[ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no [ -z "${ZSH_VERSION-}" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
[ -z "$BASH_VERSION" ] || shopt -q promptvars || ps1_expanded=no [ -z "${BASH_VERSION-}" ] || shopt -q promptvars || ps1_expanded=no
local repo_info rev_parse_exit_code local repo_info rev_parse_exit_code
repo_info="$(git rev-parse --git-dir --is-inside-git-dir \ repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
@ -368,7 +369,7 @@ __git_ps1 ()
return $exit return $exit
fi fi
local short_sha local short_sha=""
if [ "$rev_parse_exit_code" = "0" ]; then if [ "$rev_parse_exit_code" = "0" ]; then
short_sha="${repo_info##*$'\n'}" short_sha="${repo_info##*$'\n'}"
repo_info="${repo_info%$'\n'*}" repo_info="${repo_info%$'\n'*}"
@ -443,6 +444,8 @@ __git_ps1 ()
git describe --contains HEAD ;; git describe --contains HEAD ;;
(branch) (branch)
git describe --contains --all HEAD ;; git describe --contains --all HEAD ;;
(tag)
git describe --tags HEAD ;;
(describe) (describe)
git describe HEAD ;; git describe HEAD ;;
(* | default) (* | default)

7
plugins/gitfast/gitfast.plugin.zsh
View file

@ -1,8 +1,9 @@
dir=$(dirname $0) dir="${0:A:h}"
source $dir/../git/git.plugin.zsh source "$dir/git-prompt.sh"
source $dir/git-prompt.sh
function git_prompt_info() { function git_prompt_info() {
dirty="$(parse_git_dirty)" dirty="$(parse_git_dirty)"
__git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}" __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
} }
unset dir