Skip to content

Commit 70ef126

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 183cde5 commit 70ef126

File tree

8 files changed

+49
-48
lines changed

8 files changed

+49
-48
lines changed

‎modules/gitrepo/config.go‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"code.gitea.io/gitea/modules/globallock"
1414
)
1515

16-
func GetGitConfig(ctx context.Context, repo Repository, key string) (string, error) {
16+
func GitConfigGet(ctx context.Context, repo Repository, key string) (string, error) {
1717
result, _, err := git.NewCommand("config", "--get").
1818
AddDynamicArguments(key).
1919
RunStdString(ctx, &git.RunOpts{Dir: repoPath(repo)})
@@ -26,13 +26,13 @@ func GetGitConfig(ctx context.Context, repo Repository, key string) (string, err
2626
return result, nil
2727
}
2828

29-
func getRepoConfigLockKey(repoStoragePath string) string {
29+
func repoGitConfigLockKey(repoStoragePath string) string {
3030
return "repo-config:" + repoStoragePath
3131
}
3232

33-
// AddGitConfig add a git configuration key to a specific value for the given repository.
34-
func AddGitConfig(ctx context.Context, repo Repository, key, value string) error {
35-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
33+
// GitConfigAdd add a git configuration key to a specific value for the given repository.
34+
func GitConfigAdd(ctx context.Context, repo Repository, key, value string) error {
35+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
3636
if err != nil {
3737
return err
3838
}
@@ -44,24 +44,24 @@ func AddGitConfig(ctx context.Context, repo Repository, key, value string) error
4444
return err
4545
}
4646

47-
// UpdateGitConfig updates a git configuration key to a specific value for the given repository.
47+
// GitConfigSet updates a git configuration key to a specific value for the given repository.
4848
// If the key does not exist, it will be created.
4949
// If the key exists, it will be updated to the new value.
50-
func UpdateGitConfig(ctx context.Context, repo Repository, key, value string) (string, error) {
51-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
50+
func GitConfigSet(ctx context.Context, repo Repository, key, value string) error {
51+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
5252
if err != nil {
53-
return "", err
53+
return err
5454
}
5555
defer releaser()
5656

57-
value, _, err1 := git.NewCommand("config").
57+
_, _, err = git.NewCommand("config").
5858
AddDynamicArguments(key, value).
5959
RunStdString(ctx, &git.RunOpts{Dir: repoPath(repo)})
60-
return value, err1
60+
return err
6161
}
6262

63-
func AddGitRemote(ctx context.Context, repo Repository, remoteName, remoteURL string, options ...string) error {
64-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
63+
func GitRemoteAdd(ctx context.Context, repo Repository, remoteName, remoteURL string, options ...string) error {
64+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
6565
if err != nil {
6666
return err
6767
}
@@ -77,8 +77,8 @@ func AddGitRemote(ctx context.Context, repo Repository, remoteName, remoteURL st
7777
return err
7878
}
7979

80-
func RemoveGitRemote(ctx context.Context, repo Repository, remoteName string) error {
81-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
80+
func GitRemoteRemove(ctx context.Context, repo Repository, remoteName string) error {
81+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
8282
if err != nil {
8383
return err
8484
}
@@ -89,18 +89,18 @@ func RemoveGitRemote(ctx context.Context, repo Repository, remoteName string) er
8989
return err
9090
}
9191

92-
// GetRemoteURL returns the url of a specific remote of the repository.
93-
func GetRemoteURL(ctx context.Context, repo Repository, remoteName string) (*giturl.GitURL, error) {
92+
// GitRemoteGetURL returns the url of a specific remote of the repository.
93+
func GitRemoteGetURL(ctx context.Context, repo Repository, remoteName string) (*giturl.GitURL, error) {
9494
addr, err := git.GetRemoteAddress(ctx, repoPath(repo), remoteName)
9595
if err != nil {
9696
return nil, err
9797
}
9898
return giturl.ParseGitURL(addr)
9999
}
100100

101-
// PruneRemote prunes the remote branches that no longer exist in the remote repository.
102-
func PruneRemote(ctx context.Context, repo Repository, remoteName string, timeout time.Duration, stdout, stderr io.Writer) error {
103-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
101+
// FIXME: config related? long-time running?
102+
func GitRemotePrune(ctx context.Context, repo Repository, remoteName string, timeout time.Duration, stdout, stderr io.Writer) error {
103+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
104104
if err != nil {
105105
return err
106106
}
@@ -115,8 +115,9 @@ func PruneRemote(ctx context.Context, repo Repository, remoteName string, timeou
115115
})
116116
}
117117

118-
func UpdateRemotePrune(ctx context.Context, repo Repository, remoteName string, timeout time.Duration, stdout, stderr io.Writer) error {
119-
releaser, err := globallock.Lock(ctx, getRepoConfigLockKey(repo.RelativePath()))
118+
// FIXME: config related? long-time running?
119+
func GitRemoteUpdatePrune(ctx context.Context, repo Repository, remoteName string, timeout time.Duration, stdout, stderr io.Writer) error {
120+
releaser, err := globallock.Lock(ctx, repoGitConfigLockKey(repo.RelativePath()))
120121
if err != nil {
121122
return err
122123
}

‎routers/web/repo/setting/setting.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func handleSettingsPostMirror(ctx *context.Context) {
259259
return
260260
}
261261

262-
u, err := gitrepo.GetRemoteURL(ctx, ctx.Repo.Repository, pullMirror.GetRemoteName())
262+
u, err := gitrepo.GitRemoteGetURL(ctx, ctx.Repo.Repository, pullMirror.GetRemoteName())
263263
if err != nil {
264264
ctx.Data["Err_MirrorAddress"] = true
265265
handleSettingRemoteAddrError(ctx, err, form)

‎services/doctor/misc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ func checkEnablePushOptions(ctx context.Context, logger log.Logger, autofix bool
9393
numRepos++
9494

9595
if autofix {
96-
_, err := gitrepo.UpdateGitConfig(ctx, repo, "receive.advertisePushOptions", "true")
96+
err := gitrepo.GitConfigSet(ctx, repo, "receive.advertisePushOptions", "true")
9797
return err
9898
}
9999

100-
value, err := gitrepo.GetGitConfig(ctx, repo, "receive.advertisePushOptions")
100+
value, err := gitrepo.GitConfigGet(ctx, repo, "receive.advertisePushOptions")
101101
if err != nil {
102102
return err
103103
}

‎services/issue/pull.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
func getMergeBase(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) {
2323
// Add a temporary remote
2424
tmpRemote := fmt.Sprintf("mergebase-%d-%d", pr.ID, time.Now().UnixNano())
25-
if err := gitrepo.AddGitRemote(ctx, repo, tmpRemote, gitRepo.Path); err != nil {
26-
return "", fmt.Errorf("AddGitRemote: %w", err)
25+
if err := gitrepo.GitRemoteAdd(ctx, repo, tmpRemote, gitRepo.Path); err != nil {
26+
return "", fmt.Errorf("GitRemoteAdd: %w", err)
2727
}
2828
defer func() {
29-
if err := gitrepo.RemoveGitRemote(ctx, repo, tmpRemote); err != nil {
30-
log.Error("getMergeBase: RemoveGitRemote: %v", err)
29+
if err := gitrepo.GitRemoteRemove(ctx, repo, tmpRemote); err != nil {
30+
log.Error("getMergeBase: GitRemoteRemove: %v", err)
3131
}
3232
}()
3333

‎services/mirror/mirror_pull.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,25 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
4141
remoteName := m.GetRemoteName()
4242
repo := m.GetRepository(ctx)
4343
// Remove old remote
44-
err = gitrepo.RemoveGitRemote(ctx, repo, remoteName)
44+
err = gitrepo.GitRemoteRemove(ctx, repo, remoteName)
4545
if err != nil && !git.IsRemoteNotExistError(err) {
4646
return err
4747
}
4848

49-
err = gitrepo.AddGitRemote(ctx, repo, remoteName, addr, "--mirror=fetch")
49+
err = gitrepo.GitRemoteAdd(ctx, repo, remoteName, addr, "--mirror=fetch")
5050
if err != nil && !git.IsRemoteNotExistError(err) {
5151
return err
5252
}
5353

5454
if m.Repo.HasWiki() {
5555
wikiRemotePath := repo_module.WikiRemoteURL(ctx, addr)
5656
// Remove old remote of wiki
57-
err = gitrepo.RemoveGitRemote(ctx, repo.WikiStorageRepo(), remoteName)
57+
err = gitrepo.GitRemoteRemove(ctx, repo.WikiStorageRepo(), remoteName)
5858
if err != nil && !git.IsRemoteNotExistError(err) {
5959
return err
6060
}
6161

62-
err = gitrepo.AddGitRemote(ctx, repo.WikiStorageRepo(), remoteName, wikiRemotePath, "--mirror=fetch")
62+
err = gitrepo.GitRemoteAdd(ctx, repo.WikiStorageRepo(), remoteName, wikiRemotePath, "--mirror=fetch")
6363
if err != nil && !git.IsRemoteNotExistError(err) {
6464
return err
6565
}
@@ -208,7 +208,7 @@ func pruneBrokenReferences(ctx context.Context,
208208
stderrBuilder.Reset()
209209
stdoutBuilder.Reset()
210210

211-
pruneErr := gitrepo.PruneRemote(ctx, storageRepo, m.GetRemoteName(), timeout, stdoutBuilder, stderrBuilder)
211+
pruneErr := gitrepo.GitRemotePrune(ctx, storageRepo, m.GetRemoteName(), timeout, stdoutBuilder, stderrBuilder)
212212
if pruneErr != nil {
213213
stdout := stdoutBuilder.String()
214214
stderr := stderrBuilder.String()
@@ -261,7 +261,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
261261
}
262262
cmd.AddArguments("--tags").AddDynamicArguments(m.GetRemoteName())
263263

264-
remoteURL, remoteErr := gitrepo.GetRemoteURL(ctx, m.Repo, m.GetRemoteName())
264+
remoteURL, remoteErr := gitrepo.GitRemoteGetURL(ctx, m.Repo, m.GetRemoteName())
265265
if remoteErr != nil {
266266
log.Error("SyncMirrors [repo: %-v]: GetRemoteAddress Error %v", m.Repo, remoteErr)
267267
return nil, false
@@ -365,7 +365,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
365365
stderrBuilder.Reset()
366366
stdoutBuilder.Reset()
367367

368-
if err := gitrepo.UpdateRemotePrune(ctx, m.Repo.WikiStorageRepo(), m.GetRemoteName(),
368+
if err := gitrepo.GitRemoteUpdatePrune(ctx, m.Repo.WikiStorageRepo(), m.GetRemoteName(),
369369
timeout, &stdoutBuilder, &stderrBuilder); err != nil {
370370
stdout := stdoutBuilder.String()
371371
stderr := stderrBuilder.String()
@@ -386,7 +386,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
386386
stderrBuilder.Reset()
387387
stdoutBuilder.Reset()
388388

389-
if err = gitrepo.UpdateRemotePrune(ctx, m.Repo.WikiStorageRepo(), m.GetRemoteName(),
389+
if err = gitrepo.GitRemoteUpdatePrune(ctx, m.Repo.WikiStorageRepo(), m.GetRemoteName(),
390390
timeout, &stdoutBuilder, &stderrBuilder); err != nil {
391391
stdout := stdoutBuilder.String()
392392
stderr := stderrBuilder.String()

‎services/mirror/mirror_push.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ var stripExitStatus = regexp.MustCompile(`exit status \d+ - `)
3030
// AddPushMirrorRemote registers the push mirror remote.
3131
func AddPushMirrorRemote(ctx context.Context, m *repo_model.PushMirror, addr string) error {
3232
addRemoteAndConfig := func(storageRepo gitrepo.Repository, addr string) error {
33-
if err := gitrepo.AddGitRemote(ctx, storageRepo, m.RemoteName, addr, "--mirror=push"); err != nil {
33+
if err := gitrepo.GitRemoteAdd(ctx, storageRepo, m.RemoteName, addr, "--mirror=push"); err != nil {
3434
return err
3535
}
36-
if err := gitrepo.AddGitConfig(ctx, storageRepo, "remote."+m.RemoteName+".push", "+refs/heads/*:refs/heads/*"); err != nil {
36+
if err := gitrepo.GitConfigAdd(ctx, storageRepo, "remote."+m.RemoteName+".push", "+refs/heads/*:refs/heads/*"); err != nil {
3737
return err
3838
}
39-
return gitrepo.AddGitConfig(ctx, storageRepo, "remote."+m.RemoteName+".push", "+refs/tags/*:refs/tags/*")
39+
return gitrepo.GitConfigAdd(ctx, storageRepo, "remote."+m.RemoteName+".push", "+refs/tags/*:refs/tags/*")
4040
}
4141

4242
if err := addRemoteAndConfig(m.Repo, addr); err != nil {
@@ -58,12 +58,12 @@ func AddPushMirrorRemote(ctx context.Context, m *repo_model.PushMirror, addr str
5858
// RemovePushMirrorRemote removes the push mirror remote.
5959
func RemovePushMirrorRemote(ctx context.Context, m *repo_model.PushMirror) error {
6060
_ = m.GetRepository(ctx)
61-
if err := gitrepo.RemoveGitRemote(ctx, m.Repo, m.RemoteName); err != nil {
61+
if err := gitrepo.GitRemoteRemove(ctx, m.Repo, m.RemoteName); err != nil {
6262
return err
6363
}
6464

6565
if m.Repo.HasWiki() {
66-
if err := gitrepo.RemoveGitRemote(ctx, m.Repo.WikiStorageRepo(), m.RemoteName); err != nil {
66+
if err := gitrepo.GitRemoteRemove(ctx, m.Repo.WikiStorageRepo(), m.RemoteName); err != nil {
6767
// The wiki remote may not exist
6868
log.Warn("Wiki Remote[%d] could not be removed: %v", m.ID, err)
6969
}
@@ -128,7 +128,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
128128
storageRepo = repo.WikiStorageRepo()
129129
path = repo.WikiPath()
130130
}
131-
remoteURL, err := gitrepo.GetRemoteURL(ctx, storageRepo, m.RemoteName)
131+
remoteURL, err := gitrepo.GitRemoteGetURL(ctx, storageRepo, m.RemoteName)
132132
if err != nil {
133133
log.Error("GetRemoteAddress(%s) Error %v", path, err)
134134
return errors.New("Unexpected error")

‎services/pull/compare.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ func GetCompareInfo(ctx context.Context, baseRepo, headRepo *repo_model.Reposito
3535
if headGitRepo.Path != baseRepo.RepoPath() {
3636
// Add a temporary remote
3737
tmpRemote = strconv.FormatInt(time.Now().UnixNano(), 10)
38-
if err = gitrepo.AddGitRemote(ctx, headRepo, tmpRemote, baseRepo.RepoPath()); err != nil {
38+
if err = gitrepo.GitRemoteAdd(ctx, headRepo, tmpRemote, baseRepo.RepoPath()); err != nil {
3939
return nil, fmt.Errorf("AddRemote: %w", err)
4040
}
4141
defer func() {
42-
if err := gitrepo.RemoveGitRemote(ctx, headRepo, tmpRemote); err != nil {
43-
logger.Error("GetPullRequestInfo: RemoveGitRemote: %v", err)
42+
if err := gitrepo.GitRemoteRemove(ctx, headRepo, tmpRemote); err != nil {
43+
logger.Error("GetPullRequestInfo: GitRemoteRemove: %v", err)
4444
}
4545
}()
4646
}

‎services/repository/migrate.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,13 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo
272272
}
273273
}
274274

275-
err := gitrepo.RemoveGitRemote(ctx, repo, "origin")
275+
err := gitrepo.GitRemoteRemove(ctx, repo, "origin")
276276
if err != nil && !git.IsRemoteNotExistError(err) {
277277
return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err)
278278
}
279279

280280
if repo.HasWiki() {
281-
err = gitrepo.RemoveGitRemote(ctx, repo.WikiStorageRepo(), "origin")
281+
err = gitrepo.GitRemoteRemove(ctx, repo.WikiStorageRepo(), "origin")
282282
if err != nil && !git.IsRemoteNotExistError(err) {
283283
return repo, fmt.Errorf("cleanUpMigrateGitConfig (wiki): %w", err)
284284
}

0 commit comments

Comments
 (0)