pr-548/HebaWaly/advice_refactoring-v4
tagged this
24 Feb 15:13
Main changes in V4: * Re-order the commits. * Free the output after using xstrfmt(). ---------------------------------------------------------------------------- Changes in V3: * Remove the new wrapper advice_push_update_rejected_enabled() (which was added in V2 to handle a special case of having a config variable alias), and replace it by adding switch cases to advice_enabled() (The reason behind this change is that another special case came up while I was migrating the rest of the advise calls to the new APIs.) * Remove trailing whitespaces. ---------------------------------------------------------------------------- Main changes in V2: * Rename advise_ng to advise_if_enabled. * Add a new advise_enabled() helper. * Add a list of config variables names to replace advice_config[] (used by list_config_advices()). * Send an enum parameter to the new advise helpers instead of strings. * Extract vadvise() from advise() and advise_if enabled(). ---------------------------------------------------------------------------- The advice API is currently a little bit confusing to call. quoting from [1]: When introducing a new advice message, you would * come up with advice.frotz configuration variable * define and declare advice_frotz global variable that defaults to true * sprinkle calls like this: if (advice_frotz) advise(_("helpful message about frotz")); A new approach was suggested in [1] which this patch is based upon. A new advise_if_enabled() is introduced to gradually replace advise() advice_enabled() helper is also introduced to be used by those callers who: * Only need to check the visibility without calling advise() (they call die() or error() instead for example) * Need to carry out some heavy processing to display an advice, in this case they'll do: if(advice_enabled(advice_type)) advise("some advice message"); To introduce a new advice message, the caller needs to: * Add a new_advice_type to 'enum advice_type' * Come up with a new config variable name and add this name to advice_config_keys[] * Call advise_if_enabled(new_advice_type, "advice message to be printed") * Or call advice_enabled(new_advice_type) first and then follow is by advice("advice message to be printed") as explained earlier. * Add the new config variable to Documentation/config/advice.txt The reason a new list of configuration variables was added to the library is to be used by the list_config_advices() function instead of advice_config[]. And we should get rid of advice_config[] once we migrate all the callers to use the new APIs instead of checking the global variables (which we'll get rid of as well). In the future, we can investigate generating the documentation from the list of config variables or vice versa to make introducing a new advice much easier, but this approach will do it for now. V2 makes the process of introducing a new advice longer than V1 and almost as long as the original library, but having the advice library responsible for checking the message visibility is still an improvement and in my own opinion the new structure makes better sense and makes the library less confusing to use. After this patch the plan is to change the advise() calls to advise_if_enabled() whenever possible, or at least replace the global variables checks by advise_enabled() when advise_if_enabled() is not suitable. [1] https://public-inbox.org/git/xmqqzhf5cw69.fsf@gitster-ct.c.googlers.com/ Heba Waly (3): advice: extract vadvise() from advise() advice: revamp advise API tag: use new advice API to check visibility Makefile | 1 + advice.c | 95 ++++++++++++++++++++++++++++++++++++++---- advice.h | 53 ++++++++++++++++++++++- builtin/tag.c | 5 ++- t/helper/test-advise.c | 19 +++++++++ t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/t0018-advice.sh | 28 +++++++++++++ t/t7004-tag.sh | 1 + 9 files changed, 193 insertions(+), 11 deletions(-) create mode 100644 t/helper/test-advise.c create mode 100755 t/t0018-advice.sh base-commit: c7a62075917b3340f908093f63f1161c44ed1475 Submitted-As: https://lore.kernel.org/git/pull.548.v4.git.1582557199.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.548.git.1581311049547.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.548.v2.git.1581889150.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.548.v3.git.1582144442.gitgitgadget@gmail.com
Assets 2
-
2020-02-24T15:13:19Z -
2020-02-24T15:13:19Z -