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@xxxxxxxxxxxxxxxxxxxxxxxxx/
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
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-548%2FHebaWaly%2Fadvice_refactoring-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-548/HebaWaly/advice_refactoring-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/548
Range-diff vs v3:
2: a2a145c705e ! 1: f668d9b7ca0 advice: extract vadvise() from advise()
@@ -2,9 +2,9 @@
advice: extract vadvise() from advise()
- extract a version of advise() that uses an explict 'va_list' parameter.
- Call it from advise() and advise_if_enabled() for a functionally
- equivalent version.
+ In preparation for a new advice method, extract a version of advise()
+ that uses an explict 'va_list' parameter. Call it from advise() for a
+ functionally equivalent version.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
Signed-off-by: Heba Waly <heba.waly@xxxxxxxxx>
@@ -13,16 +13,11 @@
--- a/advice.c
+++ b/advice.c
@@
- [SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = "submoduleAlternateErrorStrategyDie"
+ { "pushNonFastForward", &advice_push_update_rejected }
};
-void advise(const char *advice, ...)
-+static const char turn_off_instructions[] =
-+N_("\n"
-+ "Disable this message with \"git config %s false\"");
-+
-+static void vadvise(const char *advice, va_list params,
-+ int display_instructions, char *key)
++static void vadvise(const char *advice, va_list params)
{
struct strbuf buf = STRBUF_INIT;
- va_list params;
@@ -31,57 +26,21 @@
- va_start(params, advice);
strbuf_vaddf(&buf, advice, params);
- va_end(params);
-+
-+ if(display_instructions)
-+ strbuf_addf(&buf, turn_off_instructions, key);
for (cp = buf.buf; *cp; cp = np) {
np = strchrnul(cp, '\n');
@@
- }
+ strbuf_release(&buf);
}
--static const char turn_off_instructions[] =
--N_("\n"
-- "Disable this message with \"git config %s false\"");
+void advise(const char *advice, ...)
+{
+ va_list params;
+ va_start(params, advice);
-+ vadvise(advice, params, 0, "");
++ vadvise(advice, params);
+ va_end(params);
+}
-
- void advise_if_enabled(enum advice_type type, const char *advice, ...)
- {
-- struct strbuf buf = STRBUF_INIT;
-- char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]);
- va_list params;
-- const char *cp, *np;
--
-+ char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]);
+
- if(!advice_enabled(type))
- return;
-
- va_start(params, advice);
-- strbuf_vaddf(&buf, advice, params);
-+ vadvise(advice, params, 1, key);
- va_end(params);
--
-- strbuf_addf(&buf, turn_off_instructions, key);
--
-- for (cp = buf.buf; *cp; cp = np) {
-- np = strchrnul(cp, '\n');
-- fprintf(stderr, _("%shint: %.*s%s\n"),
-- advise_get_color(ADVICE_COLOR_HINT),
-- (int)(np - cp), cp,
-- advise_get_color(ADVICE_COLOR_RESET));
-- if (*np)
-- np++;
-- }
-- strbuf_release(&buf);
--
- }
-
int git_default_advice_config(const char *var, const char *value)
+ {
+ const char *k, *slot_name;
1: 4ab141426f3 ! 2: 04c3e5760f6 advice: revamp advise API
@@ -40,24 +40,10 @@
--- a/advice.c
+++ b/advice.c
@@
- int advice_waiting_for_editor = 1;
- int advice_graft_file_deprecated = 1;
- int advice_checkout_ambiguous_remote_branch_name = 1;
--int advice_nested_tag = 1;
- int advice_submodule_alternate_error_strategy_die = 1;
-
- static int advice_use_color = -1;
-@@
- { "waitingForEditor", &advice_waiting_for_editor },
- { "graftFileDeprecated", &advice_graft_file_deprecated },
- { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
-- { "nestedTag", &advice_nested_tag },
- { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
-
- /* make this an alias for backward compatibility */
{ "pushNonFastForward", &advice_push_update_rejected }
};
+-static void vadvise(const char *advice, va_list params)
+static const char *advice_config_keys[] = {
+ [FETCH_SHOW_FORCED_UPDATES] = "fetchShowForcedUpdates",
+ [PUSH_UPDATE_REJECTED] = "pushUpdateRejected",
@@ -92,18 +78,39 @@
+ [SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = "submoduleAlternateErrorStrategyDie"
+};
+
- void advise(const char *advice, ...)
++static const char turn_off_instructions[] =
++N_("\n"
++ "Disable this message with \"git config %s false\"");
++
++static void vadvise(const char *advice, va_list params,
++ int display_instructions, char *key)
{
struct strbuf buf = STRBUF_INIT;
-@@
- strbuf_release(&buf);
- }
+ const char *cp, *np;
+ strbuf_vaddf(&buf, advice, params);
+
++ if(display_instructions)
++ strbuf_addf(&buf, turn_off_instructions, key);
++
+ for (cp = buf.buf; *cp; cp = np) {
+ np = strchrnul(cp, '\n');
+ fprintf(stderr, _("%shint: %.*s%s\n"),
+@@
+ {
+ va_list params;
+ va_start(params, advice);
+- vadvise(advice, params);
++ vadvise(advice, params, 0, "");
++ va_end(params);
++}
++
+static int get_config_value(enum advice_type type)
+{
+ int value = 1;
+ char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]);
+ git_config_get_bool(key, &value);
++ free(key);
+ return value;
+}
+
@@ -118,42 +125,21 @@
+ }
+}
+
-+static const char turn_off_instructions[] =
-+N_("\n"
-+ "Disable this message with \"git config %s false\"");
-+
+void advise_if_enabled(enum advice_type type, const char *advice, ...)
+{
-+ struct strbuf buf = STRBUF_INIT;
+ char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]);
+ va_list params;
-+ const char *cp, *np;
-+
++
+ if(!advice_enabled(type))
+ return;
+
+ va_start(params, advice);
-+ strbuf_vaddf(&buf, advice, params);
-+ va_end(params);
-+
-+ strbuf_addf(&buf, turn_off_instructions, key);
-+
-+ for (cp = buf.buf; *cp; cp = np) {
-+ np = strchrnul(cp, '\n');
-+ fprintf(stderr, _("%shint: %.*s%s\n"),
-+ advise_get_color(ADVICE_COLOR_HINT),
-+ (int)(np - cp), cp,
-+ advise_get_color(ADVICE_COLOR_RESET));
-+ if (*np)
-+ np++;
-+ }
-+ strbuf_release(&buf);
-+
-+}
-+
++ vadvise(advice, params, 1, key);
+ va_end(params);
++ free(key);
+ }
+
int git_default_advice_config(const char *var, const char *value)
- {
- const char *k, *slot_name;
@@
{
int i;
@@ -170,10 +156,7 @@
--- a/advice.h
+++ b/advice.h
@@
- extern int advice_waiting_for_editor;
- extern int advice_graft_file_deprecated;
- extern int advice_checkout_ambiguous_remote_branch_name;
--extern int advice_nested_tag;
+ extern int advice_nested_tag;
extern int advice_submodule_alternate_error_strategy_die;
+/**
@@ -235,21 +218,6 @@
void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
- diff --git a/builtin/tag.c b/builtin/tag.c
- --- a/builtin/tag.c
- +++ b/builtin/tag.c
-@@
- if (type <= OBJ_NONE)
- die(_("bad object type."));
-
-- if (type == OBJ_TAG && advice_nested_tag)
-- advise(_(message_advice_nested_tag), tag, object_ref);
-+ if (type == OBJ_TAG)
-+ advise_if_enabled(NESTED_TAG, _(message_advice_nested_tag), tag, object_ref);
-
- strbuf_addf(&header,
- "object %s\n"
-
diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
new file mode 100644
--- /dev/null
@@ -266,7 +234,10 @@
+
+ setup_git_directory();
+
-+ //use any advice type for testing
++ /*
++ Any advice type can be used for testing, but NESTED_TAG was selected
++ here and in t0018 where this command is being executed.
++ */
+ advise_if_enabled(NESTED_TAG, argv[1]);
+
+ return 0;
@@ -329,15 +300,3 @@
+'
+
+test_done
-
- diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
- --- a/t/t7004-tag.sh
- +++ b/t/t7004-tag.sh
-@@
- hint: already a tag. If you meant to tag the object that it points to, use:
- hint: |
- hint: git tag -f nested annotated-v4.0^{}
-+ hint: Disable this message with "git config advice.nestedTag false"
- EOF
- git tag -m nested nested annotated-v4.0 2>actual &&
- test_i18ncmp expect actual
-: ----------- > 3: 3cc0a17123d tag: use new advice API to check visibility
--
gitgitgadget
