Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] Fix broken VCS_Info in 5.7

X-seq: zsh-workers 44020
From: dana <dana@xxxxxxx>
To: Zsh workers <zsh-workers@xxxxxxx>
Subject: [PATCH] Fix broken VCS_Info in 5.7
Date: Sat, 26 Jan 2019 14:42:04 -0600
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=9bMOE5x7Od81RJMnd9y8TBvF19a/UgSFtcF+/UYaBEc=; b=ReDE2SNN+9lkhjpJyt5RYDksUZxwThIRl7YdM8mOAXC4lPCpFyImU1IxMN9gsXbP+t 2Q3Y2ksSjn0dJpSiPipwFu3yeFO5LgJ4AgYKivN+PcmxiP6zy9Lvmc1FveBbpKJ0VLAb feQu+DWf2pgs0+g6f6QJDy4foO3OnaH5n/c3OYHK++5t/jXyybc75qDkGMBIeuHnt1wB tGV4M60L6tsnwaDbrtkXOBngX0rlbA4G9VgDwMJxlTkhM2f5Cfh1tmh4gSw6L9/xI/Id xJNLisBZ4SBQl/m7I/b76022+Dm2W076DrbaSQ8EgZVNFOacJVgZTlztHBOVqFf4vEKb +6Sw==
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

A bunch of Arch users are reporting that VCS_Info is broken:

  https://bugs.archlinux.org/task/61533

To replicate it you just need to run vcs_info outside of a repo:

  % zsh -f
  % autoload -Uz vcs_info
  % vcs_info
  VCS_INFO_detect_p4:79: maximum nested function level reached; increase FUNCNEST?

This is apparently due to workers/43618, which introduced a function-def guard
to a function that wants to redefine itself. Just taking that back out seems
to fix it.

Wish they'd mentioned it to #zsh an hour or two ago :(

dana


diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
index d171c68ee..5ec21da9f 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
 }
 
 
-(( ${+functions[VCS_INFO_detect_p4]} )) ||
 VCS_INFO_detect_p4() {
   local serverport p4where

Messages sorted by: Reverse Date, Date, Thread, Author