mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-26 21:54:19 -04:00
The merge and update branch code was previously a little tangled and had some very long functions. The functions were not very clear in their reasoning and there were deficiencies in their logging and at least one bug in the handling of LFS for update by rebase. This PR substantially refactors this code and splits things out to into separate functions. It also attempts to tidy up the calls by wrapping things in "context"s. There are also attempts to improve logging when there are errors. Signed-off-by: Andrew Thornton <art27@cantab.net> --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: delvh <dev.lh@web.de>
108 lines
3.7 KiB
Go
108 lines
3.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package pull
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/log"
|
|
repo_module "code.gitea.io/gitea/modules/repository"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch
|
|
func updateHeadByRebaseOnToBase(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, message string) error {
|
|
// "Clone" base repo and add the cache headers for the head repo and branch
|
|
mergeCtx, cancel, err := createTemporaryRepoForMerge(ctx, pr, doer, "")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer cancel()
|
|
|
|
// Determine the old merge-base before the rebase - we use this for LFS push later on
|
|
oldMergeBase, _, _ := git.NewCommand(ctx, "merge-base").AddDashesAndList(baseBranch, trackingBranch).RunStdString(&git.RunOpts{Dir: mergeCtx.tmpBasePath})
|
|
oldMergeBase = strings.TrimSpace(oldMergeBase)
|
|
|
|
// Rebase the tracking branch on to the base as the staging branch
|
|
if err := rebaseTrackingOnToBase(mergeCtx, repo_model.MergeStyleRebaseUpdate); err != nil {
|
|
return err
|
|
}
|
|
|
|
if setting.LFS.StartServer {
|
|
// Now we need to ensure that the head repository contains any LFS objects between the new base and the old mergebase
|
|
// It's questionable about where this should go - either after or before the push
|
|
// I think in the interests of data safety - failures to push to the lfs should prevent
|
|
// the push as you can always re-rebase.
|
|
if err := LFSPush(ctx, mergeCtx.tmpBasePath, baseBranch, oldMergeBase, &issues_model.PullRequest{
|
|
HeadRepoID: pr.BaseRepoID,
|
|
BaseRepoID: pr.HeadRepoID,
|
|
}); err != nil {
|
|
log.Error("Unable to push lfs objects between %s and %s up to head branch in %-v: %v", baseBranch, oldMergeBase, pr, err)
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Now determine who the pushing author should be
|
|
var headUser *user_model.User
|
|
if err := pr.HeadRepo.LoadOwner(ctx); err != nil {
|
|
if !user_model.IsErrUserNotExist(err) {
|
|
log.Error("Can't find user: %d for head repository in %-v - %v", pr.HeadRepo.OwnerID, pr, err)
|
|
return err
|
|
}
|
|
log.Error("Can't find user: %d for head repository in %-v - defaulting to doer: %-v - %v", pr.HeadRepo.OwnerID, pr, doer, err)
|
|
headUser = doer
|
|
} else {
|
|
headUser = pr.HeadRepo.Owner
|
|
}
|
|
|
|
pushCmd := git.NewCommand(ctx, "push", "-f", "head_repo").
|
|
AddDynamicArguments(stagingBranch + ":" + git.BranchPrefix + pr.HeadBranch)
|
|
|
|
// Push back to the head repository.
|
|
// TODO: this cause an api call to "/api/internal/hook/post-receive/...",
|
|
// that prevents us from doint the whole merge in one db transaction
|
|
mergeCtx.outbuf.Reset()
|
|
mergeCtx.errbuf.Reset()
|
|
|
|
if err := pushCmd.Run(&git.RunOpts{
|
|
Env: repo_module.FullPushingEnvironment(
|
|
headUser,
|
|
doer,
|
|
pr.HeadRepo,
|
|
pr.HeadRepo.Name,
|
|
pr.ID,
|
|
),
|
|
Dir: mergeCtx.tmpBasePath,
|
|
Stdout: mergeCtx.outbuf,
|
|
Stderr: mergeCtx.errbuf,
|
|
}); err != nil {
|
|
if strings.Contains(mergeCtx.errbuf.String(), "non-fast-forward") {
|
|
return &git.ErrPushOutOfDate{
|
|
StdOut: mergeCtx.outbuf.String(),
|
|
StdErr: mergeCtx.errbuf.String(),
|
|
Err: err,
|
|
}
|
|
} else if strings.Contains(mergeCtx.errbuf.String(), "! [remote rejected]") {
|
|
err := &git.ErrPushRejected{
|
|
StdOut: mergeCtx.outbuf.String(),
|
|
StdErr: mergeCtx.errbuf.String(),
|
|
Err: err,
|
|
}
|
|
err.GenerateMessage()
|
|
return err
|
|
}
|
|
return fmt.Errorf("git push: %s", mergeCtx.errbuf.String())
|
|
}
|
|
mergeCtx.outbuf.Reset()
|
|
mergeCtx.errbuf.Reset()
|
|
|
|
return nil
|
|
}
|