mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	Use gitrepo.Repository instead of wikipath (#35398)
Now the wikipath will not be referenced directly.
This commit is contained in:
		| @@ -3,7 +3,13 @@ | ||||
|  | ||||
| package git | ||||
|  | ||||
| import "code.gitea.io/gitea/modules/setting" | ||||
| import ( | ||||
| 	"context" | ||||
| 	"strings" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git/gitcmd" | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
| ) | ||||
|  | ||||
| // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat | ||||
| const ( | ||||
| @@ -24,3 +30,48 @@ func (s *SigningKey) String() string { | ||||
| 	setting.PanicInDevOrTesting("don't call SigningKey.String() - it exposes the KeyID which might be a local file path") | ||||
| 	return "SigningKey:" + s.Format | ||||
| } | ||||
|  | ||||
| // GetSigningKey returns the KeyID and git Signature for the repo | ||||
| func GetSigningKey(ctx context.Context, repoPath string) (*SigningKey, *Signature) { | ||||
| 	if setting.Repository.Signing.SigningKey == "none" { | ||||
| 		return nil, nil | ||||
| 	} | ||||
|  | ||||
| 	if setting.Repository.Signing.SigningKey == "default" || setting.Repository.Signing.SigningKey == "" { | ||||
| 		// Can ignore the error here as it means that commit.gpgsign is not set | ||||
| 		value, _, _ := gitcmd.NewCommand("config", "--get", "commit.gpgsign").WithDir(repoPath).RunStdString(ctx) | ||||
| 		sign, valid := ParseBool(strings.TrimSpace(value)) | ||||
| 		if !sign || !valid { | ||||
| 			return nil, nil | ||||
| 		} | ||||
|  | ||||
| 		format, _, _ := gitcmd.NewCommand("config", "--default", SigningKeyFormatOpenPGP, "--get", "gpg.format").WithDir(repoPath).RunStdString(ctx) | ||||
| 		signingKey, _, _ := gitcmd.NewCommand("config", "--get", "user.signingkey").WithDir(repoPath).RunStdString(ctx) | ||||
| 		signingName, _, _ := gitcmd.NewCommand("config", "--get", "user.name").WithDir(repoPath).RunStdString(ctx) | ||||
| 		signingEmail, _, _ := gitcmd.NewCommand("config", "--get", "user.email").WithDir(repoPath).RunStdString(ctx) | ||||
|  | ||||
| 		if strings.TrimSpace(signingKey) == "" { | ||||
| 			return nil, nil | ||||
| 		} | ||||
|  | ||||
| 		return &SigningKey{ | ||||
| 				KeyID:  strings.TrimSpace(signingKey), | ||||
| 				Format: strings.TrimSpace(format), | ||||
| 			}, &Signature{ | ||||
| 				Name:  strings.TrimSpace(signingName), | ||||
| 				Email: strings.TrimSpace(signingEmail), | ||||
| 			} | ||||
| 	} | ||||
|  | ||||
| 	if setting.Repository.Signing.SigningKey == "" { | ||||
| 		return nil, nil | ||||
| 	} | ||||
|  | ||||
| 	return &SigningKey{ | ||||
| 			KeyID:  setting.Repository.Signing.SigningKey, | ||||
| 			Format: setting.Repository.Signing.SigningFormat, | ||||
| 		}, &Signature{ | ||||
| 			Name:  setting.Repository.Signing.SigningName, | ||||
| 			Email: setting.Repository.Signing.SigningEmail, | ||||
| 		} | ||||
| } | ||||
|   | ||||
							
								
								
									
										20
									
								
								modules/gitrepo/clone.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								modules/gitrepo/clone.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | ||||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package gitrepo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| ) | ||||
|  | ||||
| // CloneExternalRepo clones an external repository to the managed repository. | ||||
| func CloneExternalRepo(ctx context.Context, fromRemoteURL string, toRepo Repository, opts git.CloneRepoOptions) error { | ||||
| 	return git.Clone(ctx, fromRemoteURL, repoPath(toRepo), opts) | ||||
| } | ||||
|  | ||||
| // CloneRepoToLocal clones a managed repository to a local path. | ||||
| func CloneRepoToLocal(ctx context.Context, fromRepo Repository, toLocalPath string, opts git.CloneRepoOptions) error { | ||||
| 	return git.Clone(ctx, repoPath(fromRepo), toLocalPath, opts) | ||||
| } | ||||
							
								
								
									
										14
									
								
								modules/gitrepo/commitgraph.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								modules/gitrepo/commitgraph.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package gitrepo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| ) | ||||
|  | ||||
| func WriteCommitGraph(ctx context.Context, repo Repository) error { | ||||
| 	return git.WriteCommitGraph(ctx, repoPath(repo)) | ||||
| } | ||||
| @@ -7,9 +7,12 @@ import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"io/fs" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| 	"code.gitea.io/gitea/modules/git/gitcmd" | ||||
| 	"code.gitea.io/gitea/modules/reqctx" | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
| 	"code.gitea.io/gitea/modules/util" | ||||
| @@ -86,3 +89,12 @@ func RenameRepository(ctx context.Context, repo, newRepo Repository) error { | ||||
| func InitRepository(ctx context.Context, repo Repository, objectFormatName string) error { | ||||
| 	return git.InitRepository(ctx, repoPath(repo), true, objectFormatName) | ||||
| } | ||||
|  | ||||
| func UpdateServerInfo(ctx context.Context, repo Repository) error { | ||||
| 	_, _, err := RunCmdBytes(ctx, repo, gitcmd.NewCommand("update-server-info")) | ||||
| 	return err | ||||
| } | ||||
|  | ||||
| func GetRepoFS(repo Repository) fs.FS { | ||||
| 	return os.DirFS(repoPath(repo)) | ||||
| } | ||||
|   | ||||
							
								
								
									
										14
									
								
								modules/gitrepo/push.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								modules/gitrepo/push.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package gitrepo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| ) | ||||
|  | ||||
| func Push(ctx context.Context, repo Repository, opts git.PushOptions) error { | ||||
| 	return git.Push(ctx, repoPath(repo), opts) | ||||
| } | ||||
							
								
								
									
										14
									
								
								modules/gitrepo/signing.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								modules/gitrepo/signing.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package gitrepo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| ) | ||||
|  | ||||
| func GetSigningKey(ctx context.Context, repo Repository) (*git.SigningKey, *git.Signature) { | ||||
| 	return git.GetSigningKey(ctx, repoPath(repo)) | ||||
| } | ||||
		Reference in New Issue
	
	Block a user