diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-05-26 09:04:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-26 01:04:48 +0000 |
commit | f9cfd6ce5bd7f27e2655fd307022461a802fc49c (patch) | |
tree | 9279cab7249c1c7e66a81e694f1096e709c1a8a1 /routers/private | |
parent | 26fa94bc25ecba731a12af16b6172768389287a7 (diff) | |
download | gitea-f9cfd6ce5bd7f27e2655fd307022461a802fc49c.tar.gz gitea-f9cfd6ce5bd7f27e2655fd307022461a802fc49c.zip |
Use the type RefName for all the needed places and fix pull mirror sync bugs (#24634)
This PR replaces all string refName as a type `git.RefName` to make the
code more maintainable.
Fix #15367
Replaces #23070
It also fixed a bug that tags are not sync because `git remote --prune
origin` will not remove local tags if remote removed.
We in fact should use `git fetch --prune --tags origin` but not `git
remote update origin` to do the sync.
Some answer from ChatGPT as ref.
> If the git fetch --prune --tags command is not working as expected,
there could be a few reasons why. Here are a few things to check:
>
>Make sure that you have the latest version of Git installed on your
system. You can check the version by running git --version in your
terminal. If you have an outdated version, try updating Git and see if
that resolves the issue.
>
>Check that your Git repository is properly configured to track the
remote repository's tags. You can check this by running git config
--get-all remote.origin.fetch and verifying that it includes
+refs/tags/*:refs/tags/*. If it does not, you can add it by running git
config --add remote.origin.fetch "+refs/tags/*:refs/tags/*".
>
>Verify that the tags you are trying to prune actually exist on the
remote repository. You can do this by running git ls-remote --tags
origin to list all the tags on the remote repository.
>
>Check if any local tags have been created that match the names of tags
on the remote repository. If so, these local tags may be preventing the
git fetch --prune --tags command from working properly. You can delete
local tags using the git tag -d command.
---------
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'routers/private')
-rw-r--r-- | routers/private/hook_post_receive.go | 20 | ||||
-rw-r--r-- | routers/private/hook_pre_receive.go | 21 |
2 files changed, 19 insertions, 22 deletions
diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index cfe20be106..0c9a2a10fa 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -7,7 +7,6 @@ import ( "fmt" "net/http" "strconv" - "strings" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" @@ -47,7 +46,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { // tags. Updates to other refs (eg, refs/notes, refs/changes, // or other less-standard refs spaces are ignored since there // may be a very large number of them). - if strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) { + if refFullName.IsBranch() || refFullName.IsTag() { if repo == nil { repo = loadRepository(ctx, ownerName, repoName) if ctx.Written() { @@ -67,7 +66,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { RepoName: repoName, } updates = append(updates, option) - if repo.IsEmpty && option.IsBranch() && (option.BranchName() == "master" || option.BranchName() == "main") { + if repo.IsEmpty && (refFullName.BranchName() == "master" || refFullName.BranchName() == "main") { // put the master/main branch first copy(updates[1:], updates) updates[0] = option @@ -79,7 +78,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { if err := repo_service.PushUpdates(updates); err != nil { log.Error("Failed to Update: %s/%s Total Updates: %d", ownerName, repoName, len(updates)) for i, update := range updates { - log.Error("Failed to Update: %s/%s Update: %d/%d: Branch: %s", ownerName, repoName, i, len(updates), update.BranchName()) + log.Error("Failed to Update: %s/%s Update: %d/%d: Branch: %s", ownerName, repoName, i, len(updates), update.RefFullName.BranchName()) } log.Error("Failed to Update: %s/%s Error: %v", ownerName, repoName, err) @@ -124,7 +123,8 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { newCommitID := opts.NewCommitIDs[i] // post update for agit pull request - if git.SupportProcReceive && strings.HasPrefix(refFullName, git.PullPrefix) { + // FIXME: use pr.Flow to test whether it's an Agit PR or a GH PR + if git.SupportProcReceive && refFullName.IsPull() { if repo == nil { repo = loadRepository(ctx, ownerName, repoName) if ctx.Written() { @@ -132,9 +132,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { } } - pullIndexStr := strings.TrimPrefix(refFullName, git.PullPrefix) - pullIndexStr = strings.Split(pullIndexStr, "/")[0] - pullIndex, _ := strconv.ParseInt(pullIndexStr, 10, 64) + pullIndex, _ := strconv.ParseInt(refFullName.PullName(), 10, 64) if pullIndex <= 0 { continue } @@ -160,10 +158,8 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { continue } - branch := git.RefEndName(opts.RefFullNames[i]) - // If we've pushed a branch (and not deleted it) - if newCommitID != git.EmptySHA && strings.HasPrefix(refFullName, git.BranchPrefix) { + if newCommitID != git.EmptySHA && refFullName.IsBranch() { // First ensure we have the repository loaded, we're allowed pulls requests and we can get the base repo if repo == nil { @@ -197,6 +193,8 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { } } + branch := refFullName.BranchName() + // If our branch is the default branch of an unforked repo - there's no PR to create or refer to if !repo.IsFork && branch == baseRepo.DefaultBranch { results = append(results, private.HookPostReceiveBranchResult{}) diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go index 63b4a8622e..7f37d73795 100644 --- a/routers/private/hook_pre_receive.go +++ b/routers/private/hook_pre_receive.go @@ -7,7 +7,6 @@ import ( "fmt" "net/http" "os" - "strings" "code.gitea.io/gitea/models" asymkey_model "code.gitea.io/gitea/models/asymkey" @@ -119,12 +118,12 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { refFullName := opts.RefFullNames[i] switch { - case strings.HasPrefix(refFullName, git.BranchPrefix): + case refFullName.IsBranch(): preReceiveBranch(ourCtx, oldCommitID, newCommitID, refFullName) - case strings.HasPrefix(refFullName, git.TagPrefix): + case refFullName.IsTag(): preReceiveTag(ourCtx, oldCommitID, newCommitID, refFullName) - case git.SupportProcReceive && strings.HasPrefix(refFullName, git.PullRequestPrefix): - preReceivePullRequest(ourCtx, oldCommitID, newCommitID, refFullName) + case git.SupportProcReceive && refFullName.IsFor(): + preReceiveFor(ourCtx, oldCommitID, newCommitID, refFullName) default: ourCtx.AssertCanWriteCode() } @@ -136,8 +135,8 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) { ctx.PlainText(http.StatusOK, "ok") } -func preReceiveBranch(ctx *preReceiveContext, oldCommitID, newCommitID, refFullName string) { - branchName := strings.TrimPrefix(refFullName, git.BranchPrefix) +func preReceiveBranch(ctx *preReceiveContext, oldCommitID, newCommitID string, refFullName git.RefName) { + branchName := refFullName.BranchName() ctx.branchName = branchName if !ctx.AssertCanWriteCode() { @@ -369,12 +368,12 @@ func preReceiveBranch(ctx *preReceiveContext, oldCommitID, newCommitID, refFullN } } -func preReceiveTag(ctx *preReceiveContext, oldCommitID, newCommitID, refFullName string) { +func preReceiveTag(ctx *preReceiveContext, oldCommitID, newCommitID string, refFullName git.RefName) { if !ctx.AssertCanWriteCode() { return } - tagName := strings.TrimPrefix(refFullName, git.TagPrefix) + tagName := refFullName.TagName() if !ctx.gotProtectedTags { var err error @@ -405,7 +404,7 @@ func preReceiveTag(ctx *preReceiveContext, oldCommitID, newCommitID, refFullName } } -func preReceivePullRequest(ctx *preReceiveContext, oldCommitID, newCommitID, refFullName string) { +func preReceiveFor(ctx *preReceiveContext, oldCommitID, newCommitID string, refFullName git.RefName) { if !ctx.AssertCreatePullRequest() { return } @@ -424,7 +423,7 @@ func preReceivePullRequest(ctx *preReceiveContext, oldCommitID, newCommitID, ref return } - baseBranchName := refFullName[len(git.PullRequestPrefix):] + baseBranchName := refFullName.ForBranchName() baseBranchExist := false if ctx.Repo.GitRepo.IsBranchExist(baseBranchName) { |