From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RDNS_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: (qmail 15052 invoked from network); 12 Mar 2020 18:50:07 -0000 Received-SPF: pass (primenet.com.au: domain of zsh.org designates 203.24.36.2 as permitted sender) receiver=inbox.vuxu.org; client-ip=203.24.36.2 envelope-from= Received: from unknown (HELO primenet.com.au) (203.24.36.2) by inbox.vuxu.org with ESMTP; 12 Mar 2020 18:50:07 -0000 Received: (qmail 26040 invoked by alias); 12 Mar 2020 18:49:31 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 45547 Received: (qmail 5974 invoked by uid 1010); 12 Mar 2020 18:49:31 -0000 X-Qmail-Scanner-Diagnostics: from out3-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.2/25744. spamassassin: 3.4.2. Clear:RC:0(66.111.4.27):SA:0(-1.9/5.0):. Processed in 0.374601 secs); 12 Mar 2020 18:49:31 -0000 X-Envelope-From: danielsh@apache.org X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: softfail (ns1.primenet.com.au: transitioning SPF record at amazonses.com does not designate 66.111.4.27 as permitted sender) X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddvhedguddulecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesth ektddtredtjeenucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurghnihgvlhhs hhesrghprggthhgvrdhorhhgqeenucfkphepjeelrddujeeirdehledrudehvdenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegurghnihgvlhhs hhesrghprggthhgvrdhorhhg X-ME-Proxy: From: Daniel Shahaf 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 Message-Id: <20200312184853.21654-3-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312184853.21654-1-danielsh@tarpaulin.shahaf.local2> References: <20200312184853.21654-1-danielsh@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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