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

Re: [PATCH 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Dec 19, 2022, 20:42 UTC
Message-ID
<a6efeaa9-0995-1d1e-a557-e320fbfe5d2b@dunelm.org.uk>
In-Reply-To
<221219.86cz8fzara.gmgdl@evledraar.gmail.com>
On 19/12/2022 15:11, Ævar Arnfjörð Bjarmason wrote:
Show 29 quoted lines
> 
> On Mon, Dec 19 2022, Phillip Wood wrote:
> 
>> Hi Ævar
>>
>> On 15/12/2022 09:58, Ævar Arnfjörð Bjarmason wrote:
>>> My recent now-landed topic[1] to remove most use of
>>> "USE_THE_INDEX_COMPATIBILITY_MACROS" was merged in 041df69edd3 (Merge
>>> branch 'ab/fewer-the-index-macros', 2022-11-28).
>>> It left out use of the macros that would have conflicted with
>>> in-flight changes, but as those topics have landed we can now complete
>>> the migration.
>>> As before this is almost entirely a matter of applying the existing
>>> "pending" coccinelle rules, the exceptions being 1/6, and the *.h
>>> changes where we remove the macro definitions (the macro users being
>>> edited by coccinelle).
>>> The 4-5/6 then handle some edge cases we had left (but the code
>>> change
>>> itself is done by coccinelle).
>>
>> I've only given these patches a quick scan, but I think they look
>> good. None of the callers that are converted here are in library code
>> so using the_index makes perfect sense.
> 
> Thanks for the review.
> 
> That's correct, although even if that were the case that wouldn't be an
> issue with this migration, as we'd have been using "the_index" before,
> just indirectly through a macro.

Indeed, I'm just not convinced that it is worth removing the macro in library code without changing to take a struct istate (I don't see the existence of the macro itself as a problem as I think it is just a symptom of the real problem) but I seem to be in the minority on that point.

Best Wishes
Phillip
Show 12 quoted lines
> That wasn't the case here, but I do I have another similar migration for
> migrating "the_repository" wrappers.
> 
> In those cases there's surely instances where e.g. we really should be
> using a "r" argument instead, but I've opted to leave that question out,
> as it would make the coccinelle rules involved & diffs much harder to
> deal with.
> 
> And because in the end the result is the same if viewed with "cc -E",
> i.e. these are just the macro shims we've been meaning to stop using for
> a while.
> 
Previous: Ævar Arnfjörð BjarmasonNext: Junio C Hamano
Message 10 of 23 in “remove USE_THE_INDEX_COMPATIBILITY_MACROS”
  1. 0/6 remove USE_THE_INDEX_COMPATIBILITY_MACROSÆvar Arnfjörð Bjarmason, Dec 15, 2022
  2. 1/6 builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  3. 2/6 cocci & cache.h: fully apply "active_nr" part of index-compatibilityÆvar Arnfjörð Bjarmason, Dec 15, 2022
  4. 3/6 cocci & cache.h: apply pending "index_cache_pos" ruleÆvar Arnfjörð Bjarmason, Dec 15, 2022
  5. 4/6 cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  6. 5/6 cache-tree API: remove redundant update_main_cache_tree()Ævar Arnfjörð Bjarmason, Dec 15, 2022
  7. 6/6 cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  8. Phillip WoodDec 19, 2022
  9. Ævar Arnfjörð BjarmasonDec 19, 2022
  10. Phillip WoodDec 19, 2022
  11. Junio C HamanoDec 20, 2022
  12. Ævar Arnfjörð BjarmasonDec 22, 2022
  13. 0/6 remove USE_THE_INDEX_COMPATIBILITY_MACROSÆvar Arnfjörð Bjarmason, Feb 10, 2023
  14. 1/6 builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  15. Junio C HamanoFeb 10, 2023
  16. 2/6 cocci & cache.h: fully apply "active_nr" part of index-compatibilityÆvar Arnfjörð Bjarmason, Feb 10, 2023
  17. 3/6 cocci & cache.h: apply pending "index_cache_pos" ruleÆvar Arnfjörð Bjarmason, Feb 10, 2023
  18. Junio C HamanoFeb 10, 2023
  19. 4/6 cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  20. 5/6 cache-tree API: remove redundant update_main_cache_tree()Ævar Arnfjörð Bjarmason, Feb 10, 2023
  21. 6/6 cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  22. Junio C HamanoFeb 10, 2023
  23. Junio C HamanoFeb 10, 2023

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.