mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-25 17:20:25 +02:00
Code Releases Activity

35061: add __git_setup_diff_stage_options and use it with _git-diff-files and _git-diff explicitly

Browse source
This commit is contained in:
Daniel Hahler 2015-05-14 19:00:32 +02:00 • committed by Oliver Kiddle
parent fec4e7243b
commit a1c1f6828c
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2015-05-14 Oliver Kiddle <opk@zsh.org> 2015-05-14 Oliver Kiddle <opk@zsh.org>
* Daniel Hahler: 35061: Completion/Unix/Command/_git:
add __git_setup_diff_stage_options and use it with
_git-diff-files and _git-diff explicitly
* Daniel Hahler: 35016: Completion/Unix/Command/_git: * Daniel Hahler: 35016: Completion/Unix/Command/_git:
introduce new pretty formats %g[sdD] for reflog information introduce new pretty formats %g[sdD] for reflog information

22
Completion/Unix/Command/_git
View file

@ -714,12 +714,14 @@ _git-diff () {
local curcontext=$curcontext state line ret=1 local curcontext=$curcontext state line ret=1
declare -A opt_args declare -A opt_args
local -a diff_options local -a diff_options diff_stage_options
__git_setup_diff_options __git_setup_diff_options
__git_setup_diff_stage_options
_arguments -w -C -s \ _arguments -w -C -s \
$* \ $* \
$diff_options \ $diff_options \
$diff_stage_options \
'(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \ '(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \
'(-)--[start file arguments]' \ '(-)--[start file arguments]' \
'*:: :->from-to-file' && ret=0 '*:: :->from-to-file' && ret=0
@ -4341,11 +4343,13 @@ _git-cat-file () {
(( $+functions[_git-diff-files] )) || (( $+functions[_git-diff-files] )) ||
_git-diff-files () { _git-diff-files () {
declare -a revision_options local -a revision_options diff_stage_options
__git_setup_revision_options __git_setup_revision_options
__git_setup_diff_stage_options
_arguments -w -S -s \ _arguments -w -S -s \
$revision_options \ $revision_options \
$diff_stage_options \
': :__git_changed-in-working-tree_files' \ ': :__git_changed-in-working-tree_files' \
': :__git_changed-in-working-tree_files' \ ': :__git_changed-in-working-tree_files' \
'*: :__git_changed-in-working-tree_files' '*: :__git_changed-in-working-tree_files'
@ -6230,14 +6234,20 @@ __git_setup_diff_options () {
'(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix' '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix'
'(--src-prefix --dst-prefix)--no-prefix[do not show any source or destination prefix]' '(--src-prefix --dst-prefix)--no-prefix[do not show any source or destination prefix]'
'(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'
# TODO: --output is undocumented.
'--output[undocumented]:undocumented')
}
(( $+functions[__git_setup_diff_stage_options] )) ||
__git_setup_diff_stage_options () {
diff_stage_options=(
'(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-1,--base}'[diff against "base" version]' '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-1,--base}'[diff against "base" version]'
'(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-2,--ours}'[diff against "our branch" version]' '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-2,--ours}'[diff against "our branch" version]'
'(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]' '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]'
'(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]' '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]'
'(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]' )
# TODO: --output is undocumented.
'--output[undocumented]:undocumented')
} }
(( $+functions[__git_setup_revision_options] )) || (( $+functions[__git_setup_revision_options] )) ||