From: Phillip Wood <phillip.wood123@gmail.com>
To: Jeff King <peff@peff.net>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Dragan Simic <dsimic@manjaro.org>,
Kristoffer Haugsbakk <code@khaugsbakk.name>,
Manlio Perillo <manlio.perillo@gmail.com>
Subject: Re: [PATCH 0/15] allow multi-byte core.commentChar
Date: Fri, 8 Mar 2024 11:07:48 +0000 [thread overview]
Message-ID: <b98671d5-e166-4b5b-9cb2-b0c85bca7fd6@gmail.com> (raw)
In-Reply-To: <20240307091407.GA2072522@coredump.intra.peff.net>
Hi Peff
On 07/03/2024 09:14, Jeff King wrote:
> On Wed, Mar 06, 2024 at 03:08:04AM -0500, Jeff King wrote:
>
>> For a more readable series, I'd guess it would make sense to introduce
>> comment_line_str as a separate variable (but continue to enforce the
>> single-char rule), convert the easy cases en masse, the tricky cases one
>> by one, and then finally drop comment_line_char entirely. At which point
>> the config rules can be lifted to allow multi-byte strings.
>
> I ended up cleaning this up. Like I said, this isn't something I'm
> personally that interested in. But it just seemed like a wart that this
> one spot could not handle multi-byte characters that all the cool kids
> are using in their prompts etc these days.
I agree it would be nice to support multibyte comment characters on
principle even if I don't think I'd use that feature myself. I've looked
through the changes to the sequencer and they all look sensible to me.
As I mentioned when looking at patch 11 I do wonder if we want to reject
ascii whitespace and control characters when parsing core.commentChar.
At a minimum leading whitespace and LF anywhere in the comment string
feel like they are asking for trouble.
Best Wishes
Phillip
> Plus it was kind of an interesting puzzle for how to lay out the
> refactoring to make each step self-consistent. At the very least, I
> think the first couple of cleanups are worth it even if we do not see
> the whole thing through. ;)
>
> It obviously nullifies kh/doc-commentchar-is-a-byte, which is in 'next'.
> Sadly "git merge" does not find a conflict with the documentation update
> in patch 15, so we'll have to remember to pick up one topic or the
> other.
>
> I'm using U+00BB as my commentChar for now to see if any bugs show up,
> but I expect I'll get sick of it after a few days.
>
> [01/15]: strbuf: simplify comment-handling in add_lines() helper
> [02/15]: strbuf: avoid static variables in strbuf_add_commented_lines()
> [03/15]: commit: refactor base-case of adjust_comment_line_char()
> [04/15]: strbuf: avoid shadowing global comment_line_char name
>
> These four are cleanups that could be taken independently.
>
> [05/15]: environment: store comment_line_char as a string
>
> This one preps us for incrementally moving code over to the new
> system.
>
> [06/15]: strbuf: accept a comment string for strbuf_stripspace()
> [07/15]: strbuf: accept a comment string for strbuf_commented_addf()
> [08/15]: strbuf: accept a comment string for strbuf_add_commented_lines()
> [09/15]: prefer comment_line_str to comment_line_char for printing
> [10/15]: find multi-byte comment chars in NUL-terminated strings
> [11/15]: find multi-byte comment chars in unterminated buffers
> [12/15]: sequencer: handle multi-byte comment characters when writing todo list
> [13/15]: wt-status: drop custom comment-char stringification
>
> These ones are the actual transition.
>
> [14/15]: environment: drop comment_line_char compatibility macro
> [15/15]: config: allow multi-byte core.commentChar
>
> And then we tie it off by dropping the now-unused bits and loosening
> the config logic.
>
> Documentation/config/core.txt | 4 ++-
> add-patch.c | 14 +++++-----
> builtin/branch.c | 8 +++---
> builtin/commit.c | 19 +++++++-------
> builtin/merge.c | 12 ++++-----
> builtin/notes.c | 10 ++++----
> builtin/rebase.c | 2 +-
> builtin/stripspace.c | 4 +--
> builtin/tag.c | 14 +++++-----
> commit.c | 3 ++-
> config.c | 6 ++---
> environment.c | 2 +-
> environment.h | 2 +-
> fmt-merge-msg.c | 8 +++---
> rebase-interactive.c | 10 ++++----
> sequencer.c | 48 ++++++++++++++++++-----------------
> strbuf.c | 47 ++++++++++++++++++----------------
> strbuf.h | 9 ++++---
> t/t0030-stripspace.sh | 5 ++++
> t/t7507-commit-verbose.sh | 10 ++++++++
> t/t7508-status.sh | 4 ++-
> trailer.c | 6 ++---
> wt-status.c | 31 +++++++++-------------
> 23 files changed, 149 insertions(+), 129 deletions(-)
>
next prev parent reply other threads:[~2024-03-08 11:08 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 8:43 Clarify the meaning of "character" in the documentation Manlio Perillo
2024-03-05 9:00 ` Kristoffer Haugsbakk
2024-03-05 15:32 ` Junio C Hamano
2024-03-05 15:42 ` Dragan Simic
2024-03-05 16:38 ` Junio C Hamano
2024-03-05 17:28 ` Dragan Simic
2024-03-06 8:08 ` [messy PATCH] multi-byte core.commentChar Jeff King
2024-03-07 9:14 ` [PATCH 0/15] allow " Jeff King
2024-03-07 9:15 ` [PATCH 01/15] strbuf: simplify comment-handling in add_lines() helper Jeff King
2024-03-07 9:16 ` [PATCH 02/15] strbuf: avoid static variables in strbuf_add_commented_lines() Jeff King
2024-03-07 9:18 ` [PATCH 03/15] commit: refactor base-case of adjust_comment_line_char() Jeff King
2024-03-07 9:19 ` [PATCH 04/15] strbuf: avoid shadowing global comment_line_char name Jeff King
2024-03-07 9:20 ` [PATCH 05/15] environment: store comment_line_char as a string Jeff King
2024-03-07 9:21 ` [PATCH 06/15] strbuf: accept a comment string for strbuf_stripspace() Jeff King
2024-03-07 9:53 ` Jeff King
2024-03-07 9:22 ` [PATCH 07/15] strbuf: accept a comment string for strbuf_commented_addf() Jeff King
2024-03-07 9:23 ` [PATCH 08/15] strbuf: accept a comment string for strbuf_add_commented_lines() Jeff King
2024-03-07 9:23 ` [PATCH 09/15] prefer comment_line_str to comment_line_char for printing Jeff King
2024-03-07 9:24 ` [PATCH 10/15] find multi-byte comment chars in NUL-terminated strings Jeff King
2024-03-07 9:26 ` [PATCH 11/15] find multi-byte comment chars in unterminated buffers Jeff King
2024-03-07 11:08 ` Jeff King
2024-03-07 19:41 ` René Scharfe
2024-03-07 19:47 ` René Scharfe
2024-03-07 19:42 ` René Scharfe
2024-03-08 10:17 ` Phillip Wood
2024-03-08 15:58 ` Junio C Hamano
2024-03-08 16:20 ` Phillip Wood
2024-03-12 8:19 ` Jeff King
2024-03-12 14:36 ` phillip.wood123
2024-03-13 6:23 ` Jeff King
2024-03-12 8:05 ` Jeff King
2024-03-14 19:37 ` René Scharfe
2024-03-07 9:27 ` [PATCH 12/15] sequencer: handle multi-byte comment characters when writing todo list Jeff King
2024-03-08 10:20 ` Phillip Wood
2024-03-12 8:21 ` Jeff King
2024-03-07 9:28 ` [PATCH 13/15] wt-status: drop custom comment-char stringification Jeff King
2024-03-07 9:30 ` [PATCH 14/15] environment: drop comment_line_char compatibility macro Jeff King
2024-03-07 9:34 ` [PATCH 15/15] config: allow multi-byte core.commentChar Jeff King
2024-03-08 11:07 ` Phillip Wood [this message]
2024-03-12 9:10 ` [PATCH v2 0/16] " Jeff King
2024-03-12 9:17 ` [PATCH v2 01/16] config: forbid newline as core.commentChar Jeff King
2024-03-12 9:17 ` [PATCH v2 02/16] strbuf: simplify comment-handling in add_lines() helper Jeff King
2024-03-12 9:17 ` [PATCH v2 03/16] strbuf: avoid static variables in strbuf_add_commented_lines() Jeff King
2024-03-12 9:17 ` [PATCH v2 04/16] commit: refactor base-case of adjust_comment_line_char() Jeff King
2024-03-12 9:17 ` [PATCH v2 05/16] strbuf: avoid shadowing global comment_line_char name Jeff King
2024-03-12 9:17 ` [PATCH v2 06/16] environment: store comment_line_char as a string Jeff King
2024-03-12 9:17 ` [PATCH v2 07/16] strbuf: accept a comment string for strbuf_stripspace() Jeff King
2024-03-12 9:17 ` [PATCH v2 08/16] strbuf: accept a comment string for strbuf_commented_addf() Jeff King
2024-03-12 9:17 ` [PATCH v2 09/16] strbuf: accept a comment string for strbuf_add_commented_lines() Jeff King
2024-03-12 9:17 ` [PATCH v2 10/16] prefer comment_line_str to comment_line_char for printing Jeff King
2024-03-12 9:17 ` [PATCH v2 11/16] find multi-byte comment chars in NUL-terminated strings Jeff King
2024-03-12 9:17 ` [PATCH v2 12/16] find multi-byte comment chars in unterminated buffers Jeff King
2024-03-12 9:17 ` [PATCH v2 13/16] sequencer: handle multi-byte comment characters when writing todo list Jeff King
2024-03-12 9:17 ` [PATCH v2 14/16] wt-status: drop custom comment-char stringification Jeff King
2024-03-12 9:17 ` [PATCH v2 15/16] environment: drop comment_line_char compatibility macro Jeff King
2024-03-12 9:17 ` [PATCH v2 16/16] config: allow multi-byte core.commentChar Jeff King
2024-03-13 18:23 ` Kristoffer Haugsbakk
2024-03-13 18:39 ` Junio C Hamano
2024-03-15 5:59 ` Jeff King
2024-03-15 7:16 ` Kristoffer Haugsbakk
2024-03-15 8:10 ` Jeff King
2024-03-15 13:30 ` Kristoffer Haugsbakk
2024-03-15 15:40 ` Junio C Hamano
2024-03-16 5:50 ` Jeff King
2024-03-26 22:10 ` Junio C Hamano
2024-03-26 22:12 ` Kristoffer Haugsbakk
2024-03-27 7:46 ` Jeff King
2024-03-27 8:19 ` [PATCH 17/16] config: add core.commentString Jeff King
2024-03-27 12:45 ` Chris Torek
2024-03-27 16:13 ` Junio C Hamano
2024-03-28 9:47 ` Jeff King
2024-03-27 14:53 ` [PATCH v2 16/16] config: allow multi-byte core.commentChar Junio C Hamano
2024-03-12 14:40 ` [PATCH v2 0/16] " phillip.wood123
2024-03-12 20:30 ` Junio C Hamano
2024-03-05 16:58 ` Clarify the meaning of "character" in the documentation Kristoffer Haugsbakk
2024-03-05 17:20 ` Dragan Simic
2024-03-05 17:37 ` Kristoffer Haugsbakk
2024-03-05 21:19 ` Dragan Simic
2024-03-05 16:51 ` Kristoffer Haugsbakk
2024-03-05 17:37 ` Junio C Hamano
2024-03-05 17:49 ` Kristoffer Haugsbakk
2024-03-05 22:48 ` brian m. carlson
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b98671d5-e166-4b5b-9cb2-b0c85bca7fd6@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=code@khaugsbakk.name \
--cc=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=manlio.perillo@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/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://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).