Skip to content

Commit 1298396

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent fffc855 commit 1298396

File tree

6 files changed

+102
-26
lines changed

6 files changed

+102
-26
lines changed

‎models/git/branch.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ func GetBranch(ctx context.Context, repoID int64, branchName string) (*Branch, e
166166
RepoID: repoID,
167167
BranchName: branchName,
168168
}
169+
} else if branch.IsDeleted {
170+
return nil, ErrBranchNotExist{
171+
RepoID: repoID,
172+
BranchName: branchName,
173+
}
169174
}
170175
return &branch, nil
171176
}

‎options/locale/locale_en-US.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,7 @@ pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[
19531953
pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s
19541954
pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes
19551955
pulls.upstream_diverging_merge = Sync fork
1956-
pulls.upstream_diverging_merge_confirm = Would you like to merge base repository's default branch onto this repository's branch %s?
1956+
pulls.upstream_diverging_merge_confirm = Would you like to merge "%[1]s" onto "%[2]s"?
19571957

19581958
pull.deleted_branch = (deleted):%s
19591959
pull.agit_documentation = Review documentation about AGit

‎services/repository/branch.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,12 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, gitR
668668
}
669669

670670
// BranchDivergingInfo contains the information about the divergence of a head branch to the base branch.
671-
// This struct is also used in templates, so it needs to search for all references before changing it.
672671
type BranchDivergingInfo struct {
672+
// whether the base branch contains new commits which are not in the head branch
673673
BaseHasNewCommits bool
674+
675+
// behind/after are number of commits that the head branch is behind/after the base branch, it's 0 if it's unable to calculate.
676+
// there could be a case that BaseHasNewCommits=true while the behind/after are both 0 (unable to calculate).
674677
HeadCommitsBehind int
675678
HeadCommitsAhead int
676679
}
@@ -720,5 +723,6 @@ func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo *repo_model.Repo
720723
}
721724

722725
info.HeadCommitsBehind, info.HeadCommitsAhead = diff.Behind, diff.Ahead
726+
info.BaseHasNewCommits = info.HeadCommitsBehind > 0
723727
return info, nil
724728
}

‎services/repository/merge_upstream.go‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package repository
55

