filterGroupValue: use the existing map of refgroups

Change `filterGroupValue` to use the existing map of reference groups
that has been put together by the `RefGroupBuilder` rather than
reading the gitconfig again. This still doesn't handle nested groups
correctly, but we'll fix that in a moment.

Author: mhagger

git-sizer.go

@@ -166,7 +166,7 @@ func mainImplementation(args []string) error {
 		return err
 	}
 
-	rgb.AddRefopts(flags, configger)
+	rgb.AddRefopts(flags)
 
 	flags.SortFlags = false
 

internal/refopts/filter_group_value.go

@@ -2,64 +2,27 @@ package refopts
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/github/git-sizer/git"
+	"github.com/github/git-sizer/sizes"
 )
 
 type filterGroupValue struct {
-	filter    *git.ReferenceFilter
-	configger Configger
+	filter *git.ReferenceFilter
+	groups map[sizes.RefGroupSymbol]*refGroup
 }
 
-func (v *filterGroupValue) Set(name string) error {
-	// At this point, it is not yet certain that the command was run
-	// inside a Git repository. If not, ignore this option (the
-	// command will error out anyway).
-	if v.configger == nil {
-		fmt.Fprintf(
-			os.Stderr,
-			"warning: not in Git repository; ignoring '--refgroup' option.\n",
-		)
-		return nil
-	}
+func (v *filterGroupValue) Set(symbolString string) error {
+	symbol := sizes.RefGroupSymbol(symbolString)
 
-	config, err := v.configger.Config(fmt.Sprintf("refgroup.%s", name))
-	if err != nil {
-		return err
-	}
-	for _, entry := range config.Entries {
-		switch entry.Key {
-		case "include":
-			*v.filter = git.Include.Combine(
-				*v.filter, git.PrefixFilter(entry.Value),
-			)
-		case "includeregexp":
-			filter, err := git.RegexpFilter(entry.Value)
-			if err != nil {
-				return fmt.Errorf(
-					"invalid regular expression for 'refgroup.%s.%s': %w",
-					name, entry.Key, err,
-				)
-			}
-			*v.filter = git.Include.Combine(*v.filter, filter)
-		case "exclude":
-			*v.filter = git.Exclude.Combine(
-				*v.filter, git.PrefixFilter(entry.Value),
-			)
-		case "excluderegexp":
-			filter, err := git.RegexpFilter(entry.Value)
-			if err != nil {
-				return fmt.Errorf(
-					"invalid regular expression for 'refgroup.%s.%s': %w",
-					name, entry.Key, err,
-				)
-			}
-			*v.filter = git.Exclude.Combine(*v.filter, filter)
-		default:
-			// Ignore unrecognized keys.
-		}
+	refGroup, ok := v.groups[symbol]
+
+	if !ok || symbol == "" {
+		return fmt.Errorf("refgroup '%s' is not defined", symbol)
 	}
+
+	*v.filter = git.Include.Combine(*v.filter, refGroup.filter)
+
 	return nil
 }
 

internal/refopts/ref_group_builder.go

@@ -141,7 +141,7 @@ func splitKey(key string) (sizes.RefGroupSymbol, string) {
 }
 
 // Add some reference-related options to `flags`.
-func (rgb *RefGroupBuilder) AddRefopts(flags *pflag.FlagSet, configger Configger) {
+func (rgb *RefGroupBuilder) AddRefopts(flags *pflag.FlagSet) {
 	tlf := &rgb.topLevelGroup.filter
 	flags.Var(
 		&filterValue{tlf, git.Include, "", false}, "include",
@@ -221,7 +221,7 @@ func (rgb *RefGroupBuilder) AddRefopts(flags *pflag.FlagSet, configger Configger
 	flag.NoOptDefVal = "true"
 
 	flag = flags.VarPF(
-		&filterGroupValue{tlf, configger}, "refgroup", "",
+		&filterGroupValue{tlf, rgb.groups}, "refgroup", "",
 		"process references in refgroup defined by gitconfig",
 	)