Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 1/2] vcs_info quilt: Factor out a helper function. No functional change.
- X-seq: zsh-workers 38609
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 1/2] vcs_info quilt: Factor out a helper function. No functional change.
- Date: Sat, 4 Jun 2016 16:57:48 +0000
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
---
Functions/VCS_Info/VCS_INFO_quilt | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index c3c3d86..e31deb0 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author