fine tune

Author: wxiaoguang

options/locale/locale_en-US.ini

@@ -1948,6 +1948,7 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p
 pulls.recently_pushed_new_branches = You pushed on branch <strong>%[1]s</strong> %[2]s
 pulls.upstream_diverging_prompt_behind_1 = This branch is %d commit behind %s
 pulls.upstream_diverging_prompt_behind_n = This branch is %d commits behind %s
+pulls.upstream_diverging_prompt_base_newer = The base branch %s is newer than this branch
 pulls.upstream_diverging_merge = Sync fork
 
 pull.deleted_branch = (deleted):%s

routers/web/repo/view_home.go

@@ -184,8 +184,7 @@ func prepareUpstreamDivergingInfo(ctx *context.Context) {
 	upstreamDivergingInfo, err := repo_service.GetUpstreamDivergingInfo(ctx, ctx.Repo.Repository, ctx.Repo.BranchName)
 	if err != nil {
 		if !errors.Is(err, util.ErrNotExist) && !errors.Is(err, util.ErrInvalidArgument) {
-			// TODO: if the fork repo has new commits, there will be an error, at the moment we are not able to handle it, should be improved in the future
-			log.Debug("GetUpstreamDivergingInfo: %v", err)
+			log.Error("GetUpstreamDivergingInfo: %v", err)
 		}
 		return
 	}

services/repository/merge_upstream.go

@@ -18,6 +18,7 @@ import (
 )
 
 type UpstreamDivergingInfo struct {
+	BaseIsNewer   bool
 	CommitsBehind int
 	CommitsAhead  int
 }
@@ -106,7 +107,8 @@ func GetUpstreamDivergingInfo(ctx context.Context, repo *repo_model.Repository,
 	// so at the moment, we are not able to handle this case, should be improved in the future
 	diff, err := git.GetDivergingCommits(ctx, repo.BaseRepo.RepoPath(), baseBranch.CommitID, forkBranch.CommitID)
 	if err != nil {
-		return nil, err
+		info.BaseIsNewer = baseBranch.UpdatedUnix > forkBranch.UpdatedUnix
+		return info, nil
 	}
 	info.CommitsBehind, info.CommitsAhead = diff.Behind, diff.Ahead
 	return info, nil

templates/repo/code/upstream_diverging_info.tmpl

@@ -1,9 +1,13 @@
-{{if and .UpstreamDivergingInfo .UpstreamDivergingInfo.CommitsBehind}}
+{{if and .UpstreamDivergingInfo (or .UpstreamDivergingInfo.BaseIsNewer .UpstreamDivergingInfo.CommitsBehind)}}
 <div class="ui message flex-text-block">
 	<div class="tw-flex-1">
 		{{$upstreamLink := printf "%s/src/branch/%s" .Repository.BaseRepo.Link (.BranchName|PathEscapeSegments)}}
 		{{$upstreamHtml := HTMLFormat `<a href="%s">%s:%s</a>` $upstreamLink .Repository.BaseRepo.FullName .BranchName}}
-		{{ctx.Locale.TrN .UpstreamDivergingInfo.CommitsBehind "repo.pulls.upstream_diverging_prompt_behind_1" "repo.pulls.upstream_diverging_prompt_behind_n" .UpstreamDivergingInfo.CommitsBehind $upstreamHtml}}
+		{{if .UpstreamDivergingInfo.CommitsBehind}}
+			{{ctx.Locale.TrN .UpstreamDivergingInfo.CommitsBehind "repo.pulls.upstream_diverging_prompt_behind_1" "repo.pulls.upstream_diverging_prompt_behind_n" .UpstreamDivergingInfo.CommitsBehind $upstreamHtml}}
+		{{else}}
+			{{ctx.Locale.Tr "repo.pulls.upstream_diverging_prompt_base_newer" $upstreamHtml}}
+		{{end}}
 	</div>
 	{{if .CanWriteCode}}
 	<button class="ui compact green button tw-m-0 link-action" data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">