From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 4/4] vcs_info set-patch-format: Eliminate the remaining code duplication.
Date: Wed, 1 Feb 2017 19:05:45 +0000 [thread overview]
Message-ID: <1485975945-26420-4-git-send-email-danielsh@fujitsu.shahaf.local2> (raw)
In-Reply-To: <1485975945-26420-1-git-send-email-danielsh@fujitsu.shahaf.local2>
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 12 ++----------
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 14 +++-----------
Functions/VCS_Info/VCS_INFO_quilt | 10 ++--------
Functions/VCS_Info/VCS_INFO_set-patch-format | 13 ++++++++++++-
4 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 84a91a7..1b25b1c 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -127,16 +127,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 \
- ''
-
- if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then
- zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
- "n:${#git_patches_applied}" "c:${#git_patches_unapplied}" \
- "a:${hook_com[all-n]}"
- else
- gitmisc=${hook_com[patch-replace]}
- fi
- hook_com=()
+ '' ''
+ gitmisc=$REPLY
}
gitdir=${vcs_comm[gitdir]}
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
index 32ecb1c..143eb42 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
@@ -207,21 +207,13 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \
fi
local -A extra_hook_com=( guards "${guards_string}" guards-n ${#mqguards} )
+ local -a extra_zformats=( "g:${extra_hook_com[guards]}" "G:${#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]}" \
- "n:${#mqpatches}" "c:${#mqunapplied}" "a:${hook_com[all-n]}" \
- "g:${hook_com[guards]}" "G:${#mqguards}"
- else
- hgmqstring=${hook_com[patch-replace]}
- fi
-
- hook_com=()
+ extra_hook_com extra_zformats
+ hgmqstring=$REPLY
fi
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index 1874c8b..381b584 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -174,14 +174,8 @@ function VCS_INFO_quilt() {
VCS_INFO_set-patch-format 'applied' 'applied_string' \
'unapplied' 'unapplied_string' \
${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]}"
- else
- qstring=${hook_com[patch-replace]}
- fi
- hook_com=()
+ '' ''
+ qstring=$REPLY
case ${mode} in
(standalone)
diff --git a/Functions/VCS_Info/VCS_INFO_set-patch-format b/Functions/VCS_Info/VCS_INFO_set-patch-format
index 5534e48..c5da368 100644
--- a/Functions/VCS_Info/VCS_INFO_set-patch-format
+++ b/Functions/VCS_Info/VCS_INFO_set-patch-format
@@ -10,12 +10,14 @@
# $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
+# $8 - name of an array parameter with extra arguments for the patch-format zformat call, or '' for empty
+#
+# The expanded patch-format string is returned in $REPLY.
#
# Output:
# - $hook_com is overwritten and the keys 'applied', 'applied-n',
# 'unapplied', 'unapplied-n', 'all-n' are set.
{
- local REPLY
if VCS_INFO_hook 'gen-applied-string' "${(@P)1}"; then
if (( ${(P)#1} )); then
REPLY=${(P)1[1]}
@@ -51,4 +53,13 @@
)
hook_com[all-n]=$(( ${hook_com[applied-n]} + ${hook_com[unapplied-n]} ))
hook_com+=( ${7:+"${(@kvP)7}"} )
+ if VCS_INFO_hook 'set-patch-format' "${(P)6}"; then
+ zformat -f REPLY "${(P)6}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
+ "n:${hook_com[applied-n]}" "c:${hook_com[unapplied-n]}" \
+ "a:${hook_com[all-n]}" \
+ ${8:+"${(@P)8}"}
+ else
+ REPLY=${hook_com[patch-replace]}
+ fi
+ hook_com=()
}
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 ` [PATCH 3/4] vcs_info set-patch-format: Prepare for more code sharing between the callers Daniel Shahaf
2017-02-01 19:05 ` Daniel Shahaf [this message]
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-4-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).