Merge branch 'lunny/attribute' of github.com:lunny/gitea into lunny/attribute

lunny · lunny · commit ad4af2dc03b5 · 2025-04-10T22:54:29.000-07:00
diff --git a/modules/git/attribute/attribute.go b/modules/git/attribute/attribute.go
@@ -18,6 +18,7 @@ const (
 	LinguistDetectable    = "linguist-detectable"
 	LinguistLanguage      = "linguist-language"
 	GitlabLanguage        = "gitlab-language"
+	Lockable              = "lockable"
 )
 
 var LinguistAttributes = []string{
diff --git a/modules/git/attribute/batch.go b/modules/git/attribute/batch.go
@@ -27,13 +27,24 @@ type BatchChecker struct {
 }
 
 // NewBatchChecker creates a check attribute reader for the current repository and provided commit ID
-func NewBatchChecker(repo *git.Repository, treeish string, attributes ...string) (checker *BatchChecker, returnedErr error) {
+// If treeish is empty, then it will use current working directory, otherwise it will use the provided treeish on the bare repo
+func NewBatchChecker(repo *git.Repository, treeish string, attributes []string) (checker *BatchChecker, returnedErr error) {
 	ctx, cancel := context.WithCancel(repo.Ctx)
+	defer func() {
+		if returnedErr != nil {
+			cancel()
+		}
+	}()
+
 	cmd, envs, cleanup, err := checkAttrCommand(repo, treeish, nil, attributes)
 	if err != nil {
-		cancel()
 		return nil, err
 	}
+	defer func() {
+		if returnedErr != nil {
+			cleanup()
+		}
+	}()
 
 	cmd.AddArguments("--stdin")
 
@@ -47,11 +58,6 @@ func NewBatchChecker(repo *git.Repository, treeish string, attributes ...string)
 			cleanup()
 		},
 	}
-	defer func() {
-		if returnedErr != nil {
-			checker.cancel()
-		}
-	}()
 
 	stdinReader, stdinWriter, err := os.Pipe()
 	if err != nil {
diff --git a/modules/git/attribute/batch_test.go b/modules/git/attribute/batch_test.go
@@ -122,7 +122,7 @@ func Test_BatchChecker(t *testing.T) {
 
 	t.Run("Create index file to run git check-attr", func(t *testing.T) {
 		defer test.MockVariableValue(&git.DefaultFeatures().SupportCheckAttrOnBare, false)()
-		checker, err := NewBatchChecker(gitRepo, commitID, LinguistAttributes...)
+		checker, err := NewBatchChecker(gitRepo, commitID, LinguistAttributes)
 		assert.NoError(t, err)
 		defer checker.Close()
 		attributes, err := checker.CheckPath("i-am-a-python.p")
@@ -143,7 +143,7 @@ func Test_BatchChecker(t *testing.T) {
 		assert.NoError(t, err)
 		defer tempRepo.Close()
 
-		checker, err := NewBatchChecker(tempRepo, "", LinguistAttributes...)
+		checker, err := NewBatchChecker(tempRepo, "", LinguistAttributes)
 		assert.NoError(t, err)
 		defer checker.Close()
 		attributes, err := checker.CheckPath("i-am-a-python.p")
@@ -157,7 +157,7 @@ func Test_BatchChecker(t *testing.T) {
 	}
 
 	t.Run("Run git check-attr in bare repository", func(t *testing.T) {
-		checker, err := NewBatchChecker(gitRepo, commitID, LinguistAttributes...)
+		checker, err := NewBatchChecker(gitRepo, commitID, LinguistAttributes)
 		assert.NoError(t, err)
 		defer checker.Close()
 
diff --git a/modules/git/attribute/checker.go b/modules/git/attribute/checker.go
@@ -54,6 +54,7 @@ type CheckAttributeOpts struct {
 }
 
 // CheckAttributes return the attributes of the given filenames and attributes in the given treeish.
+// If treeish is empty, then it will use current working directory, otherwise it will use the provided treeish on the bare repo
 func CheckAttributes(ctx context.Context, gitRepo *git.Repository, treeish string, opts CheckAttributeOpts) (map[string]Attributes, error) {
 	cmd, envs, cancel, err := checkAttrCommand(gitRepo, treeish, opts.Filenames, opts.Attributes)
 	if err != nil {
diff --git a/modules/git/languagestats/language_stats_gogit.go b/modules/git/languagestats/language_stats_gogit.go
@@ -42,7 +42,7 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]
 		return nil, err
 	}
 
-	checker, err := attribute.NewBatchChecker(repo, commitID)
+	checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes)
 	if err != nil {
 		return nil, err
 	}
@@ -69,27 +69,27 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]
 
 		attrs, err := checker.CheckPath(f.Name)
 		if err == nil {
-			isVendored = attrs.HasVendored()
+			isVendored = attrs.GetVendored()
 			if isVendored.ValueOrDefault(false) {
 				return nil
 			}
 
-			isGenerated = attrs.HasGenerated()
+			isGenerated = attrs.GetGenerated()
 			if isGenerated.ValueOrDefault(false) {
 				return nil
 			}
 
-			isDocumentation = attrs.HasDocumentation()
+			isDocumentation = attrs.GetDocumentation()
 			if isDocumentation.ValueOrDefault(false) {
 				return nil
 			}
 
-			isDetectable = attrs.HasDetectable()
+			isDetectable = attrs.GetDetectable()
 			if !isDetectable.ValueOrDefault(true) {
 				return nil
 			}
 
-			hasLanguage := attrs.Language()
+			hasLanguage := attrs.GetLanguage()
 			if hasLanguage.Value() != "" {
 				language := hasLanguage.Value()
 
diff --git a/modules/git/languagestats/language_stats_nogogit.go b/modules/git/languagestats/language_stats_nogogit.go
@@ -64,7 +64,7 @@ func GetLanguageStats(repo *git.Repository, commitID string) (map[string]int64,
 		return nil, err
 	}
 
-	checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes...)
+	checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes)
 	if err != nil {
 		return nil, err
 	}
diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go
@@ -135,7 +135,7 @@ func LFSLocks(ctx *context.Context) {
 	}
 	defer gitRepo.Close()
 
-	checker, err := attribute.NewBatchChecker(gitRepo, ctx.Repo.Repository.DefaultBranch, "lockable")
+	checker, err := attribute.NewBatchChecker(gitRepo, ctx.Repo.Repository.DefaultBranch, []string{attribute.Lockable})
 	if err != nil {
 		log.Error("Unable to check attributes in %s (%v)", tmpBasePath, err)
 		ctx.ServerError("LFSLocks", err)
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -1238,7 +1238,7 @@ func GetDiffForRender(ctx context.Context, gitRepo *git.Repository, opts *DiffOp
 		return nil, err
 	}
 
-	checker, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID, attribute.LinguistVendored, attribute.LinguistGenerated, attribute.LinguistLanguage, attribute.GitlabLanguage)
+	checker, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID, []string{attribute.LinguistVendored, attribute.LinguistGenerated, attribute.LinguistLanguage, attribute.GitlabLanguage})
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/repository/files/update.go b/services/repository/files/update.go
@@ -489,7 +489,7 @@ func CreateOrUpdateFile(ctx context.Context, t *TemporaryUploadRepository, file
 	var lfsMetaObject *git_model.LFSMetaObject
 	if setting.LFS.StartServer && hasOldBranch {
 		// Check there is no way this can return multiple infos
-		attributesMap, err := attribute.CheckAttributes(ctx, t.gitRepo, "", attribute.CheckAttributeOpts{
+		attributesMap, err := attribute.CheckAttributes(ctx, t.gitRepo, "" /* use temp repo's working dir */, attribute.CheckAttributeOpts{
 			Attributes: []string{"filter"},
 			Filenames:  []string{file.Options.treePath},
 		})
diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go
@@ -108,7 +108,7 @@ func UploadRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 
 	var attributesMap map[string]attribute.Attributes
 	if setting.LFS.StartServer {
-		attributesMap, err = attribute.CheckAttributes(ctx, t.gitRepo, "", attribute.CheckAttributeOpts{
+		attributesMap, err = attribute.CheckAttributes(ctx, t.gitRepo, "" /* use temp repo's working dir */, attribute.CheckAttributeOpts{
 			Attributes: []string{"filter"},
 			Filenames:  names,
 		})

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ const (`
`18`	`18`	`LinguistDetectable = "linguist-detectable"`
`19`	`19`	`LinguistLanguage = "linguist-language"`
`20`	`20`	`GitlabLanguage = "gitlab-language"`
	`21`	`+ Lockable = "lockable"`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`var LinguistAttributes = []string{`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ type CheckAttributeOpts struct {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// CheckAttributes return the attributes of the given filenames and attributes in the given treeish.`
	`57`	`+// If treeish is empty, then it will use current working directory, otherwise it will use the provided treeish on the bare repo`
`57`	`58`	`func CheckAttributes(ctx context.Context, gitRepo *git.Repository, treeish string, opts CheckAttributeOpts) (map[string]Attributes, error) {`
`58`	`59`	`cmd, envs, cancel, err := checkAttrCommand(gitRepo, treeish, opts.Filenames, opts.Attributes)`
`59`	`60`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]`
`42`	`42`	`return nil, err`
`43`	`43`	`}`
`44`	`44`
`45`		`- checker, err := attribute.NewBatchChecker(repo, commitID)`
	`45`	`+ checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes)`
`46`	`46`	`if err != nil {`
`47`	`47`	`return nil, err`
`48`	`48`	`}`
`@@ -69,27 +69,27 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]`
`69`	`69`
`70`	`70`	`attrs, err := checker.CheckPath(f.Name)`
`71`	`71`	`if err == nil {`
`72`		`- isVendored = attrs.HasVendored()`
	`72`	`+ isVendored = attrs.GetVendored()`
`73`	`73`	`if isVendored.ValueOrDefault(false) {`
`74`	`74`	`return nil`
`75`	`75`	`}`
`76`	`76`
`77`		`- isGenerated = attrs.HasGenerated()`
	`77`	`+ isGenerated = attrs.GetGenerated()`
`78`	`78`	`if isGenerated.ValueOrDefault(false) {`
`79`	`79`	`return nil`
`80`	`80`	`}`
`81`	`81`
`82`		`- isDocumentation = attrs.HasDocumentation()`
	`82`	`+ isDocumentation = attrs.GetDocumentation()`
`83`	`83`	`if isDocumentation.ValueOrDefault(false) {`
`84`	`84`	`return nil`
`85`	`85`	`}`
`86`	`86`
`87`		`- isDetectable = attrs.HasDetectable()`
	`87`	`+ isDetectable = attrs.GetDetectable()`
`88`	`88`	`if !isDetectable.ValueOrDefault(true) {`
`89`	`89`	`return nil`
`90`	`90`	`}`
`91`	`91`
`92`		`- hasLanguage := attrs.Language()`
	`92`	`+ hasLanguage := attrs.GetLanguage()`
`93`	`93`	`if hasLanguage.Value() != "" {`
`94`	`94`	`language := hasLanguage.Value()`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func GetLanguageStats(repo *git.Repository, commitID string) (map[string]int64,`
`64`	`64`	`return nil, err`
`65`	`65`	`}`
`66`	`66`
`67`		`- checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes...)`
	`67`	`+ checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes)`
`68`	`68`	`if err != nil {`
`69`	`69`	`return nil, err`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func LFSLocks(ctx *context.Context) {`
`135`	`135`	`}`
`136`	`136`	`defer gitRepo.Close()`
`137`	`137`
`138`		`- checker, err := attribute.NewBatchChecker(gitRepo, ctx.Repo.Repository.DefaultBranch, "lockable")`
	`138`	`+ checker, err := attribute.NewBatchChecker(gitRepo, ctx.Repo.Repository.DefaultBranch, []string{attribute.Lockable})`
`139`	`139`	`if err != nil {`
`140`	`140`	`log.Error("Unable to check attributes in %s (%v)", tmpBasePath, err)`
`141`	`141`	`ctx.ServerError("LFSLocks", err)`
Original file line number	Diff line number	Diff line change
`@@ -1238,7 +1238,7 @@ func GetDiffForRender(ctx context.Context, gitRepo git.Repository, opts DiffOp`
`1238`	`1238`	`return nil, err`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`		`- checker, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID, attribute.LinguistVendored, attribute.LinguistGenerated, attribute.LinguistLanguage, attribute.GitlabLanguage)`
	`1241`	`+ checker, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID, []string{attribute.LinguistVendored, attribute.LinguistGenerated, attribute.LinguistLanguage, attribute.GitlabLanguage})`
`1242`	`1242`	`if err != nil {`
`1243`	`1243`	`return nil, err`
`1244`	`1244`	`}`