Skip to content

Keep languages defined in .gitattributes #21403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 29, 2022
Merged

Keep languages defined in .gitattributes #21403

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1cdc840
Keep languages from attributes.
KN4CK3R Oct 10, 2022
aba04be
Add suggestion.
KN4CK3R Oct 11, 2022
372c2f8
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-21377
KN4CK3R Oct 11, 2022
180cfcc
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-21377
KN4CK3R Oct 12, 2022
23bdc78
Use set.
KN4CK3R Oct 12, 2022
5e2c94e
Merge branch 'main' into fix-21377
zeripath Oct 12, 2022
3c159b5
Add suggestions.
KN4CK3R Oct 16, 2022
8f5582d
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-21377
KN4CK3R Oct 16, 2022
12a0634
Merge branch 'fix-21377' of https://github.com/KN4CK3R/gitea into fix…
KN4CK3R Oct 16, 2022
3a7aa53
Merge branch 'main' into fix-21377
lafriks Oct 28, 2022
a81abd3
Merge branch 'main' into fix-21377
lunny Oct 28, 2022
1412eab
Merge branch 'main' into fix-21377
lunny Oct 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions modules/git/repo_language_stats_gogit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
defer deferable()

sizes := make(map[string]int64)
explicitIncludedLanguage := make(map[string]struct{})
err = tree.Files().ForEach(func(f *object.File) error {
if f.Size == 0 {
return nil
Expand Down Expand Up @@ -76,7 +77,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
}

sizes[language] += f.Size

explicitIncludedLanguage[language] = struct{}{}
return nil
} else if language, has := attrs["gitlab-language"]; has && language != "unspecified" && language != "" {
// strip off a ? if present
Expand All @@ -91,6 +92,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
}

sizes[language] += f.Size
explicitIncludedLanguage[language] = struct{}{}
return nil
}
}
Expand Down Expand Up @@ -137,7 +139,9 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
for language := range sizes {
langtype := enry.GetLanguageType(language)
if langtype != enry.Programming && langtype != enry.Markup {
delete(sizes, language)
if _, keep := explicitIncludedLanguage[language]; !keep {
delete(sizes, language)
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion modules/git/repo_language_stats_nogogit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
contentBuf := bytes.Buffer{}
var content []byte
sizes := make(map[string]int64)
explicitIncludedLanguage := make(map[string]struct{})
for _, f := range entries {
select {
case <-repo.Ctx.Done():
Expand Down Expand Up @@ -108,6 +109,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
}

sizes[language] += f.Size()
explicitIncludedLanguage[language] = struct{}{}
continue
} else if language, has := attrs["gitlab-language"]; has && language != "unspecified" && language != "" {
// strip off a ? if present
Expand All @@ -122,6 +124,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
}

sizes[language] += f.Size()
explicitIncludedLanguage[language] = struct{}{}
continue
}
}
Expand Down Expand Up @@ -189,7 +192,9 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
for language := range sizes {
langtype := enry.GetLanguageType(language)
if langtype != enry.Programming && langtype != enry.Markup {
delete(sizes, language)
if _, keep := explicitIncludedLanguage[language]; !keep {
delete(sizes, language)
}
}
}
}
Expand Down