diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 04:32:03 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 04:32:03 +0100 |
| commit | 3e439c3863f14c82f70666804c8570a13b3732e6 (patch) | |
| tree | 07036c43e0f3f9242bb6dd42cd2a849ec8ea8aca /Functions/VCS_Info/VCS_INFO_quilt | |
| parent | 2aedc4b88fd0e87b89583983951b04b96f48efd3 (diff) | |
| parent | 7b7e84f0815ed22a0ee348a217776529035dccf3 (diff) | |
| download | zsh-3e439c3863f14c82f70666804c8570a13b3732e6.tar.gz zsh-3e439c3863f14c82f70666804c8570a13b3732e6.zip | |
Merge tag 'zsh-5.2-test-1' into debian
Diffstat (limited to 'Functions/VCS_Info/VCS_INFO_quilt')
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_quilt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index c3c3d864d..4c61506cd 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -80,6 +80,10 @@ function VCS_INFO_quilt-dirfind() { return ${ret} } +function VCS_INFO_quilt-patch2subject() { + VCS_INFO_patch2subject "$@" +} + function VCS_INFO_quilt() { emulate -L zsh setopt extendedglob @@ -119,7 +123,7 @@ function VCS_INFO_quilt() { applied=() fi patches=$(<$pc/.quilt_patches) - patches=`builtin cd -q "${pc:h}" && print -r - ${patches:A}` + patches=`builtin cd -q "${pc:h}" && print -r - ${patches:P}` fi if zstyle -t "${context}" get-unapplied; then # This zstyle call needs to be moved further up if `quilt' needs @@ -147,27 +151,19 @@ function VCS_INFO_quilt() { if [[ -n $patches ]]; then () { - local i line + local i for ((i=1; i<=$#applied; i++)); do - if [[ -f "$patches/$applied[$i]" ]] && - read -r line < "$patches/$applied[$i]" && - [[ $line != (#b)(---|Index:)* ]] && - true - ; + if VCS_INFO_quilt-patch2subject "$patches/$applied[$i]" && (( $+REPLY )) then - applied[$i]+=" $line" + applied[$i]+=" $REPLY" else applied[$i]+=" ?" fi done for ((i=1; i<=$#unapplied; i++)); do - if [[ -f "$patches/$unapplied[$i]" ]] && - read -r line < "$patches/$unapplied[$i]" && - [[ $line != (#b)(---|Index:)* ]] && - true - ; + if VCS_INFO_quilt-patch2subject "$patches/$unapplied[$i]" && (( $+REPLY )) then - unapplied[$i]+=" $line" + unapplied[$i]+=" $REPLY" else unapplied[$i]+=" ?" fi |