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

Alexey I. Froloff: 27470: _git update

Browse source
This commit is contained in:
Peter Stephenson 2009-12-13 22:30:29 +00:00
parent 45eef71215
commit c7767889b0
2 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2009-12-13 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Alexey I. Froloff: 27470: Completion/Unix/Command/_git:
update.
2009-12-13 Wayne Davison <wayned@users.sourceforge.net>
* unposted: Completion/Unix/Command/_rsync: Fixed the
@ -12477,5 +12482,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4840 $
* $Revision: 1.4841 $
*****************************************************

61
Completion/Unix/Command/_git
View file

@ -2773,19 +2773,70 @@ __git_stages () {
__git_guard $* "[[:digit:]]#" 'stage'
}
(( $+functions[__git_files_relative] )) ||
__git_files_relative () {
local rawfiles files file f_parts prefix p_parts tmp
prefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null)
__git_command_successful || return
# Empty prefix, no modifications
if (( $#prefix == 0 )); then
print $1
return
fi
rawfiles=(${(ps:\0:)1})
files=()
# Now we assume that we've given "absolute" paths list with "root"
# being repository top directory. $prefix is also "absolute" path.
for file in $rawfiles; do
# Collapse "/./" and "//", strip "/." and "/" from tail (I know,
# this is a bit paranoid).
f_parts=(${(s:/:)"${${${${file//\/\///}//\/.\///}%%/.}%%/}"})
p_parts=(${(s:/:)"${${${${prefix//\/\///}//\/.\///}%%/.}%%/}"})
tmp=()
# Strip common path prefix.
while (( $#f_parts > 0 )) && (( $#p_parts > 0 )) && [[ $f_parts[1] == $p_parts[1] ]]; do
f_parts[1]=()
p_parts[1]=()
done
# If prefix still not empty, ascend up.
while (( $#p_parts > 0 )); do
tmp+=..
p_parts[1]=()
done
# Add remaining path.
tmp=("$tmp[@]" "$f_parts[@]")
files+=${(j:/:)tmp}
done
print ${(pj:\0:)files}
}
(( $+functions[__git_files] )) ||
__git_files () {
local expl files ls_opts opts gitdir
local expl files ls_opts opts gitdir gitcdup
zparseopts -D -E -a opts -- -cached -deleted -modified -others -ignored -unmerged -killed
gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
__git_command_successful || return
gitcdup=$(_call_program gitcdup git rev-parse --show-cdup 2>/dev/null)
__git_command_successful || return
ls_opts=("--exclude-per-directory=.gitignore")
[[ -f "$gitdir/info/exclude" ]] && ls_opts+="--exclude-from=$gitdir/info/exclude"
files=(${(ps:\0:)"$(_call_program files git ls-files -z $ls_opts $opts 2>/dev/null)"})
files=$(_call_program files git ls-files -z --full-name $ls_opts $opts -- $gitcdup 2>/dev/null)
__git_command_successful || return
files=(${(ps:\0:)"$(__git_files_relative $files)"})
__git_command_successful || return
_wanted files expl 'index file' _multi_parts $@ - / files
@ -2824,9 +2875,11 @@ __git_unmerged_files () {
#this is for git-commit which can take files both git-added and not
(( $+functions[__git_changed_files] )) ||
__git_changed_files () {
local -a files
local files
files=(${(ps:\0:)"$(_call_program files git diff-index -z --name-only --no-color HEAD 2>/dev/null)"})
files=$(_call_program files git diff-index -z --name-only --no-color HEAD 2>/dev/null)
__git_command_successful || return
files=(${(ps:\0:)"$(__git_files_relative $files)"})
__git_command_successful || return
_wanted files expl 'index file' _multi_parts $@ - / files