Use git attributes to determine generated and vendored status for language stats and diffs (#16773)
Replaces #16262 Replaces #16250 Replaces #14833 This PR first implements a `git check-attr` pipe reader - using `git check-attr --stdin -z --cached` - taking account of the change in the output format in git 1.8.5 and creates a helper function to read a tree into a temporary index file for that pipe reader. It then wires this in to the language stats helper and into the git diff generation. Files which are marked generated will be folded by default. Fixes #14786 Fixes #12653tokarchuk/v1.17
parent
b83b4fbef9
commit
248b96d8a3
@ -0,0 +1,28 @@ |
||||
// Copyright 2021 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package analyze |
||||
|
||||
import ( |
||||
"path/filepath" |
||||
"strings" |
||||
|
||||
"github.com/go-enry/go-enry/v2/data" |
||||
) |
||||
|
||||
// IsGenerated returns whether or not path is a generated path.
|
||||
func IsGenerated(path string) bool { |
||||
ext := strings.ToLower(filepath.Ext(path)) |
||||
if _, ok := data.GeneratedCodeExtensions[ext]; ok { |
||||
return true |
||||
} |
||||
|
||||
for _, m := range data.GeneratedCodeNameMatchers { |
||||
if m(path) { |
||||
return true |
||||
} |
||||
} |
||||
|
||||
return false |
||||
} |
@ -0,0 +1,159 @@ |
||||
// Copyright 2021 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package git |
||||
|
||||
import ( |
||||
"testing" |
||||
"time" |
||||
|
||||
"github.com/stretchr/testify/assert" |
||||
) |
||||
|
||||
func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) { |
||||
wr := &nulSeparatedAttributeWriter{ |
||||
attributes: make(chan attributeTriple, 5), |
||||
} |
||||
|
||||
testStr := ".gitignore\"\n\x00linguist-vendored\x00unspecified\x00" |
||||
|
||||
n, err := wr.Write([]byte(testStr)) |
||||
|
||||
assert.Equal(t, n, len(testStr)) |
||||
assert.NoError(t, err) |
||||
select { |
||||
case attr := <-wr.ReadAttribute(): |
||||
assert.Equal(t, ".gitignore\"\n", attr.Filename) |
||||
assert.Equal(t, "linguist-vendored", attr.Attribute) |
||||
assert.Equal(t, "unspecified", attr.Value) |
||||
case <-time.After(100 * time.Millisecond): |
||||
assert.Fail(t, "took too long to read an attribute from the list") |
||||
} |
||||
// Write a second attribute again
|
||||
n, err = wr.Write([]byte(testStr)) |
||||
|
||||
assert.Equal(t, n, len(testStr)) |
||||
assert.NoError(t, err) |
||||
|
||||
select { |
||||
case attr := <-wr.ReadAttribute(): |
||||
assert.Equal(t, ".gitignore\"\n", attr.Filename) |
||||
assert.Equal(t, "linguist-vendored", attr.Attribute) |
||||
assert.Equal(t, "unspecified", attr.Value) |
||||
case <-time.After(100 * time.Millisecond): |
||||
assert.Fail(t, "took too long to read an attribute from the list") |
||||
} |
||||
|
||||
//Write a partial attribute
|
||||
_, err = wr.Write([]byte("incomplete-file")) |
||||
assert.NoError(t, err) |
||||
_, err = wr.Write([]byte("name\x00")) |
||||
assert.NoError(t, err) |
||||
|
||||
select { |
||||
case <-wr.ReadAttribute(): |
||||
assert.Fail(t, "There should not be an attribute ready to read") |
||||
case <-time.After(100 * time.Millisecond): |
||||
} |
||||
_, err = wr.Write([]byte("attribute\x00")) |
||||
assert.NoError(t, err) |
||||
select { |
||||
case <-wr.ReadAttribute(): |
||||
assert.Fail(t, "There should not be an attribute ready to read") |
||||
case <-time.After(100 * time.Millisecond): |
||||
} |
||||
|
||||
_, err = wr.Write([]byte("value\x00")) |
||||
assert.NoError(t, err) |
||||
|
||||
attr := <-wr.ReadAttribute() |
||||
assert.Equal(t, "incomplete-filename", attr.Filename) |
||||
assert.Equal(t, "attribute", attr.Attribute) |
||||
assert.Equal(t, "value", attr.Value) |
||||
|
||||
_, err = wr.Write([]byte("shouldbe.vendor\x00linguist-vendored\x00set\x00shouldbe.vendor\x00linguist-generated\x00unspecified\x00shouldbe.vendor\x00linguist-language\x00unspecified\x00")) |
||||
assert.NoError(t, err) |
||||
attr = <-wr.ReadAttribute() |
||||
assert.NoError(t, err) |
||||
assert.EqualValues(t, attributeTriple{ |
||||
Filename: "shouldbe.vendor", |
||||
Attribute: "linguist-vendored", |
||||
Value: "set", |
||||
}, attr) |
||||
attr = <-wr.ReadAttribute() |
||||
assert.NoError(t, err) |
||||
assert.EqualValues(t, attributeTriple{ |
||||
Filename: "shouldbe.vendor", |
||||
Attribute: "linguist-generated", |
||||
Value: "unspecified", |
||||
}, attr) |
||||
attr = <-wr.ReadAttribute() |
||||
assert.NoError(t, err) |
||||
assert.EqualValues(t, attributeTriple{ |
||||
Filename: "shouldbe.vendor", |
||||
Attribute: "linguist-language", |
||||
Value: "unspecified", |
||||
}, attr) |
||||
} |
||||
|
||||
func Test_lineSeparatedAttributeWriter_ReadAttribute(t *testing.T) { |
||||
wr := &lineSeparatedAttributeWriter{ |
||||
attributes: make(chan attributeTriple, 5), |
||||
} |
||||
|
||||
testStr := `".gitignore\"\n": linguist-vendored: unspecified |
||||
` |
||||
n, err := wr.Write([]byte(testStr)) |
||||
|
||||
assert.Equal(t, n, len(testStr)) |
||||
assert.NoError(t, err) |
||||
|
||||
select { |
||||
case attr := <-wr.ReadAttribute(): |
||||
assert.Equal(t, ".gitignore\"\n", attr.Filename) |
||||
assert.Equal(t, "linguist-vendored", attr.Attribute) |
||||
assert.Equal(t, "unspecified", attr.Value) |
||||
case <-time.After(100 * time.Millisecond): |
||||
assert.Fail(t, "took too long to read an attribute from the list") |
||||
} |
||||
|
||||
// Write a second attribute again
|
||||
n, err = wr.Write([]byte(testStr)) |
||||
|
||||
assert.Equal(t, n, len(testStr)) |
||||
assert.NoError(t, err) |
||||
|
||||
select { |
||||
case attr := <-wr.ReadAttribute(): |
||||
assert.Equal(t, ".gitignore\"\n", attr.Filename) |
||||
assert.Equal(t, "linguist-vendored", attr.Attribute) |
||||
assert.Equal(t, "unspecified", attr.Value) |
||||
case <-time.After(100 * time.Millisecond): |
||||
assert.Fail(t, "took too long to read an attribute from the list") |
||||
} |
||||
|
||||
//Write a partial attribute
|
||||
_, err = wr.Write([]byte("incomplete-file")) |
||||
assert.NoError(t, err) |
||||
_, err = wr.Write([]byte("name: ")) |
||||
assert.NoError(t, err) |
||||
select { |
||||
case <-wr.ReadAttribute(): |
||||
assert.Fail(t, "There should not be an attribute ready to read") |
||||
case <-time.After(100 * time.Millisecond): |
||||
} |
||||
_, err = wr.Write([]byte("attribute: ")) |
||||
assert.NoError(t, err) |
||||
select { |
||||
case <-wr.ReadAttribute(): |
||||
assert.Fail(t, "There should not be an attribute ready to read") |
||||
case <-time.After(100 * time.Millisecond): |
||||
} |
||||
_, err = wr.Write([]byte("value\n")) |
||||
assert.NoError(t, err) |
||||
attr := <-wr.ReadAttribute() |
||||
assert.Equal(t, "incomplete-filename", attr.Filename) |
||||
assert.Equal(t, "attribute", attr.Attribute) |
||||
assert.Equal(t, "value", attr.Value) |
||||
} |
Loading…
Reference in new issue