Rename functions name

Author: lunny

modules/git/remote.go

@@ -10,8 +10,8 @@ import (
 	giturl "code.gitea.io/gitea/modules/git/url"
 )
 
-// GetRemoteURL returns remote url of git repository in the repoPath with special remote name
-func GetRemoteURL(ctx context.Context, repoPath, remoteName string) (string, error) {
+// GetRemoteAddress returns remote url of git repository in the repoPath with special remote name
+func GetRemoteAddress(ctx context.Context, repoPath, remoteName string) (string, error) {
 	err := LoadGitVersion()
 	if err != nil {
 		return "", err
@@ -34,11 +34,11 @@ func GetRemoteURL(ctx context.Context, repoPath, remoteName string) (string, err
 	return result, nil
 }
 
-// GetRemoteAddress returns the url of a specific remote of the repository.
-func GetRemoteAddress(ctx context.Context, repoPath, remoteName string) (*giturl.GitURL, error) {
-	result, err := GetRemoteURL(ctx, repoPath, remoteName)
+// GetRemoteURL returns the url of a specific remote of the repository.
+func GetRemoteURL(ctx context.Context, repoPath, remoteName string) (*giturl.GitURL, error) {
+	addr, err := GetRemoteAddress(ctx, repoPath, remoteName)
 	if err != nil {
 		return nil, err
 	}
-	return giturl.Parse(result)
+	return giturl.Parse(addr)
 }

modules/git/url/url.go

@@ -61,7 +61,7 @@ func Parse(remote string) (*GitURL, error) {
 				lastIndex = i + 1
 			case ':':
 				if !squareBrackets {
-					url.Host = strings.Replace(remote[lastIndex:i], "%25", "%", -1)
+					url.Host = strings.ReplaceAll(remote[lastIndex:i], "%25", "%")
 					if len(remote) <= i+1 {
 						return nil, ErrWrongURLFormat{URL: remote}
 					}

modules/templates/helper.go

@@ -920,7 +920,7 @@ func mirrorRemoteAddress(ctx context.Context, m *repo_model.Repository, remoteNa
 	remoteURL := m.OriginalURL
 	if remoteURL == "" {
 		var err error
-		remoteURL, err = git.GetRemoteURL(ctx, m.RepoPath(), remoteName)
+		remoteURL, err = git.GetRemoteAddress(ctx, m.RepoPath(), remoteName)
 		if err != nil {
 			log.Error("GetRemoteURL %v", err)
 			return a

routers/web/repo/setting.go

@@ -202,7 +202,7 @@ func SettingsPost(ctx *context.Context) {
 			}
 		}
 
-		u, err := git.GetRemoteAddress(ctx, ctx.Repo.Repository.RepoPath(), ctx.Repo.Mirror.GetRemoteName())
+		u, err := git.GetRemoteURL(ctx, ctx.Repo.Repository.RepoPath(), ctx.Repo.Mirror.GetRemoteName())
 		if err != nil {
 			ctx.Data["Err_MirrorAddress"] = true
 			handleSettingRemoteAddrError(ctx, err, form)

services/mirror/mirror_pull.go

@@ -211,7 +211,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 	}
 	gitArgs = append(gitArgs, m.GetRemoteName())
 
-	remoteAddr, remoteErr := git.GetRemoteAddress(ctx, repoPath, m.GetRemoteName())
+	remoteURL, remoteErr := git.GetRemoteURL(ctx, repoPath, m.GetRemoteName())
 	if remoteErr != nil {
 		log.Error("SyncMirrors [repo: %-v]: GetRemoteAddress Error %v", m.Repo, remoteErr)
 		return nil, false
@@ -293,7 +293,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 
 	if m.LFS && setting.LFS.StartServer {
 		log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo)
-		endpoint := lfs.DetermineEndpoint(remoteAddr.String(), m.LFSEndpoint)
+		endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint)
 		lfsClient := lfs.NewClient(endpoint, nil)
 		if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil {
 			log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo, err)

services/mirror/mirror_push.go

@@ -131,7 +131,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
 	timeout := time.Duration(setting.Git.Timeout.Mirror) * time.Second
 
 	performPush := func(path string) error {
-		remoteAddr, err := git.GetRemoteAddress(ctx, path, m.RemoteName)
+		remoteURL, err := git.GetRemoteURL(ctx, path, m.RemoteName)
 		if err != nil {
 			log.Error("GetRemoteAddress(%s) Error %v", path, err)
 			return errors.New("Unexpected error")
@@ -147,7 +147,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
 			}
 			defer gitRepo.Close()
 
-			endpoint := lfs.DetermineEndpoint(remoteAddr.String(), "")
+			endpoint := lfs.DetermineEndpoint(remoteURL.String(), "")
 			lfsClient := lfs.NewClient(endpoint, nil)
 			if err := pushAllLFSObjects(ctx, gitRepo, lfsClient); err != nil {
 				return util.SanitizeErrorCredentialURLs(err)