HistorySize: output counts of references per reference group

Author: mhagger

git-sizer.go

@@ -494,7 +494,7 @@ func mainImplementation(args []string) error {
 		case 1:
 			j, err = json.MarshalIndent(historySize, "", "    ")
 		case 2:
-			j, err = historySize.JSON(threshold, nameStyle)
+			j, err = historySize.JSON(rg.Groups(), threshold, nameStyle)
 		default:
 			return fmt.Errorf("JSON version must be 1 or 2")
 		}
@@ -503,7 +503,10 @@ func mainImplementation(args []string) error {
 		}
 		fmt.Printf("%s\n", j)
 	} else {
-		io.WriteString(os.Stdout, historySize.TableString(threshold, nameStyle))
+		io.WriteString(
+			os.Stdout,
+			historySize.TableString(rg.Groups(), threshold, nameStyle),
+		)
 	}
 
 	return nil

sizes/graph.go

@@ -49,7 +49,7 @@ type refSeen struct {
 func ScanRepositoryUsingGraph(
 	repo *git.Repository, rg RefGrouper, nameStyle NameStyle, progress bool,
 ) (HistorySize, error) {
-	graph := NewGraph(nameStyle)
+	graph := NewGraph(rg, nameStyle)
 	var progressMeter meter.Progress
 	if progress {
 		progressMeter = meter.NewProgressMeter(100 * time.Millisecond)
@@ -383,6 +383,8 @@ func ScanRepositoryUsingGraph(
 type Graph struct {
 	repo *git.Repository
 
+	rg RefGrouper
+
 	blobLock  sync.Mutex
 	blobSizes map[git.OID]BlobSize
 
@@ -404,8 +406,10 @@ type Graph struct {
 	pathResolver PathResolver
 }
 
-func NewGraph(nameStyle NameStyle) *Graph {
+func NewGraph(rg RefGrouper, nameStyle NameStyle) *Graph {
 	return &Graph{
+		rg: rg,
+
 		blobSizes: make(map[git.OID]BlobSize),
 
 		treeRecords: make(map[git.OID]*treeRecord),

sizes/output.go

@@ -345,8 +345,10 @@ type table struct {
 	buf           bytes.Buffer
 }
 
-func (s HistorySize) TableString(threshold Threshold, nameStyle NameStyle) string {
-	contents := s.contents()
+func (s HistorySize) TableString(
+	refGroups []RefGroup, threshold Threshold, nameStyle NameStyle,
+) string {
+	contents := s.contents(refGroups)
 	t := table{
 		threshold: threshold,
 		nameStyle: nameStyle,
@@ -422,19 +424,41 @@ func (t *table) formatRow(
 	)
 }
 
-func (s HistorySize) JSON(threshold Threshold, nameStyle NameStyle) ([]byte, error) {
-	contents := s.contents()
+func (s HistorySize) JSON(
+	refGroups []RefGroup, threshold Threshold, nameStyle NameStyle,
+) ([]byte, error) {
+	contents := s.contents(refGroups)
 	items := make(map[string]*item)
 	contents.CollectItems(items)
 	j, err := json.MarshalIndent(items, "", "    ")
 	return j, err
 }
 
-func (s HistorySize) contents() tableContents {
+func (s HistorySize) contents(refGroups []RefGroup) tableContents {
 	S := newSection
 	I := newItem
 	metric := counts.Metric
 	binary := counts.Binary
+
+	var rgis []tableContents
+	for _, rg := range refGroups {
+		if rg.Symbol == "" {
+			continue
+		}
+		count, ok := s.ReferenceGroups[rg.Symbol]
+		if !ok {
+			continue
+		}
+		rgis = append(
+			rgis,
+			I(
+				fmt.Sprintf("refgroup.%s", rg.Symbol), rg.Name,
+				fmt.Sprintf("The number of references in group '%s'", rg.Symbol),
+				nil, *count, metric, "", 25000,
+			),
+		)
+	}
+
 	return S(
 		"",
 		S(
@@ -484,6 +508,10 @@ func (s HistorySize) contents() tableContents {
 				I("referenceCount", "Count",
 					"The total number of references",
 					nil, s.ReferenceCount, metric, "", 25e3),
+				S(
+					"",
+					rgis...,
+				),
 			),
 		),