From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 3/4] vcs_info set-patch-format: Prepare for more code sharing between the callers.
Date: Wed, 1 Feb 2017 19:05:44 +0000 [thread overview]
Message-ID: <1485975945-26420-3-git-send-email-danielsh@fujitsu.shahaf.local2> (raw)
In-Reply-To: <1485975945-26420-1-git-send-email-danielsh@fujitsu.shahaf.local2>
This changes hook invocation order in the hg backend.
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 3 ++-
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 9 +++++----
Functions/VCS_Info/VCS_INFO_quilt | 3 ++-
Functions/VCS_Info/VCS_INFO_set-patch-format | 3 +++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 9a46c4e..84a91a7 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -126,7 +126,8 @@ VCS_INFO_git_handle_patches () {
VCS_INFO_set-patch-format 'git_patches_applied' 'git_applied_s' \
'git_patches_unapplied' 'git_unapplied_s' \
- ":vcs_info:${vcs}:${usercontext}:${rrn}" gitmsg
+ ":vcs_info:${vcs}:${usercontext}:${rrn}" gitmsg \
+ ''
if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then
zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
index 1b1ddcd..32ecb1c 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
@@ -200,17 +200,18 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \
done < ${mqseriesfile}
fi
- VCS_INFO_set-patch-format 'mqpatches' 'applied_string' \
- 'mqunapplied' 'unapplied_string' \
- ":vcs_info:${vcs}:${usercontext}:${rrn}" hgmqstring
if VCS_INFO_hook 'gen-mqguards-string' "${mqguards[@]}"; then
guards_string=${(j:,:)mqguards}
else
guards_string=${hook_com[guards-string]}
fi
- hook_com+=( guards "${guards_string}" guards-n ${#mqguards} )
+ local -A extra_hook_com=( guards "${guards_string}" guards-n ${#mqguards} )
+ VCS_INFO_set-patch-format 'mqpatches' 'applied_string' \
+ 'mqunapplied' 'unapplied_string' \
+ ":vcs_info:${vcs}:${usercontext}:${rrn}" hgmqstring \
+ extra_hook_com
if VCS_INFO_hook 'set-patch-format' ${hgmqstring}; then
zformat -f hgmqstring "${hgmqstring}" \
"p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index d6b7c2f..1874c8b 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -173,7 +173,8 @@ function VCS_INFO_quilt() {
VCS_INFO_set-patch-format 'applied' 'applied_string' \
'unapplied' 'unapplied_string' \
- ${context} qstring
+ ${context} qstring \
+ ''
if VCS_INFO_hook 'set-patch-format' ${qstring}; then
zformat -f qstring "${qstring}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
"n:${#applied}" "c:${#unapplied}" "a:${hook_com[all-n]}"
diff --git a/Functions/VCS_Info/VCS_INFO_set-patch-format b/Functions/VCS_Info/VCS_INFO_set-patch-format
index c061704..5534e48 100644
--- a/Functions/VCS_Info/VCS_INFO_set-patch-format
+++ b/Functions/VCS_Info/VCS_INFO_set-patch-format
@@ -8,6 +8,8 @@
# $4 - name of a parameter to store the unapplied-string in
# $5 - context argument for use in zstyle getters
# $6 - name of a parameter to store a patch-format format string in
+# $7 - name of an assoc parameter with extra $hook_com key-value pairs for the
+# set-patch-format hook invocation, or '' for none
#
# Output:
# - $hook_com is overwritten and the keys 'applied', 'applied-n',
@@ -48,4 +50,5 @@
unapplied "${(P)4}"
)
hook_com[all-n]=$(( ${hook_com[applied-n]} + ${hook_com[unapplied-n]} ))
+ hook_com+=( ${7:+"${(@kvP)7}"} )
}
next prev parent reply other threads:[~2017-02-01 19:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-01 19:05 [PATCH 1/4] vcs_info set-patch-format: Guard against empty variable elision Daniel Shahaf
2017-02-01 19:05 ` [PATCH 2/4] vcs_info hg: Pass arguments to the set-patch-format hook Daniel Shahaf
2017-02-01 19:05 ` Daniel Shahaf [this message]
2017-02-01 19:05 ` [PATCH 4/4] vcs_info set-patch-format: Eliminate the remaining code duplication 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=1485975945-26420-3-git-send-email-danielsh@fujitsu.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--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).