git/userdiff.c, branch v2.29.2

userdiff: improve Fortran xfuncname regex

2020-08-13T18:21:18Z

The third part of the Fortran xfuncname regex wants to match the beginning of a subroutine or function, so it allows for all characters except `'`, `"` or whitespace before the keyword 'function' or 'subroutine'. This is meant to match the 'recursive', 'elemental' or 'pure' keywords, as well as function return types, and to prevent matches inside strings. However, the negated set does not contain the `!` comment character, so a line with an end-of-line comment containing the keyword 'function' or 'subroutine' followed by another word is mistakenly chosen as a hunk header. Improve the regex by adding `!` to the negated set. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

userdiff: add tests for Fortran xfuncname regex

2020-08-13T18:21:17Z

The Fortran userdiff patterns, introduced in 909a5494f8 (userdiff.c: add builtin fortran regex patterns, 2010-09-10), predate the test infrastructure for xfuncname patterns, introduced in bfa7d01413 (t4018: an infrastructure to test hunk headers, 2014-03-21). Add tests for the Fortran xfuncname patterns. The test 't/t4018/fortran-comment-keyword' documents a shortcoming of the regex that is fixed in a subsequent commit. While at it, add descriptive comments for the different parts of the regex. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

Merge branch 'ah/userdiff-markdown'

2020-05-08T21:25:01Z

The userdiff patterns for Markdown documents have been added. * ah/userdiff-markdown: userdiff: support Markdown

userdiff: support Markdown

2020-05-03T01:04:12Z

It's typical to find Markdown documentation alongside source code, and having better context for documentation changes is useful; see also commit 69f9c87d4 (userdiff: add support for Fountain documents, 2015-07-21). The pattern is based on the CommonMark specification 0.29, section 4.2 but doesn't match empty headings, as seeing them in a hunk header is unlikely to be useful. Only ATX headings are supported, as detecting setext headings would require printing the line before a pattern matches, or matching a multiline pattern. The word-diff pattern is the same as the pattern for HTML, because many Markdown parsers accept inline HTML. Signed-off-by: Ash Holland Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

parse_config_key(): return subsection len as size_t

2020-04-10T21:44:29Z

We return the length to a subset of a string using an "int *" out-parameter. This is fine most of the time, as we'd expect config keys to be relatively short, but it could behave oddly if we had a gigantic config key. A more appropriate type is size_t. Let's switch over, which lets our callers use size_t as appropriate (they are bound by our type because they must pass the out-parameter as a pointer). This is mostly just a cleanup to make it clear this code handles long strings correctly. In practice, our config parser already chokes on long key names (because of a similar int/size_t mixup!). When doing an int/size_t conversion, we have to be careful that nobody was trying to assign a negative value to the variable. I manually confirmed that for each case here. They tend to just feed the result to xmemdupz() or similar; in a few cases I adjusted the parameter types for helper functions to make sure the size_t is preserved. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ln/userdiff-elixir'

2019-12-25T19:21:59Z

Hotfix. * ln/userdiff-elixir: userdiff: remove empty subexpression from elixir regex

userdiff: remove empty subexpression from elixir regex

2019-12-13T20:20:48Z

The regex failed to compile on FreeBSD. Also add /* -- */ mark to separate the two regex entries given to the PATTERNS() macro, to make it consistent with patterns for other content types. Signed-off-by: Ed Maste Reviewed-by: Jeff King Helped-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'jh/userdiff-python-async'

2019-12-05T20:52:44Z

The userdiff machinery has been taught that "async def" is another way to begin a "function" in Python. * jh/userdiff-python-async: userdiff: support Python async functions

userdiff: support Python async functions

2019-11-20T07:31:43Z

Python's async functions (declared with "async def" rather than "def") were not being displayed in hunk headers. This commit teaches git about the async function syntax, and adds tests for the Python userdiff regex. Signed-off-by: Josh Holland Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

userdiff: add Elixir to supported userdiff languages

2019-11-10T06:26:26Z

Adds support for xfuncref in Elixir[1] language which is Ruby-like language that runs on Erlang[3] Virtual Machine (BEAM). [1]: https://elixir-lang.org [2]: https://www.erlang.org Signed-off-by: Łukasz Niemier Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano