@matheusbsbs / matheus-bagliano / commits / c4ea513f4a

rev-list: move --filter parsing into revision.c

Now that 'struct rev_info' has a 'filter' member and most consumers of object filtering are using that member instead of an external struct, move the parsing of the '--filter' option out of builtin/rev-list.c and into revision.c. This use within handle_revision_pseudo_opt() allows us to find the option within setup_revisions() if the arguments are passed directly. In the case of a command such as 'git blame', the arguments are first scanned and checked with parse_revision_opt(), which complains about the option, so 'git blame --filter=blob:none <file>' does not become valid with this change. Some commands, such as 'git diff' gain this option without having it make an effect. And 'git diff --objects' was already possible, but does not actually make sense in that builtin. The key addition that is coming is 'git bundle create --filter=<X>' so we can create bundles containing promisor packs. More work is required to make them fully functional, but that will follow. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Derrick Stolee committed Mar 9, 2022 at 16:01 UTC c4ea513f4aea64e1ab03309dddff046852bddb74

2 files changed +7 -11

builtin/rev-list.c

-11

@@ -591,17 +591,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)

591 show_progress = arg;

592 continue;

593 }

594 -

595 - if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {

596 - parse_list_objects_filter(&revs.filter, arg);

597 - if (revs.filter.choice && !revs.blob_objects)

598 - die(_("object filtering requires --objects"));

599 - continue;

600 - }

601 - if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {

602 - list_objects_filter_set_no_filter(&revs.filter);

603 - continue;

604 - }

594 if (!strcmp(arg, "--filter-provided-objects")) {

595 filter_provided_objects = 1;

596 continue;

revision.c

@@ -32,6 +32,7 @@

32 #include "utf8.h"

33 #include "bloom.h"

34 #include "json-writer.h"

35 +#include "list-objects-filter-options.h"

37 volatile show_early_output_fn_t show_early_output;

@@ -2690,6 +2691,10 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,

2691 revs->no_walk = 0;

2692 } else if (!strcmp(arg, "--single-worktree")) {

2693 revs->single_worktree = 1;

2694 + } else if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {

2695 + parse_list_objects_filter(&revs->filter, arg);

2696 + } else if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {

2697 + list_objects_filter_set_no_filter(&revs->filter);

2698 } else {

2699 return 0;

2700 }

@@ -2894,6 +2899,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s

2899 die("cannot combine --walk-reflogs with history-limiting options");

2900 if (revs->rewrite_parents && revs->children.name)

2901 die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");

2902 + if (revs->filter.choice && !revs->blob_objects)

2903 + die(_("object filtering requires --objects"));

2904

2905 /*

2906 * Limitations on the graph functionality