66
import (
7-
"context"
7+
"errors"
88
"fmt"
99

1010
issue_model "code.gitea.io/gitea/models/issues"
@@ -18,16 +18,24 @@ import (
1818
)
1919

2020
// MergeUpstream merges the base repository's default branch into the fork repository's current branch.
21-
func MergeUpstream(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, branch string) (mergeStyle string, err error) {
21+
func MergeUpstream(ctx reqctx.RequestContext, doer *user_model.User, repo *repo_model.Repository, branch string) (mergeStyle string, err error) {
2222
if err = repo.MustNotBeArchived(); err != nil {
2323
return "", err
2424
}
2525
if err = repo.GetBaseRepo(ctx); err != nil {
2626
return "", err
2727
}
28+
divergingInfo, err := GetUpstreamDivergingInfo(ctx, repo, branch)
29+
if err != nil {
30+
return "", err
31+
}
32+
if !divergingInfo.BaseBranchHasNewCommits {
33+
return "up-to-date", nil
34+
}
35+
2836
err = git.Push(ctx, repo.BaseRepo.RepoPath(), git.PushOptions{
2937
Remote: repo.RepoPath(),
30-
Branch: fmt.Sprintf("%s:%s", repo.BaseRepo.DefaultBranch, branch),
38+
Branch: fmt.Sprintf("%s:%s", divergingInfo.BaseBranchName, branch),
3139
Env: repo_module.PushingEnvironment(doer, repo),
3240
})
3341
if err == nil {
@@ -59,7 +67,7 @@ func MergeUpstream(ctx context.Context, doer *user_model.User, repo *repo_model.
5967
BaseRepoID: repo.BaseRepo.ID,
6068
BaseRepo: repo.BaseRepo,
6169
HeadBranch: branch, // maybe HeadCommitID is not needed
62-
BaseBranch: repo.BaseRepo.DefaultBranch,
70+
BaseBranch: divergingInfo.BaseBranchName,
6371
}
6472
fakeIssue.PullRequest = fakePR
6573
err = pull.Update(ctx, fakePR, doer, "merge upstream", false)
@@ -69,8 +77,15 @@ func MergeUpstream(ctx context.Context, doer *user_model.User, repo *repo_model.
6977
return "merge", nil
7078
}
7179

80+
// UpstreamDivergingInfo is also used in templates, so it needs to search for all references before changing it.
81+
type UpstreamDivergingInfo struct {
82+
BaseBranchName string
83+
BaseBranchHasNewCommits bool
84+
HeadBranchCommitsBehind int
85+
}
86+
7287
// GetUpstreamDivergingInfo returns the information about the divergence between the fork repository's branch and the base repository's default branch.
73-
func GetUpstreamDivergingInfo(ctx reqctx.RequestContext, forkRepo *repo_model.Repository, forkBranch string) (*BranchDivergingInfo, error) {
88+
func GetUpstreamDivergingInfo(ctx reqctx.RequestContext, forkRepo *repo_model.Repository, forkBranch string) (*UpstreamDivergingInfo, error) {
7489
if !forkRepo.IsFork {
7590
return nil, util.NewInvalidArgumentErrorf("repo is not a fork")
7691
}
@@ -83,5 +98,26 @@ func GetUpstreamDivergingInfo(ctx reqctx.RequestContext, forkRepo *repo_model.Re
8398
return nil, err
8499
}
85100

86-
return GetBranchDivergingInfo(ctx, forkRepo.BaseRepo, forkRepo.BaseRepo.DefaultBranch, forkRepo, forkBranch)
101+
// Do the best to follow the GitHub's behavior, suppose there is a `branch-a` in fork repo:
102+
// * if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a`
103+
// * if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`
104+
info, err := GetBranchDivergingInfo(ctx, forkRepo.BaseRepo, forkBranch, forkRepo, forkBranch)
105+
if err == nil {
106+
return &UpstreamDivergingInfo{
107+
BaseBranchName: forkBranch,
108+
BaseBranchHasNewCommits: info.BaseHasNewCommits,
109+
HeadBranchCommitsBehind: info.HeadCommitsBehind,
110+
}, nil
111+
}
112+
if errors.Is(err, util.ErrNotExist) {
113+
info, err = GetBranchDivergingInfo(ctx, forkRepo.BaseRepo, forkRepo.BaseRepo.DefaultBranch, forkRepo, forkBranch)
114+
if err == nil {
115+
return &UpstreamDivergingInfo{
116+
BaseBranchName: forkRepo.BaseRepo.DefaultBranch,
117+
BaseBranchHasNewCommits: info.BaseHasNewCommits,
118+
HeadBranchCommitsBehind: info.HeadCommitsBehind,
119+
}, nil
120+
}
121+
}
122+
return nil, err
87123
}

‎templates/repo/code/upstream_diverging_info.tmpl‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
{{if and .UpstreamDivergingInfo (or .UpstreamDivergingInfo.BaseHasNewCommits .UpstreamDivergingInfo.HeadCommitsBehind)}}
1+
{{if and .UpstreamDivergingInfo .UpstreamDivergingInfo.BaseBranchHasNewCommits}}
22
<div class="ui message flex-text-block">
33
<div class="tw-flex-1">
4-
{{$upstreamLink := printf "%s/src/branch/%s" .Repository.BaseRepo.Link (.Repository.BaseRepo.DefaultBranch|PathEscapeSegments)}}
5-
{{$upstreamHtml := HTMLFormat `<a href="%s">%s:%s</a>` $upstreamLink .Repository.BaseRepo.FullName .Repository.BaseRepo.DefaultBranch}}
6-
{{if .UpstreamDivergingInfo.HeadCommitsBehind}}
7-
{{ctx.Locale.TrN .UpstreamDivergingInfo.HeadCommitsBehind "repo.pulls.upstream_diverging_prompt_behind_1" "repo.pulls.upstream_diverging_prompt_behind_n" .UpstreamDivergingInfo.HeadCommitsBehind $upstreamHtml}}
4+
{{$upstreamLink := printf "%s/src/branch/%s" .Repository.BaseRepo.Link (.UpstreamDivergingInfo.BaseBranchName|PathEscapeSegments)}}
5+
{{$upstreamRepoBranchDisplay := HTMLFormat "%s:%s" .Repository.BaseRepo.FullName .UpstreamDivergingInfo.BaseBranchName}}
6+
{{$thisRepoBranchDisplay := HTMLFormat "%s:%s" .Repository.FullName .BranchName}}
7+
{{$upstreamHtml := HTMLFormat `<a href="%s">%s</a>` $upstreamLink $upstreamRepoBranchDisplay}}
8+
{{if .UpstreamDivergingInfo.HeadBranchCommitsBehind}}
9+
{{ctx.Locale.TrN .UpstreamDivergingInfo.HeadBranchCommitsBehind "repo.pulls.upstream_diverging_prompt_behind_1" "repo.pulls.upstream_diverging_prompt_behind_n" .UpstreamDivergingInfo.HeadBranchCommitsBehind $upstreamHtml}}
810
{{else}}
911
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_prompt_base_newer" $upstreamHtml}}
1012
{{end}}
1113
</div>
1214
{{if .CanWriteCode}}
1315
<button class="ui compact primary button tw-m-0 link-action"
1416
data-modal-confirm-header="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}"
15-
data-modal-confirm-content="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge_confirm" .BranchName}}"
17+
data-modal-confirm-content="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge_confirm" $upstreamRepoBranchDisplay $thisRepoBranchDisplay}}"
1618
data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">
1719
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}
1820
</button>

