From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Peter Grayson <pete@jpgrayson.net>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH v3] Updated StGit patch detection in vcs_info
Date: Thu, 8 Dec 2022 22:06:40 +0000 [thread overview]
Message-ID: <20221208220640.GS27622@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <20221208145241.494978-1-pete@jpgrayson.net>
Peter Grayson wrote on Thu, Dec 08, 2022 at 09:52:42 -0500:
> This is a slight improvement over the v2 patch. Only a single `git
> show-ref` is used to determine whether a StGit stack is present on the
> current branch instead of one or tow `git rev-parse` calls.
>
> I recommend applying this patch. It solves the StGit compatibility
> problems in vcs_info:
>
> - Works for all versions of StGit going back to 2009.
> - Does not impose runtime overhead when `stg` is not installed.
> - Only imposes the small cost of `git show-ref` (<0.5ms) otherwise.
> - Small patch. Low risk.
Thanks a lot for the patch and for all the constructive back-and-forth,
and many apologies for not getting around to pushing v2 sooner.
I hadn't forgotten about it; I was simply swamped, and wanted to
proofread and test it once more before pushing. (And I had planned to
review and push v2 today anyway, regardless of v3.)
Pushed the patch to master.
Noticed two issues while there:
1. (preëxisting) Some of the other codepaths don't check the
get-unapplied style. I'll send a patch for that in a minute.
2. The stg codepath doesn't extract patch subjects. The following
addresses that for the old stgit version I have packaged in my distro,
but I don't know whether it would DTRT for newer versions too.
[[[
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 37cd048db..c21c3c8d1 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -388,7 +388,7 @@ elif [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]]; then
VCS_INFO_git_handle_patches
elif command -v stg >/dev/null &&
${vcs_comm[cmd]} show-ref --quiet refs/stacks/${gitbranch} refs/heads/${gitbranch}.stgit 2>/dev/null &&
- git_patches_applied=(${(f)"$(stg series --noprefix --applied 2>/dev/null)"})
+ git_patches_applied=(${${(f)"$(stg series --noprefix --applied --description 2>/dev/null)"}/[#] })
then
# Testing for StGit patches is done after testing for all git-proper
# patches/states. If a StGit user's repo is in one of those states, they
@@ -408,7 +408,7 @@ then
# --no-prefix. The former is compatible with StGit versions going back to
# 2008.
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-unapplied; then
- git_patches_unapplied=(${(f)"$(stg series --noprefix --unapplied 2>/dev/null)"})
+ git_patches_unapplied=(${${(f)"$(stg series --noprefix --unapplied --description 2>/dev/null)"}/[#] })
fi
VCS_INFO_git_handle_patches
else
]]]
The "Show information about patch series" snippet in
Misc/vcs_info-examples can be used to test this change.
Best,
Daniel
next prev parent reply other threads:[~2022-12-08 22:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-25 20:43 [PATCH] Remove _stgit completion script Peter Grayson
2022-10-31 9:19 ` Daniel Shahaf
2022-10-31 10:13 ` StGit 2.0 and vcs_info (was: Re: [PATCH] Remove _stgit completion script) Daniel Shahaf
2022-11-01 3:00 ` [PATCH] Remove _stgit completion script Peter Grayson
2022-11-01 3:04 ` [PATCH] Remove StGit patch detection from vcs_info Peter Grayson
2022-11-11 11:49 ` Daniel Shahaf
2022-11-12 14:46 ` Peter Grayson
2022-11-12 15:42 ` [PATCH] Updated StGit patch detection in vcs_info Peter Grayson
2022-11-13 4:58 ` Daniel Shahaf
2022-11-16 20:45 ` [PATCH v2] " Peter Grayson
2022-12-08 14:52 ` [PATCH v3] " Peter Grayson
2022-12-08 22:06 ` Daniel Shahaf [this message]
2022-12-08 22:08 ` [PATCH] vcs_info git: Check the get-unapplied style as documented (was: [PATCH v3] Updated StGit patch detection in vcs_info) Daniel Shahaf
2022-12-09 0:59 ` [PATCH v3] Updated StGit patch detection in vcs_info Peter Grayson
2022-12-09 1:37 ` Daniel Shahaf
2022-12-10 12:55 ` Peter Grayson
2022-12-10 13:31 ` Daniel Shahaf
2022-11-13 4:30 ` [PATCH] Remove StGit patch detection from vcs_info Daniel Shahaf
2022-11-14 3:38 ` Peter Grayson
2022-11-14 5:17 ` Mikael Magnusson
2022-11-14 13:21 ` Daniel Shahaf
2022-11-14 13:15 ` Daniel Shahaf
2022-11-16 19:38 ` Peter Grayson
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=20221208220640.GS27622@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=pete@jpgrayson.net \
--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).