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

Re: [PATCH 0/4] A few Asciidoctor-fixes

From
MÅMartin Ågren <martin.agren@gmail.com>
Date
Dec 16, 2018, 14:34 UTC
Message-ID
<CAN0heSrccWop+KRKFCTNHTB43XcAv+Q8X7p0hT1t2+rPjS1THA@mail.gmail.com>
In-Reply-To
<20181216104458.GC13704@sigill.intra.peff.net>
On Sun, 16 Dec 2018 at 11:45, Jeff King <peff@peff.net> wrote:
Show 8 quoted lines
>
> On Sat, Dec 15, 2018 at 12:27:38PM +0100, Martin Ågren wrote:
> I think the relevant bits from [1] are:
>
>  * Use `make --always-make ... install-man` in doc-diff.
>  * ./doc-diff -f HEAD HEAD # note -f
>  * Add empty commit and tweak config.mak
>  * ./doc-diff HEAD^ HEAD # note no -f
Yes, that's it.
Show 15 quoted lines
> To make this easier, it would make sense to me to:
>
>   - teach doc-diff a flag for marking one or both of the endpoints to be
>     built with asciidoctor versus asciidoc
>
>   - mark the asciidoc/asciidoctor in the directory name. That name
>     serves as a cache key for avoiding re-doing the work, you should be
>     able to just:
>
>       ./doc-diff --asciidoctor HEAD HEAD
>
>     and actually build and compare what you want.
>
>   - it sounds from "make --always-make" that our Makefile does not
>     properly rebuild when we switch from asciidoc to asciidoctor. That
Exactly.
>     might be nice to fix with a mechanism similar to the GIT-BUILD-FLAGS
>     we use in the top-level Makefile.

Agreed on all three points. The last one would supposedly be useful on its own, beyond this doc-diff motivation.

Your list seems complete to me in terms of "how could we teach doc-diff to diff asciidoctor vs asciidoc?". For the resulting diff to actually be useful ;-) there are two more outstanding issues that I see:

  - Headers and footers. Asciidoc (driven by doc-diff) uses some
    boilerplate values which avoid timestamps and the like. Asciidoctor
    partly uses different values, partly interprets the ones given
    differently.
  - Asciidoctor introduces a space after linkgit:foo , e.g., before
    punctuation.

Both of these are problems in their own right, so they probably shouldn't be suppressed in the resulting diff. But as long as these issues remain, they produce a lot of noise which might hide more interesting (IMHO) differences.

Martin
Previous: Jeff KingNext: Jeff King
Message 17 of 18 in “A few Asciidoctor-fixes”
  1. 0/4 A few Asciidoctor-fixesMartin Ågren, Dec 15, 2018
  2. 1/4 git-column.txt: fix section headerMartin Ågren, Dec 15, 2018
  3. Jeff KingDec 16, 2018
  4. Martin ÅgrenDec 16, 2018
  5. 2/4 git-init.txt: do not nest open blocksMartin Ågren, Dec 15, 2018
  6. Jeff KingDec 16, 2018
  7. 3/4 rev-list-options.txt: do not nest open blocksMartin Ågren, Dec 15, 2018
  8. Jeff KingDec 16, 2018
  9. 4/4 git-status.txt: render tables correctly under AsciidoctorMartin Ågren, Dec 15, 2018
  10. Jeff KingDec 16, 2018
  11. 0/3 A few Asciidoctor-fixesMartin Ågren, Dec 16, 2018
  12. 1/3 git-column.txt: fix section headerMartin Ågren, Dec 16, 2018
  13. 2/3 Documentation: do not nest open blocksMartin Ågren, Dec 16, 2018
  14. 3/3 git-status.txt: render tables correctly under AsciidoctorMartin Ågren, Dec 16, 2018
  15. Jeff KingDec 16, 2018
  16. Jeff KingDec 16, 2018
  17. Martin ÅgrenDec 16, 2018
  18. Jeff KingDec 16, 2018

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.