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

Re: [PATCH v3] Updated StGit patch detection in vcs_info



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 distro,
>> > but I don't know whether it would DTRT for newer versions too.
>> 
>> Newer versions of StGit have the same --description option for `stg
>> series` with the same output, so the `stg` command will work across
>> versions.
>> 
>> For reference, running `stg series --noprefix --applied
>> --description` as is done in the below change will give output of
>> the form:
>> 
>>     patch1 # Subject of patch1
>>     p2     # Subject of p2
>>     third  # Subject of third patch
>> 
>> 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.
>> 
>> This can be resolved by changing the replacement expansion to:
>> 
>>     ${${(f)"$(stg ...)"}/ *[#]}
>> 
>> 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 «#» with EXTENDED_GLOB set, which is the case in this
> context.  (Docs are at «man zshall | less -p 'x#'».)  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




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