From: Derrick Stolee <stolee@gmail.com> To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org Cc: Derrick Stolee <dstolee@microsoft.com>, Elijah Newren <newren@gmail.com> Subject: Re: [PATCH v2 14/18] unpack-trees: split display_error_msgs() into two Date: Mon, 23 Mar 2020 14:32:47 -0400 Message-ID: <c384a788-9ce8-7a33-9d0d-e5dde746046e@gmail.com> (raw) In-Reply-To: <57679c8e292ceb58cea2b5b7d893d5f47e1e2de0.1584813609.git.gitgitgadget@gmail.com> On 3/21/2020 2:00 PM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@gmail.com> > > display_error_msgs() is never called to show messages of both ERROR_* > and WARNING_* types at the same time; it is instead called multiple > times, separately for each type. Since we want to display these types > differently, make two slightly different versions of this function. > > A subsequent commit will further modify unpack_trees() and how it calls > the new display_warning_msgs(). > > Signed-off-by: Elijah Newren <newren@gmail.com> > --- > t/t1091-sparse-checkout-builtin.sh | 6 ++-- > unpack-trees.c | 50 +++++++++++++++++++++++++----- > unpack-trees.h | 8 +++-- > 3 files changed, 50 insertions(+), 14 deletions(-) > > diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh > index 93c650ac038..0d93d3983e0 100755 > --- a/t/t1091-sparse-checkout-builtin.sh > +++ b/t/t1091-sparse-checkout-builtin.sh > @@ -328,13 +328,13 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' > echo dirty >dirty/folder1/a && > > git -C dirty sparse-checkout init 2>err && > - test_i18ngrep "error.*Cannot update sparse checkout" err && > + test_i18ngrep "warning.*Cannot update sparse checkout" err && > > git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* && > - test_i18ngrep "error.*Cannot update sparse checkout" err && > + test_i18ngrep "warning.*Cannot update sparse checkout" err && > > git -C dirty sparse-checkout disable && > - test_i18ngrep "error.*Cannot update sparse checkout" err && > + test_i18ngrep "warning.*Cannot update sparse checkout" err && I'm very happy this change is so clearly demonstrated by a simple test change like this. > git -C dirty reset --hard && > git -C dirty sparse-checkout init && > diff --git a/unpack-trees.c b/unpack-trees.c > index 0554842580b..9ee04992ac6 100644 > --- a/unpack-trees.c > +++ b/unpack-trees.c > @@ -24,7 +24,7 @@ > * situation better. See how "git checkout" and "git merge" replaces > * them using setup_unpack_trees_porcelain(), for example. > */ > -static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { > +static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { > /* ERROR_WOULD_OVERWRITE */ > "Entry '%s' would be overwritten by merge. Cannot merge.", > > @@ -46,6 +46,9 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { > /* ERROR_WOULD_LOSE_SUBMODULE */ > "Submodule '%s' cannot checkout new HEAD.", > > + /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */ > + "", > + > /* WARNING_SPARSE_NOT_UPTODATE_FILE */ > "Entry '%s' not uptodate. Cannot update sparse checkout.", > > @@ -222,7 +225,7 @@ static int add_rejected_path(struct unpack_trees_options *o, > > /* > * Otherwise, insert in a list for future display by > - * display_error_msgs() > + * display_(error|warning)_msgs() > */ > string_list_append(&o->unpack_rejects[e], path); > return -1; > @@ -233,13 +236,16 @@ static int add_rejected_path(struct unpack_trees_options *o, > */ > static void display_error_msgs(struct unpack_trees_options *o) > { > - int e, i; > - int something_displayed = 0; > + int e; > + unsigned error_displayed = 0; > for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { > struct string_list *rejects = &o->unpack_rejects[e]; > + > if (rejects->nr > 0) { > + int i; > struct strbuf path = STRBUF_INIT; > - something_displayed = 1; > + > + error_displayed = 1; > for (i = 0; i < rejects->nr; i++) > strbuf_addf(&path, "\t%s\n", rejects->items[i].string); > error(ERRORMSG(o, e), super_prefixed(path.buf)); > @@ -247,10 +253,36 @@ static void display_error_msgs(struct unpack_trees_options *o) > } > string_list_clear(rejects, 0); > } > - if (something_displayed) > + if (error_displayed) > fprintf(stderr, _("Aborting\n")); > } > > +/* > + * display all the warning messages stored in a nice way > + */ > +static void display_warning_msgs(struct unpack_trees_options *o) > +{ > + int e; > + unsigned warning_displayed = 0; > + for (e = NB_UNPACK_TREES_ERROR_TYPES+1; super-nit: spaces around '+' > + e < NB_UNPACK_TREES_WARNING_TYPES; e++) { > + struct string_list *rejects = &o->unpack_rejects[e]; > + > + if (rejects->nr > 0) { > + int i; > + struct strbuf path = STRBUF_INIT; > + > + warning_displayed = 1; > + for (i = 0; i < rejects->nr; i++) > + strbuf_addf(&path, "\t%s\n", rejects->items[i].string); > + warning(ERRORMSG(o, e), super_prefixed(path.buf)); > + strbuf_release(&path); > + } > + string_list_clear(rejects, 0); > + } > + if (warning_displayed) > + fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n")); > +} > static int check_submodule_move_head(const struct cache_entry *ce, > const char *old_id, > const char *new_id, > @@ -1705,8 +1737,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options > return ret; > > return_failed: > - if (o->show_all_errors) > + if (o->show_all_errors) { > display_error_msgs(o); > + display_warning_msgs(o); > + } > mark_all_ce_unused(o->src_index); > ret = unpack_failed(o, NULL); > if (o->exiting_early) > @@ -1784,7 +1818,7 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) > ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; > > done: > - display_error_msgs(o); > + display_warning_msgs(o); > o->show_all_errors = old_show_all_errors; > if (free_pattern_list) > clear_pattern_list(&pl); > diff --git a/unpack-trees.h b/unpack-trees.h > index 3c6452fe9e5..d91c65ae453 100644 > --- a/unpack-trees.h > +++ b/unpack-trees.h > @@ -24,10 +24,12 @@ enum unpack_trees_error_types { > ERROR_BIND_OVERLAP, > ERROR_WOULD_LOSE_SUBMODULE, > > + NB_UNPACK_TREES_ERROR_TYPES, > + I think this is a very clever way to partition the enum. > WARNING_SPARSE_NOT_UPTODATE_FILE, > WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, > > - NB_UNPACK_TREES_ERROR_TYPES, > + NB_UNPACK_TREES_WARNING_TYPES, > }; > > enum update_sparsity_result { > @@ -73,13 +75,13 @@ struct unpack_trees_options { > struct dir_struct *dir; > struct pathspec *pathspec; > merge_fn_t fn; > - const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; > + const char *msgs[NB_UNPACK_TREES_WARNING_TYPES]; > struct argv_array msgs_to_free; > /* > * Store error messages in an array, each case > * corresponding to a error message type > */ > - struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES]; > + struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES]; > > int head_idx; > int merge_size; LGTM other than my really nitty nit-pick. Feel free to ignore. -Stolee
next prev parent reply other threads:[~2020-03-23 18:32 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-14 7:11 [PATCH 0/7] Sparse checkout improvements -- improved sparsity updating Elijah Newren via GitGitGadget 2020-03-14 7:11 ` [PATCH 1/7] unpack-trees: fix minor typo in comment Elijah Newren via GitGitGadget 2020-03-14 7:11 ` [PATCH 2/7] t1091: make some tests a little more defensive against failures Elijah Newren via GitGitGadget 2020-03-14 7:11 ` [PATCH 3/7] unpack-trees: allow check_updates() to work on a different index Elijah Newren via GitGitGadget 2020-03-14 7:11 ` [PATCH 4/7] unpack-trees: do not mark a dirty path with SKIP_WORKTREE Elijah Newren via GitGitGadget 2020-03-15 14:39 ` Derrick Stolee 2020-03-14 7:11 ` [PATCH 5/7] unpack-trees: add a new update_sparsity() function Elijah Newren via GitGitGadget 2020-03-15 18:17 ` Derrick Stolee 2020-03-16 20:24 ` Elijah Newren 2020-03-14 7:11 ` [PATCH 6/7] sparse-checkout: use " Elijah Newren via GitGitGadget 2020-03-15 16:19 ` Derrick Stolee 2020-03-16 17:02 ` Elijah Newren 2020-03-14 7:11 ` [PATCH 7/7] sparse-checkout: provide a new update subcommand Elijah Newren via GitGitGadget 2020-03-15 16:24 ` Derrick Stolee 2020-03-16 17:05 ` Elijah Newren 2020-03-16 17:18 ` Derrick Stolee 2020-03-16 19:23 ` Elijah Newren 2020-03-15 12:26 ` [PATCH 0/7] Sparse checkout improvements -- improved sparsity updating Derrick Stolee 2020-03-21 17:59 ` [PATCH v2 00/18] " Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 01/18] unpack-trees: fix minor typo in comment Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 02/18] unpack-trees: remove unused error type Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 03/18] unpack-trees: simplify verify_absent_sparse() Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 04/18] unpack-trees: simplify pattern_list freeing Elijah Newren via GitGitGadget 2020-03-23 15:57 ` Derrick Stolee 2020-03-21 17:59 ` [PATCH v2 05/18] t1091: make some tests a little more defensive against failures Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 06/18] unpack-trees: allow check_updates() to work on a different index Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 07/18] unpack-trees: do not mark a dirty path with SKIP_WORKTREE Elijah Newren via GitGitGadget 2020-03-21 17:59 ` [PATCH v2 08/18] unpack-trees: pull sparse-checkout pattern reading into a new function Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 09/18] unpack-trees: add a new update_sparsity() function Elijah Newren via GitGitGadget 2020-03-23 18:02 ` Derrick Stolee 2020-03-23 18:10 ` Elijah Newren 2020-03-23 18:21 ` Derrick Stolee 2020-03-23 20:24 ` Junio C Hamano 2020-03-21 18:00 ` [PATCH v2 10/18] sparse-checkout: use " Elijah Newren via GitGitGadget 2020-03-23 18:07 ` Derrick Stolee 2020-03-23 18:14 ` Elijah Newren 2020-03-23 18:22 ` Derrick Stolee 2020-03-21 18:00 ` [PATCH v2 11/18] sparse-checkout: use improved unpack_trees porcelain messages Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 12/18] unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 13/18] unpack-trees: rename ERROR_* fields meant for warnings to WARNING_* Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 14/18] unpack-trees: split display_error_msgs() into two Elijah Newren via GitGitGadget 2020-03-23 18:32 ` Derrick Stolee [this message] 2020-03-21 18:00 ` [PATCH v2 15/18] unpack-trees: make sparse path messages sound like warnings Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 16/18] unpack-trees: provide warnings on sparse updates for unmerged paths too Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 17/18] unpack-trees: failure to set SKIP_WORKTREE bits always just a warning Elijah Newren via GitGitGadget 2020-03-21 18:00 ` [PATCH v2 18/18] sparse-checkout: provide a new reapply subcommand Elijah Newren via GitGitGadget 2020-03-23 18:40 ` Derrick Stolee 2020-03-23 18:41 ` [PATCH v2 00/18] Sparse checkout improvements -- improved sparsity updating Derrick Stolee 2020-03-23 20:26 ` Junio C Hamano 2020-03-27 0:48 ` [PATCH v3 " Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 01/18] unpack-trees: fix minor typo in comment Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 02/18] unpack-trees: remove unused error type Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 03/18] unpack-trees: simplify verify_absent_sparse() Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 04/18] unpack-trees: simplify pattern_list freeing Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 05/18] t1091: make some tests a little more defensive against failures Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 06/18] unpack-trees: allow check_updates() to work on a different index Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 07/18] unpack-trees: do not mark a dirty path with SKIP_WORKTREE Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 08/18] unpack-trees: pull sparse-checkout pattern reading into a new function Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 09/18] unpack-trees: add a new update_sparsity() function Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 10/18] sparse-checkout: use " Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 11/18] sparse-checkout: use improved unpack_trees porcelain messages Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 12/18] unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 13/18] unpack-trees: rename ERROR_* fields meant for warnings to WARNING_* Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 14/18] unpack-trees: split display_error_msgs() into two Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 15/18] unpack-trees: make sparse path messages sound like warnings Elijah Newren via GitGitGadget 2020-03-27 0:48 ` [PATCH v3 16/18] unpack-trees: provide warnings on sparse updates for unmerged paths too Elijah Newren via GitGitGadget 2020-03-27 0:49 ` [PATCH v3 17/18] unpack-trees: failure to set SKIP_WORKTREE bits always just a warning Elijah Newren via GitGitGadget 2020-03-27 0:49 ` [PATCH v3 18/18] sparse-checkout: provide a new reapply subcommand Elijah Newren via GitGitGadget 2020-03-27 13:22 ` [PATCH v3 00/18] Sparse checkout improvements -- improved sparsity updating Derrick Stolee
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c384a788-9ce8-7a33-9d0d-e5dde746046e@gmail.com \ --to=stolee@gmail.com \ --cc=dstolee@microsoft.com \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=newren@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror http://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ http://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git