diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-08 10:30:45 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-08 10:30:45 +0000 |
commit | 78b02d9c036f6b0e0ec7896729a090ec7ccc7a5f (patch) | |
tree | bbba018cb7d52a3f7ea8dd3bcb6832f06be59132 /Completion/Unix/Command/_cvs | |
parent | 9d071829ecbcb34128c34d4b2855342f81f1dd48 (diff) | |
download | zsh-78b02d9c036f6b0e0ec7896729a090ec7ccc7a5f.tar.gz zsh-78b02d9c036f6b0e0ec7896729a090ec7ccc7a5f.tar.xz zsh-78b02d9c036f6b0e0ec7896729a090ec7ccc7a5f.zip |
18512: fix 18508 properly this time.
Diffstat (limited to 'Completion/Unix/Command/_cvs')
-rw-r--r-- | Completion/Unix/Command/_cvs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs index ea67c0ea4..c2ddb2e2c 100644 --- a/Completion/Unix/Command/_cvs +++ b/Completion/Unix/Command/_cvs @@ -611,7 +611,7 @@ _cvs_loadstat () { (( $+functions[_cvs_root] )) || _cvs_root () { - local cvspassfile id + local cvspassfile id slash typeset -gU _cvs_roots @@ -622,7 +622,8 @@ _cvs_root () { id="$(LC_ALL=C ls -l "$cvspassfile")" fi if [[ "$id" != "$_cvs_pass_id" ]]; then - _cvs_roots=($_cvs_roots ${${${${(f)"$(<$cvspassfile)"}#/1 }%% *}/:2401\\//:/}) + slash=/ + _cvs_roots=($_cvs_roots ${${${${(f)"$(<$cvspassfile)"}#/1 }%% *}/:2401${slash}/:/}) _cvs_pass_id="$id" fi fi @@ -918,13 +919,13 @@ _cvs_existing_entries () { (( $+functions[_cvs_modified_entries] )) || _cvs_modified_entries () { if _cvs_loadstat; then - local expl match linedir realdir pat + local expl match linedir realdir pat slash=/ match=() : ${PREFIX:#(#b)(*/)(*)} linedir="$match[1]" realdir=${(e)~linedir} [[ -f "$realdir"CVS/Entries ]] && - [[ -n ${pat::="${(@j:|:)${(@)${(@)${(@)${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}/\\/[^\\/]#\\///}%/[^/]#/[^/]#}:#${(j:|:)~${${${${(f)"$(LC_ALL=C builtin stat -gn +mtime -F '%a %b %e %T %Y' ${realdir}*(D) 2>/dev/null)"}##*/}/ //}//(#m)[][*?()<|^~#\\]/\\$MATCH}}}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}"} ]] && + [[ -n ${pat::="${(@j:|:)${(@)${(@)${(@)${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}/${slash}[^${slash}]#${slash}//}%/[^/]#/[^/]#}:#${(j:|:)~${${${${(f)"$(LC_ALL=C builtin stat -gn +mtime -F '%a %b %e %T %Y' ${realdir}*(D) 2>/dev/null)"}##*/}/ //}//(#m)[][*?()<|^~#\\]/\\$MATCH}}}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}"} ]] && _wanted files expl 'modified file' _path_files -g "$pat" else _cvs_existing_entries |