From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23435 invoked from network); 10 Dec 2022 12:56:34 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 10 Dec 2022 12:56:34 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1670676994; b=giwDsgVkjLByRUodWYFDdve+Zkdu5r2Snt2PZWyhTE4N9fv48EqVYHY1WNYJF152346M6zepA9 k0mRWa1LpYbAS1HIRRrl874UC68ZXjL3HGTqx+K64D3xbCnMukHnzgT+5L2jQgCKO0YMgEFyEu 9ynHS3omUNWiuyh47phBNySIWHdalwF7VncpAj6u/i2Y8oOUMcfcn0a5zO80X6uovy/oZFN17p G5GvbIcUDfaInO+Ir45j2ZEUEacjb5EX+T2g9p+EWkOYX8tRJfxoC1a0HG4kEXahpj14YFJCWP ezQK7SHva3Hf/kuaXZpgUc7IyBOfoKM/IjewInopEaVWaQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (wout3-smtp.messagingengine.com) smtp.remote-ip=64.147.123.19; dkim=pass header.d=jpgrayson.net header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=jpgrayson.net; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1670676994; bh=yUdnL++xMquLyKgemQten+D1/P2T+7CNFMJc40CMRks=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:Subject:Cc:To:From: Date:References:In-Reply-To:Message-ID:MIME-Version:DKIM-Signature: DKIM-Signature:DKIM-Signature; b=mQyJd1AbZsZ/zyLtz3VRIo0R/YSeWUdaUWhGBRC6+ekXCCRDxaIH5zFLZmRE2RWswIZVyS6lYP mFoRdnm1t+UWXlLDilftWZYB2x1TMiVrjql/GVufM/VNcDkqGFceOECT7Obyden2iwhxdIsc4h VMBHaa/Ka3oTR/AxgHZ/+OZyucJVX9ISC2sJwaHE7IY8KMpJq12dqsxhA3dRkJwgj9fI05Yvt7 w+SGr5vZwzsLy/JnyvGAEvgR+TMSwZ/IF2saea1FWvZ3j6j44GswprTvZvh5oAGTLOK9sxU922 65JEv6+pA+WA4rjPFvBtDsoX40DuKVvsD1ezhv8NmsULuA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:Subject:Cc:To:From:Date:References:In-Reply-To:Message-Id: Mime-Version:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=ZooFS7tOEhQqjDoEY7GvsAVng/Fz3fCkB0hC0We8lmg=; b=JN1WhhTZlRJAl4HqpI+0Y0ZhWK wIe5TtUJRsve2mZETFas49GOlUDKoGktQefG2Vaw+wAf32SVR5ABobYDPV2aB3u9yiuJ8zGqxfRyl SzEHqp24Kn/m9KlY796vW1azvg3S+RA/kCyoQdsoT1aO3U1O6WnGSxUVYMSS5zgJvkP4VuRol3Yb7 xoucXa3YcGF+BfEmv3wsgAKBdkzLfYL4RawLIrJg/XH1EZw09dPSLkGU8C5WZZASN1qHcPuQ3D2d7 CB1E1ZTWS7vSedHrWLDnYcwuypi1ZNsCsb1IyDuNLLYAyq1nFFBEc23MOMpAvt3f9P42aFliqACKI tyxXZh7Q==; Received: by zero.zsh.org with local id 1p3zP7-0001Iv-EW; Sat, 10 Dec 2022 12:56:33 +0000 Authentication-Results: zsh.org; iprev=pass (wout3-smtp.messagingengine.com) smtp.remote-ip=64.147.123.19; dkim=pass header.d=jpgrayson.net header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=jpgrayson.net; arc=none Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:38753) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1p3zOY-000103-Og; Sat, 10 Dec 2022 12:56:00 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id DD755320046E; Sat, 10 Dec 2022 07:55:55 -0500 (EST) Received: from imap48 ([10.202.2.98]) by compute6.internal (MEProxy); Sat, 10 Dec 2022 07:55:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpgrayson.net; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1670676955; x= 1670763355; bh=ZooFS7tOEhQqjDoEY7GvsAVng/Fz3fCkB0hC0We8lmg=; b=d VcEJHOFyGs3XeHagHClyKw3+lnjPxc7nZ2uWSLExGnG6HtvCiV7HrsKHFjdkGn54 QIJHnocYniVWZ0ojMOhrh721eVj3Dako3Bw32wsNtZkk6a4ESYsCSeJKmO/kGcwi HCkoMtDf72yhl8+99sJQB3HOvEHircsDnyVfucBdlazdt1dkZpWRNSjUP6Y0pBEs LmAv0vZzXNpuYcD5V6HzehgYVjm1G5cuIc6HqsXJMXzlJHqzjcJEfgb1OeP4D162 k2IW8vmSOHtrhNwayfQ4Wkdngvv1sfzfYDeG2UGnBwnEEvU/RoHpngFMmNPVd3Be CEbXTOYRsIWdVUYKTfUyg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1670676955; x= 1670763355; bh=ZooFS7tOEhQqjDoEY7GvsAVng/Fz3fCkB0hC0We8lmg=; b=v lv440s2JdOhtMojvUa/rPensjoux6puI8Eiwl6LQQnU8pd1OTPnzBQEVGgaWHr5K wNVw1AEstuRXcWDOLSdcDQ0OgIXVxba7eif8UtaSf+RJcM/JSfZBzrqHG6fROzJE kpVFRL2IglA4N5pvv8ui/IsMqR92Kx1cJLl5slFV9U66FTYiy7t7E6VTlinVl5a2 Yp74GtjaF8Se4MAhNvlj3QPs8wy2QmycFUMw5EeyopcF2uMkjgsAPnZr9SJtevEz V3cBCktGIkyd5wWklJsTkau/8qvckqnVR6uRyC7Rd1cxK6aETmpDSWaEsRNeqSWk Yo1RqgsigAeOWVzRqeM9g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeggdeghecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvfevufgtgfesth hqredtreerjeenucfhrhhomhepfdfrvghtvghrucfirhgrhihsohhnfdcuoehpvghtvges jhhpghhrrgihshhonhdrnhgvtheqnecuggftrfgrthhtvghrnheptefhkedutedthfdvke ejhfehleefkeevudfhvdffveefleetveehveeggfejuddunecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphgvthgvsehjphhgrhgrhihsohhnrd hnvght X-ME-Proxy: Feedback-ID: iefe944c0:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 3FDE831A0063; Sat, 10 Dec 2022 07:55:55 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-1115-g8b801eadce-fm-20221102.001-g8b801ead Mime-Version: 1.0 Message-Id: In-Reply-To: <20221209013754.GU27622@tarpaulin.shahaf.local2> References: <20221116204501.921232-1-pete@jpgrayson.net> <20221208145241.494978-1-pete@jpgrayson.net> <20221208220640.GS27622@tarpaulin.shahaf.local2> <8d776235-9847-4b48-b19d-21023d5178ae@app.fastmail.com> <20221209013754.GU27622@tarpaulin.shahaf.local2> Date: Sat, 10 Dec 2022 07:55:52 -0500 From: "Peter Grayson" To: "Daniel Shahaf" Cc: zsh-workers@zsh.org Subject: Re: [PATCH v3] Updated StGit patch detection in vcs_info Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Seq: 51172 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: On Thu, Dec 8, 2022, at 8:37 PM, Daniel Shahaf wrote: > Peter Grayson wrote on Thu, Dec 08, 2022 at 19:59:15 -0500: >> On Thu, Dec 8, 2022, at 5:06 PM, Daniel Shahaf wrote: >> > 2. The stg codepath doesn't extract patch subjects. The following >> > addresses that for the old stgit version I have packaged in my dist= ro, >> > but I don't know whether it would DTRT for newer versions too. >>=20 >> Newer versions of StGit have the same --description option for `stg >> series` with the same output, so the `stg` command will work across >> versions. >>=20 >> For reference, running `stg series --noprefix --applied >> --description` as is done in the below change will give output of >> the form: >>=20 >> patch1 # Subject of patch1 >> p2 # Subject of p2 >> third # Subject of third patch >>=20 >> I tried the relevant example from vcs_info-examples along with >> this patch. The one problem I'm seeing is that because there is a >> variable amount of space between the last character of the patch >> name and the "#" separator, the `${${(f)"$(stg ...)"}/[#] }` >> substitution captures any extra spaces such that they make their >> way into the final prompt. >>=20 >> This can be resolved by changing the replacement expansion to: >>=20 >> ${${(f)"$(stg ...)"}/ *[#]} >>=20 >> Which is a little clunky, but I don't know how to express "one >> or more spaces followed by a '#'" as a zsh pattern, thus the >> clunky ' *'. But it will work. > > That'd be a =C2=AB#=C2=BB with EXTENDED_GLOB set, which is the case in= this > context. (Docs are at =C2=ABman zshall | less -p 'x#'=C2=BB.) Thus: Thanks for the tip on this extended glob feature--that's really helpful. > [[[...]]] > > I'll go ahead and push that shortly (I just need this message to go > through so I have its X-Seq number). The updated patch seems to work perfectly for me. Good stuff. Thank you again for the collaboration on this! Pete