git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] userdiff: expand detected chunk headers for css

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 7, 2020, 17:09 UTC
Message-ID
<xmqqtuv62ca6.fsf@gitster.c.googlers.com>
In-Reply-To
<pull.866.git.git.1602062726316.gitgitgadget@gmail.com>
"Sohom Datta via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 21 quoted lines
> From: Sohom <sohom.datta@learner.manipal.edu>
>
> Added support for classes, ids, :root selectors
> as well as @-based statements (ex: @page, @media
> and @keyframes ).
>
> Also added tests for the same.
>
> Signed-off-by: Sohom Datta <sohom.datta@learner.manipal.edu>
> ---
>     userdiff: Expand detected chunk headers for css
>     
>     Currently, the regex used for the CSS builtin diff driver in git is only
>     able to show chunk headers for lines that start with a number, a letter
>     or an underscore.
>     
>     However, the regex fails to detect classes (starts with a .), ids
>     (starts with a #), :root and attribute-value based selectors (for
>     example [class*="col-"]), as well as @based block-level statements like 
>     @page,@keyframes and @media since all of them, start with a special
>     character.

The above two would be much better beginning of the log message for this change modulo a few nits.

 - We first explain what the current system does in the present
   tense.  "Currently, " at the beginning is a pure noise.
 - And we point out what may be lacking (which you did a very good
   job in the second paragraph).
 - And finally, we write in imperative mood to give an order to the
   codebase to "become like so." or an order to the patch monkey to
   "make the codebase like so."
As the last paragraph to follow the two paragraphs, something like
    Allow the selectors to begin with these special characters.
would be sufficient.
> -	 "^[_a-z0-9].*$",
> +	 "^(([_a-z0-9]|[:[@.#][_a-z0-9]).*)$",

As we seem to allow ? (i.e. zero or one) in the patterns, it probably makes it easier to read to spell the above like this instead?

- "^[_a-z0-9].*$", + "^[:[@.#]?[_a-z0-9].*$"

Previous: Johannes SixtNext: Sohom Datta via GitGitGadget
Message 3 of 5 in “userdiff: expand detected chunk headers for css”
  1. userdiff: expand detected chunk headers for cssSohom Datta via GitGitGadget, Oct 7, 2020
  2. Johannes SixtOct 7, 2020
  3. Junio C HamanoOct 7, 2020
  4. userdiff: expand detected chunk headers for cssSohom Datta via GitGitGadget, Oct 8, 2020
  5. Junio C HamanoOct 8, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.