From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Cc: Marc Finet <m.dreadlock@gmail.com>
Subject: [PATCH 2/2] vcs_info quilt: Use quilt-patch-dir and ${QUILT_PATCHES} even when get-unapplied hasn't been set
Date: Thu, 27 Jan 2022 17:58:14 +0000 [thread overview]
Message-ID: <20220127175814.10179-2-danielsh@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <20220127175814.10179-1-danielsh@tarpaulin.shahaf.local2>
This affects the post-quilt hook. Before this patch, if no patches have
been applied and get-unapplied hasn't been set, the second argument to
that hook would undergo null elision.
The generation of patch subjects for the gen-applied-string,
gen-unapplied-string, and set-patch-format hooks was unaffected since
it was guarded by [[ -n $patches ]].
---
Functions/VCS_Info/VCS_INFO_quilt | 45 ++++++++++++++++---------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index 22212171a..ee242f552 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -113,9 +113,12 @@ function VCS_INFO_quilt-patch2subject() {
;;
esac
- VCS_INFO_quilt-dirfind .pc .version
- ret=$? pc=$REPLY
- if (( ret == 0 )); then
+ # Look for the patches directory.
+ #
+ # 1. Check if there's a .pc/.version file in a parent dir. If so, use the
+ # patches dir from the corresponding .pc/.quilt_patches.
+ if VCS_INFO_quilt-dirfind .pc .version; then
+ pc=$REPLY
[[ ${quiltmode} == 'standalone' ]] && root=${pc}
pc=${pc}/.pc
if [[ -e ${pc}/applied-patches ]]; then
@@ -128,25 +131,27 @@ function VCS_INFO_quilt-patch2subject() {
fi
patches=$(<$pc/.quilt_patches)
patches=`builtin cd -q "${pc:h}" && print -r - ${patches:P}`
+ # 2. Else, locate a patches dir using the style settings.
+ else
+ zstyle -s "${context}" quilt-patch-dir patches || patches="${QUILT_PATCHES}"
+ : ${patches:="patches"}
+ if [[ "${patches}" != /* ]]; then
+ if VCS_INFO_quilt-dirfind "${patches}"; then
+ patches=$REPLY/$patches
+ else
+ return $?
+ fi
+ else
+ [[ -d ${patches} ]] || return 1
+ fi
+ quilt_env+=(QUILT_PATCHES="$patches")
fi
+ # At this point, $patches is set and points to an existing directory.
+
if zstyle -t "${context}" get-unapplied; then
# This zstyle call needs to be moved further up if `quilt' needs
# to be run in more places than this one.
zstyle -s "${context}" quiltcommand quiltcommand || quiltcommand='quilt'
- if [ -z "$patches" ]; then
- zstyle -s "${context}" quilt-patch-dir patches || patches="${QUILT_PATCHES}"
- : ${patches:="patches"}
- if [[ "${patches}" != /* ]]; then
- if VCS_INFO_quilt-dirfind "${patches}"; then
- patches="$REPLY/${patches}"
- else
- return $?
- fi
- else
- [[ -d ${patches} ]] || return 1
- fi
- quilt_env+=(QUILT_PATCHES="$patches")
- fi
unapplied=( ${(f)"$(if (( $+quilt_env[1] )); then export ${quilt_env[@]}; fi
$quiltcommand --quiltrc /dev/null unapplied 2> /dev/null)"} )
unapplied=( ${unapplied:#} )
@@ -154,8 +159,7 @@ function VCS_INFO_quilt-patch2subject() {
unapplied=()
fi
- if [[ -n $patches ]]; then
- () {
+ {
local i
for ((i=1; i<=$#applied; i++)); do
if VCS_INFO_quilt-patch2subject "$patches/$applied[$i]" && (( $+REPLY ))
@@ -173,8 +177,7 @@ function VCS_INFO_quilt-patch2subject() {
unapplied[$i]+=" ?"
fi
done
- }
- fi
+ }
VCS_INFO_set-patch-format 'applied' 'applied_string' \
'unapplied' 'unapplied_string' \
next prev parent reply other threads:[~2022-01-27 17:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 17:58 [PATCH 1/2] vcs_info quilt: Refactor for readability. No functional change Daniel Shahaf
2022-01-27 17:58 ` Daniel Shahaf [this message]
2022-01-27 18:12 ` [PATCH 2/2] vcs_info quilt: Use quilt-patch-dir and ${QUILT_PATCHES} even when get-unapplied hasn't been set Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220127175814.10179-2-danielsh@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=m.dreadlock@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).