Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: vcs_info: '%' in payloads not escaped
- X-seq: zsh-workers 40241
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: Re: vcs_info: '%' in payloads not escaped
- Date: Tue, 27 Dec 2016 15:13:54 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= mesmtp; bh=KXcg41mm6MDrmydxkGeQqDcL6I0=; b=MWit2hBfLAN5VjqPWiOfm BoILb8MDJvenXfAJMsk+5uL1oaMHz5JkhQ23C+gh3s72o1dL8W9XDULReZJ5OAWJ rhHMFtTCTAF7svrgc7p9wup0B8pzWiKtbgtQAGLdiPNpDRLelB8mvfR+mk78APKy d7+oCBdo5tK6zmRMxQr4Og=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=KXcg41mm6MDrmydxkGeQqDcL6I0=; b=rNK3PJUc1kWaggm9sRx5 zXaMUi9z6TxLm0LHM8xtUaU7xkLEGVx5lO7J3MKmQBQDyb4qCwh3KHBsfDxP1Kb1 Lg6bQRMAnqm3h7UnMqRmH4T8YCoa6JxsZBL779f6X4amPyr14vQEA3qKaGjRvIKR D37+BZbjSab0U8f6KcsiUaA=
- In-reply-to: <20161227150507.GA20351@fujitsu.shahaf.local2>
- 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
- References: <20161227150507.GA20351@fujitsu.shahaf.local2>
Daniel Shahaf wrote on Tue, Dec 27, 2016 at 15:05:07 +0000:
> I work around this hook by doing ${1//'%'/%%} in my gen-applied-string
> hook. I assume vcs_info itself should be doing that, but I'm not sure
> where in the code to add that. Is the following correct?
>
> [[[
> diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> index 4ec87c6..6272f69 100644
> --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
> @@ -149,7 +149,7 @@ VCS_INFO_git_handle_patches () {
> hook_com=( applied "${git_applied_s}" unapplied "${git_patches_unapplied}"
> applied-n ${#git_patches_applied} unapplied-n ${#git_patches_unapplied} all-n ${git_all} )
> if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then
> - zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
> + zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]//'%'/%%}" "u:${hook_com[unapplied]//'%'/%%}" \
> "n:${#git_patches_applied}" "c:${#git_patches_unapplied}" "a:${git_all}"
So this breaks hooks that intentionally inject coloring sequences:
+vi-git-applied-string() {
hook_com[applied-string]="%F{yellow}$1%f"
ret=1
}
I suppose we could %-escape the patch subject before we call
applied-string, but then applied-string hooks that run «echo $1»
will suddenly get doubled percent signs in there.
Or maybe that's not a supported use of applied-string.
Not sure how to proceed.
Cheers,
Daniel
Messages sorted by:
Reverse Date,
Date,
Thread,
Author