Skip to content

Commit 55a860f

Browse files
committed
ReferenceFilter: consider only the reference name
That's all we need right now, and it will make the thing easier to test.
1 parent 1865f33 commit 55a860f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

git-sizer.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ func mainImplementation(args []string) error {
300300
if showRefs {
301301
oldRefFilter := refFilter
302302
fmt.Fprintf(os.Stderr, "References (included references marked with '+'):\n")
303-
refFilter = func(ref git.Reference) bool {
304-
b := oldRefFilter(ref)
303+
refFilter = func(refname string) bool {
304+
b := oldRefFilter(refname)
305305
if b {
306-
fmt.Fprintf(os.Stderr, "+ %s\n", ref.Refname)
306+
fmt.Fprintf(os.Stderr, "+ %s\n", refname)
307307
} else {
308-
fmt.Fprintf(os.Stderr, " %s\n", ref.Refname)
308+
fmt.Fprintf(os.Stderr, " %s\n", refname)
309309
}
310310
return b
311311
}

git/ref_filter.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"strings"
66
)
77

8-
type ReferenceFilter func(Reference) bool
8+
type ReferenceFilter func(refname string) bool
99

10-
func AllReferencesFilter(_ Reference) bool {
10+
func AllReferencesFilter(_ string) bool {
1111
return true
1212
}
1313

@@ -43,10 +43,10 @@ func (ief *IncludeExcludeFilter) Exclude(f ReferenceFilter) {
4343
ief.filters = append(ief.filters, polarizedFilter{Exclude, f})
4444
}
4545

46-
func (ief *IncludeExcludeFilter) Filter(r Reference) bool {
46+
func (ief *IncludeExcludeFilter) Filter(refname string) bool {
4747
for i := len(ief.filters); i > 0; i-- {
4848
f := ief.filters[i-1]
49-
if !f.filter(r) {
49+
if !f.filter(refname) {
5050
continue
5151
}
5252
return f.polarity == Include
@@ -66,14 +66,14 @@ func (ief *IncludeExcludeFilter) Filter(r Reference) bool {
6666
// "refs/foobar".
6767
func PrefixFilter(prefix string) ReferenceFilter {
6868
if strings.HasSuffix(prefix, "/") {
69-
return func(r Reference) bool {
70-
return strings.HasPrefix(r.Refname, prefix)
69+
return func(refname string) bool {
70+
return strings.HasPrefix(refname, prefix)
7171
}
7272
}
7373

74-
return func(r Reference) bool {
75-
return strings.HasPrefix(r.Refname, prefix) &&
76-
(len(r.Refname) == len(prefix) || r.Refname[len(prefix)] == '/')
74+
return func(refname string) bool {
75+
return strings.HasPrefix(refname, prefix) &&
76+
(len(refname) == len(prefix) || refname[len(prefix)] == '/')
7777
}
7878
}
7979

@@ -87,7 +87,7 @@ func RegexpFilter(pattern string) (ReferenceFilter, error) {
8787
return nil, err
8888
}
8989

90-
return func(r Reference) bool {
91-
return re.MatchString(r.Refname)
90+
return func(refname string) bool {
91+
return re.MatchString(refname)
9292
}, nil
9393
}

sizes/graph.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func ScanRepositoryUsingGraph(
6262
if !ok {
6363
break
6464
}
65-
if !filter(ref) {
65+
if !filter(ref.Refname) {
6666
continue
6767
}
6868
refs = append(refs, ref)

0 commit comments

Comments
 (0)