From: Daniel Shahaf <danielsh@apache.org>
To: zsh-workers@zsh.org
Subject: [PATCH 3/3] vcs_info git: In interactive rebases, process gen-unapplied-string arguments like gen-applied-string arguments are processed.
Date: Thu, 12 Mar 2020 18:48:53 +0000 [thread overview]
Message-ID: <20200312184853.21654-3-danielsh@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <20200312184853.21654-1-danielsh@tarpaulin.shahaf.local2>
I consider this a bugfix, since it's unexpected for -applied and
-unapplied to differ about this.
---
The easy way to test this is with the script from workers/45541: edit that
script to add "-i" to the «git rebase» invocation on the last line, then run
it and observe that the word "pick" is removed from the gen-unapplied-string
hook's argv.
Cheers,
Daniel
.../VCS_Info/Backends/VCS_INFO_get_data_git | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index d8e5d1ff1..f7c4210e8 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -196,15 +196,16 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# 'git rebase -i'
patchdir="${gitdir}/rebase-merge"
local p
- [[ -f "${patchdir}/done" ]] &&
- for p in ${(f)"$(< "${patchdir}/done")"}; do
+ VCS_INFO_git_map_rebase_line_to_hash_and_subject() {
+ local p=$1
+ unset REPLY
# pick/edit/fixup/squash/reword: Add "$hash $subject" to $git_patches_applied.
# exec: Add "exec ${command}" to $git_patches_applied.
# (anything else): As 'exec'.
case $p in
([#]*)
# Comment line. Skip.
- continue
+ return 0
;;
((p|pick|e|edit|r|reword|f|fixup|s|squash)' '*)
# The line is of the form "pick $hash $subject".
@@ -241,11 +242,19 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
p+=" ?"
fi
esac
- git_patches_applied+=("$p")
- done
+ REPLY=$p
+ }
+ if [[ -f "${patchdir}/done" ]] ; then
+ for p in ${(f)"$(< "${patchdir}/done")"}; do
+ VCS_INFO_git_map_rebase_line_to_hash_and_subject "$p"
+ (( $+REPLY )) && git_patches_applied+=( "$REPLY" )
+ done
+ fi
if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
- # TODO: Process ${patchdir}/git-rebase-todo lines like ${patchdir}/done lines are
- git_patches_unapplied=( ${${(f)${"$(<"${patchdir}/git-rebase-todo")"}}:#[#]*} )
+ for p in ${(f)"$(< "${patchdir}/git-rebase-todo")"}; do
+ VCS_INFO_git_map_rebase_line_to_hash_and_subject "$p"
+ (( $+REPLY )) && git_patches_unapplied+=( "$REPLY" )
+ done
fi
VCS_INFO_git_handle_patches
elif [[ -d "${gitdir}/rebase-apply" ]]; then
prev parent reply other threads:[~2020-03-12 18:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 18:48 [PATCH 1/3] vcs_info git: In interactive rebases, ignore comment lines Daniel Shahaf
2020-03-12 18:48 ` [PATCH 2/3] vcs_info git: In interactive rebases, properly support the full form of the "exec" verb Daniel Shahaf
2020-03-12 18:48 ` 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=20200312184853.21654-3-danielsh@tarpaulin.shahaf.local2 \
--to=danielsh@apache.org \
--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).