‎tests/integration/repo_merge_upstream_test.go‎

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,54 @@ func TestRepoMergeUpstream(t *testing.T) {
6060

6161
t.Run("HeadBeforeBase", func(t *testing.T) {
6262
// add a file in base repo
63+
sessionBaseUser := loginUser(t, baseUser.Name)
6364
require.NoError(t, createOrReplaceFileInBranch(baseUser, baseRepo, "new-file.txt", "master", "test-content-1"))
6465

65-
// the repo shows a prompt to "sync fork"
6666
var mergeUpstreamLink string
67-
require.Eventually(t, func() bool {
68-
resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
69-
htmlDoc := NewHTMLParser(t, resp.Body)
70-
mergeUpstreamLink = queryMergeUpstreamButtonLink(htmlDoc)
71-
if mergeUpstreamLink == "" {
72-
return false
73-
}
74-
respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
75-
return strings.Contains(respMsg, `This branch is 1 commit behind <a href="/user2/repo1/src/branch/master">user2/repo1:master</a>`)
76-
}, 5*time.Second, 100*time.Millisecond)
67+
t.Run("DetectDefaultBranch", func(t *testing.T) {
68+
// the repo shows a prompt to "sync fork" (defaults to the default branch)
69+
require.Eventually(t, func() bool {
70+
resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
71+
htmlDoc := NewHTMLParser(t, resp.Body)
72+
mergeUpstreamLink = queryMergeUpstreamButtonLink(htmlDoc)
73+
if mergeUpstreamLink == "" {
74+
return false
75+
}
76+
respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
77+
return strings.Contains(respMsg, `This branch is 1 commit behind <a href="/user2/repo1/src/branch/master">user2/repo1:master</a>`)
78+
}, 5*time.Second, 100*time.Millisecond)
79+
})
80+
81+
t.Run("DetectSameBranch", func(t *testing.T) {
82+
// if the fork-branch name also exists in the base repo, then use that branch instead
83+
req = NewRequestWithValues(t, "POST", "/user2/repo1/branches/_new/branch/master", map[string]string{
84+
"_csrf": GetUserCSRFToken(t, sessionBaseUser),
85+
"new_branch_name": "fork-branch",
86+
})
87+
sessionBaseUser.MakeRequest(t, req, http.StatusSeeOther)
88+
89+
require.Eventually(t, func() bool {
90+
resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
91+
htmlDoc := NewHTMLParser(t, resp.Body)
92+
mergeUpstreamLink = queryMergeUpstreamButtonLink(htmlDoc)
93+
if mergeUpstreamLink == "" {
94+
return false
95+
}
96+
respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
97+
return strings.Contains(respMsg, `This branch is 1 commit behind <a href="/user2/repo1/src/branch/fork-branch">user2/repo1:fork-branch</a>`)
98+
}, 5*time.Second, 100*time.Millisecond)
99+
})
77100

78101
// click the "sync fork" button
79102
req = NewRequestWithValues(t, "POST", mergeUpstreamLink, map[string]string{"_csrf": GetUserCSRFToken(t, session)})
80103
session.MakeRequest(t, req, http.StatusOK)
81104
checkFileContent("fork-branch", "test-content-1")
105+
106+
// delete the "fork-branch" from the base repo
107+
req = NewRequestWithValues(t, "POST", "/user2/repo1/branches/delete?name=fork-branch", map[string]string{
108+
"_csrf": GetUserCSRFToken(t, sessionBaseUser),
109+
})
110+
sessionBaseUser.MakeRequest(t, req, http.StatusOK)
82111
})
83112

84113
t.Run("BaseChangeAfterHeadChange", func(t *testing.T) {
@@ -98,7 +127,7 @@ func TestRepoMergeUpstream(t *testing.T) {
98127
htmlDoc := NewHTMLParser(t, resp.Body)
99128
respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
100129
return strings.Contains(respMsg, `The base branch <a href="/user2/repo1/src/branch/master">user2/repo1:master</a> has new changes`)
101-
}, 5*time.Second, 100*time.Millisecond)
130+
}, 5*time.Second, 1000*time.Millisecond)
102131

103132
// and do the merge-upstream by API
104133
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/test-repo-fork/merge-upstream", forkUser.Name), &api.MergeUpstreamRequest{

0 commit comments

Comments
 (0)