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

38609: vcs_info quilt: Factor out a helper function. No functional change.

Browse source
This commit is contained in:
Daniel Shahaf 2016-06-04 16:57:48 +00:00
parent 8cca444824
commit e8943e7007
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-06-06 Daniel Shahaf <d.s@daniel.shahaf.name>
* 38609: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt:
Factor out a helper function. No functional change.
2016-06-05 Barton E. Schaefer <schaefer@zsh.org>
* 38622: Src/jobs.c: consistent handling of "--" in "kill" builtin

35
Functions/VCS_Info/VCS_INFO_quilt
View file

@ -80,6 +80,23 @@ function VCS_INFO_quilt-dirfind() {
return ${ret}
}
# This function takes as an argument a filename of a patch and sets $REPLY to
# a single-line "subject", or unsets it if no subject could be extracted.
function VCS_INFO_quilt-patch2subject() {
local line
if [[ -f "$1" ]] && read -r line < "$1"; then
if [[ $line != (#b)(---|Index:)* ]]; then
REPLY=$line
else
unset REPLY
return 0
fi
else
unset REPLY
return 1
fi
}
function VCS_INFO_quilt() {
emulate -L zsh
setopt extendedglob
@ -147,27 +164,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