Show deleted pull head information

models/pull.go

@@ -17,6 +17,23 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 )
 
+// ErrHeadRepoMissed represents an error to report pull's head repository missed
+type ErrHeadRepoMissed struct {
+	PullID     int64
+	HeadRepoID int64
+}
+
+// Error implements the interface
+func (err ErrHeadRepoMissed) Error() string {
+	return fmt.Sprintf("Head repository [%d] of pull id [%d] missed", err.HeadRepoID, err.PullID)
+}
+
+// IsErrHeadRepoMissed returns true if head repository missed
+func IsErrHeadRepoMissed(err error) bool {
+	_, ok := err.(ErrHeadRepoMissed)
+	return ok
+}
+
 // PullRequestType defines pull request type
 type PullRequestType int
 
@@ -63,6 +80,8 @@ type PullRequest struct {
 	MergerID       int64              `xorm:"INDEX"`
 	Merger         *User              `xorm:"-"`
 	MergedUnix     timeutil.TimeStamp `xorm:"updated INDEX"`
+
+	isHeadRepoLoaded bool `xorm:"-"`
 }
 
 // MustHeadUserName returns the HeadRepo's username if failed return blank
@@ -75,6 +94,9 @@ func (pr *PullRequest) MustHeadUserName() string {
 		}
 		return ""
 	}
+	if pr.HeadRepo == nil {
+		return ""
+	}
 	return pr.HeadRepo.MustOwnerName()
 }
 
@@ -98,38 +120,57 @@ func (pr *PullRequest) LoadAttributes() error {
 	return pr.loadAttributes(x)
 }
 
-// LoadBaseRepo loads pull request base repository from database
+func (pr *PullRequest) loadHeadRepo(e Engine) error {
-func (pr *PullRequest) LoadBaseRepo() error {
+	if !pr.isHeadRepoLoaded && pr.HeadRepo == nil && pr.HeadRepoID > 0 {
-	if pr.BaseRepo == nil {
+		if pr.HeadRepoID == pr.BaseRepoID {
-		if pr.HeadRepoID == pr.BaseRepoID && pr.HeadRepo != nil {
+			if pr.BaseRepo != nil {
-			pr.BaseRepo = pr.HeadRepo
+				pr.HeadRepo = pr.BaseRepo
+				return nil
+			} else if pr.Issue != nil && pr.Issue.Repo != nil {
+				pr.HeadRepo = pr.Issue.Repo
 				return nil
 			}
-		var repo Repository
-		if has, err := x.ID(pr.BaseRepoID).Get(&repo); err != nil {
-			return err
-		} else if !has {
-			return ErrRepoNotExist{ID: pr.BaseRepoID}
 		}
-		pr.BaseRepo = &repo
+
+		var err error
+		pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
+		if err != nil && !IsErrRepoNotExist(err) { // Head repo maybe deleted, but it should still work
+			return fmt.Errorf("getRepositoryByID(head): %v", err)
+
+		}
+		pr.isHeadRepoLoaded = true
 	}
 	return nil
 }
 
-// LoadHeadRepo loads pull request head repository from database
+// LoadHeadRepo loads the head repository
 func (pr *PullRequest) LoadHeadRepo() error {
-	if pr.HeadRepo == nil {
+	return pr.loadHeadRepo(x)
-		if pr.HeadRepoID == pr.BaseRepoID && pr.BaseRepo != nil {
+}
-			pr.HeadRepo = pr.BaseRepo
+
+// LoadBaseRepo loads the target repository
+func (pr *PullRequest) LoadBaseRepo() error {
+	return pr.loadBaseRepo(x)
+}
+
+func (pr *PullRequest) loadBaseRepo(e Engine) (err error) {
+	if pr.BaseRepo != nil {
 		return nil
 	}
-		var repo Repository
+
-		if has, err := x.ID(pr.HeadRepoID).Get(&repo); err != nil {
+	if pr.HeadRepoID == pr.BaseRepoID && pr.HeadRepo != nil {
-			return err
+		pr.BaseRepo = pr.HeadRepo
-		} else if !has {
+		return nil
-			return ErrRepoNotExist{ID: pr.HeadRepoID}
 	}
-		pr.HeadRepo = &repo
+
+	if pr.Issue != nil && pr.Issue.Repo != nil {
+		pr.BaseRepo = pr.Issue.Repo
+		return nil
+	}
+
+	pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID)
+	if err != nil {
+		return fmt.Errorf("GetRepositoryByID(base): %v", err)
 	}
 	return nil
 }
@@ -425,7 +466,6 @@ func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest {
 		baseBranch *git.Branch
 		headBranch *git.Branch
 		baseCommit *git.Commit
-		headCommit *git.Commit
 		err        error
 	)
 	if err = pr.Issue.loadRepo(e); err != nil {
@@ -433,20 +473,15 @@ func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest {
 		return nil
 	}
 	apiIssue := pr.Issue.apiFormat(e)
-	if pr.BaseRepo == nil {
+	if err := pr.loadBaseRepo(e); err != nil {
-		pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID)
+		log.Error("loadBaseRepo[%d]: %v", pr.ID, err)
-		if err != nil {
-			log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
 		return nil
 	}
-	}
+
-	if pr.HeadRepoID != 0 && pr.HeadRepo == nil {
+	if err := pr.loadHeadRepo(e); err != nil {
-		pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
+		log.Error("loadHeadRepo[%d]: %v", pr.ID, err)
-		if err != nil && !IsErrRepoNotExist(err) {
-			log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
 		return nil
 	}
-	}
 
 	apiPullRequest := &api.PullRequest{
 		ID:        pr.ID,
@@ -469,71 +504,17 @@ func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest {
 		Deadline:  apiIssue.Deadline,
 		Created:   pr.Issue.CreatedUnix.AsTimePtr(),
 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
-	}
+		Base: &api.PRBranchInfo{
-	baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch)
-	if err != nil {
-		if git.IsErrBranchNotExist(err) {
-			apiPullRequest.Base = nil
-		} else {
-			log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
-			return nil
-		}
-	} else {
-		apiBaseBranchInfo := &api.PRBranchInfo{
 			Name:       pr.BaseBranch,
 			Ref:        pr.BaseBranch,
 			RepoID:     pr.BaseRepoID,
 			Repository: pr.BaseRepo.innerAPIFormat(e, AccessModeNone, false),
-		}
+		},
-		baseCommit, err = baseBranch.GetCommit()
+		Head: &api.PRBranchInfo{
-		if err != nil {
-			if git.IsErrNotExist(err) {
-				apiBaseBranchInfo.Sha = ""
-			} else {
-				log.Error("GetCommit[%s]: %v", baseBranch.Name, err)
-				return nil
-			}
-		} else {
-			apiBaseBranchInfo.Sha = baseCommit.ID.String()
-		}
-		apiPullRequest.Base = apiBaseBranchInfo
-	}
-
-	if pr.HeadRepo != nil {
-		headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch)
-		if err != nil {
-			if git.IsErrBranchNotExist(err) {
-				apiPullRequest.Head = nil
-			} else {
-				log.Error("GetBranch[%s]: %v", pr.HeadBranch, err)
-				return nil
-			}
-		} else {
-			apiHeadBranchInfo := &api.PRBranchInfo{
-				Name:       pr.HeadBranch,
-				Ref:        pr.HeadBranch,
-				RepoID:     pr.HeadRepoID,
-				Repository: pr.HeadRepo.innerAPIFormat(e, AccessModeNone, false),
-			}
-			headCommit, err = headBranch.GetCommit()
-			if err != nil {
-				if git.IsErrNotExist(err) {
-					apiHeadBranchInfo.Sha = ""
-				} else {
-					log.Error("GetCommit[%s]: %v", headBranch.Name, err)
-					return nil
-				}
-			} else {
-				apiHeadBranchInfo.Sha = headCommit.ID.String()
-			}
-			apiPullRequest.Head = apiHeadBranchInfo
-		}
-	} else {
-		apiPullRequest.Head = &api.PRBranchInfo{
 			Name:   pr.HeadBranch,
 			Ref:    fmt.Sprintf("refs/pull/%d/head", pr.Index),
 			RepoID: -1,
-		}
+		},
 	}
 
 	if pr.Status != PullRequestStatusChecking {
@@ -546,33 +527,78 @@ func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest {
 		apiPullRequest.MergedBy = pr.Merger.APIFormat()
 	}
 
-	return apiPullRequest
+	baseRepoPath := pr.BaseRepo.repoPath(e)
-}
+	baseGitRepo, err := git.OpenRepository(baseRepoPath)
-
-func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
-	pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
-	if err != nil && !IsErrRepoNotExist(err) {
-		return fmt.Errorf("getRepositoryByID(head): %v", err)
-	}
-	return nil
-}
-
-// GetHeadRepo loads the head repository
-func (pr *PullRequest) GetHeadRepo() error {
-	return pr.getHeadRepo(x)
-}
-
-// GetBaseRepo loads the target repository
-func (pr *PullRequest) GetBaseRepo() (err error) {
-	if pr.BaseRepo != nil {
-		return nil
-	}
-
-	pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
 	if err != nil {
-		return fmt.Errorf("GetRepositoryByID(base): %v", err)
+		log.Error("OpenRepository[%s]: %v", baseRepoPath, err)
-	}
 		return nil
+	}
+	defer baseGitRepo.Close()
+
+	baseBranch, err = baseGitRepo.GetBranch(pr.BaseBranch)
+	if err != nil && !git.IsErrBranchNotExist(err) {
+		log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
+		return nil
+	}
+
+	if err == nil {
+		baseCommit, err = baseBranch.GetCommit()
+		if err != nil && !git.IsErrNotExist(err) {
+			log.Error("GetCommit[%s]: %v", baseBranch.Name, err)
+			return nil
+		}
+
+		if err == nil {
+			apiPullRequest.Base.Sha = baseCommit.ID.String()
+		}
+	}
+
+	if pr.HeadRepo != nil {
+		apiPullRequest.Head.RepoID = pr.HeadRepo.ID
+		apiPullRequest.Head.Repository = pr.HeadRepo.innerAPIFormat(e, AccessModeNone, false)
+
+		var headGitRepo *git.Repository
+		if pr.HeadRepoID == pr.BaseRepoID {
+			headGitRepo = baseGitRepo
+		} else {
+			headRepoPath := pr.HeadRepo.repoPath(e)
+			headGitRepo, err = git.OpenRepository(headRepoPath)
+			if err != nil {
+				log.Error("OpenRepository[%s]: %v", headRepoPath, err)
+				return nil
+			}
+			defer headGitRepo.Close()
+		}
+
+		headBranch, err = headGitRepo.GetBranch(pr.HeadBranch)
+		if err != nil && !git.IsErrBranchNotExist(err) {
+			log.Error("GetBranch[%s]: %v", pr.HeadBranch, err)
+			return nil
+		}
+
+		if git.IsErrBranchNotExist(err) {
+			headCommitID, err := headGitRepo.GetRefCommitID(apiPullRequest.Head.Ref)
+			if err != nil && !git.IsErrNotExist(err) {
+				log.Error("GetCommit[%s]: %v", headBranch.Name, err)
+				return nil
+			}
+			if err == nil {
+				apiPullRequest.Head.Sha = headCommitID
+			}
+		} else {
+			commit, err := headBranch.GetCommit()
+			if err != nil && !git.IsErrNotExist(err) {
+				log.Error("GetCommit[%s]: %v", headBranch.Name, err)
+				return nil
+			}
+			if err == nil {
+				apiPullRequest.Head.Ref = pr.HeadBranch
+				apiPullRequest.Head.Sha = commit.ID.String()
+			}
+		}
+	}
+
+	return apiPullRequest
 }
 
 // IsChecking returns true if this pull request is still checking conflict.
@@ -587,7 +613,7 @@ func (pr *PullRequest) CanAutoMerge() bool {
 
 // GetLastCommitStatus returns the last commit status for this pull request.
 func (pr *PullRequest) GetLastCommitStatus() (status *CommitStatus, err error) {
-	if err = pr.GetHeadRepo(); err != nil {
+	if err = pr.LoadHeadRepo(); err != nil {
 		return nil, err
 	}
 
@@ -641,8 +667,8 @@ func (pr *PullRequest) CheckUserAllowedToMerge(doer *User) (err error) {
 	}
 
 	if pr.BaseRepo == nil {
-		if err = pr.GetBaseRepo(); err != nil {
+		if err = pr.LoadBaseRepo(); err != nil {
-			return fmt.Errorf("GetBaseRepo: %v", err)
+			return fmt.Errorf("LoadBaseRepo: %v", err)
 		}
 	}
 
@@ -921,7 +947,7 @@ func (pr *PullRequest) GetWorkInProgressPrefix() string {
 // IsHeadEqualWithBranch returns if the commits of branchName are available in pull request head
 func (pr *PullRequest) IsHeadEqualWithBranch(branchName string) (bool, error) {
 	var err error
-	if err = pr.GetBaseRepo(); err != nil {
+	if err = pr.LoadBaseRepo(); err != nil {
 		return false, err
 	}
 	baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
@@ -933,9 +959,12 @@ func (pr *PullRequest) IsHeadEqualWithBranch(branchName string) (bool, error) {
 		return false, err
 	}
 
-	if err = pr.GetHeadRepo(); err != nil {
+	if err = pr.LoadHeadRepo(); err != nil {
 		return false, err
 	}
+	if pr.HeadRepo == nil {
+		return false, ErrHeadRepoMissed{pr.ID, pr.HeadRepoID}
+	}
 	headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
 	if err != nil {
 		return false, err

models/pull_sign.go

@@ -12,7 +12,7 @@ import (
 
 // SignMerge determines if we should sign a PR merge commit to the base repository
 func (pr *PullRequest) SignMerge(u *User, tmpBasePath, baseCommit, headCommit string) (bool, string) {
-	if err := pr.GetBaseRepo(); err != nil {
+	if err := pr.LoadBaseRepo(); err != nil {
 		log.Error("Unable to get Base Repo for pull request")
 		return false, ""
 	}

models/pull_test.go

@@ -7,6 +7,7 @@ package models
 import (
 	"testing"
 
+	"code.gitea.io/gitea/modules/structs"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -31,29 +32,36 @@ func TestPullRequest_LoadIssue(t *testing.T) {
 
 func TestPullRequest_APIFormat(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
+	headRepo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
 	pr := AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)
 	assert.NoError(t, pr.LoadAttributes())
 	assert.NoError(t, pr.LoadIssue())
 	apiPullRequest := pr.APIFormat()
 	assert.NotNil(t, apiPullRequest)
-	assert.Nil(t, apiPullRequest.Head)
+	assert.EqualValues(t, &structs.PRBranchInfo{
+		Name:       "branch1",
+		Ref:        "refs/pull/2/head",
+		Sha:        "4a357436d925b5c974181ff12a994538ddc5a269",
+		RepoID:     1,
+		Repository: headRepo.APIFormat(models.AccessModeNone),
+	}, apiPullRequest.Head)
 }
 
-func TestPullRequest_GetBaseRepo(t *testing.T) {
+func TestPullRequest_LoadBaseRepo(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	pr := AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)
-	assert.NoError(t, pr.GetBaseRepo())
+	assert.NoError(t, pr.LoadBaseRepo())
 	assert.NotNil(t, pr.BaseRepo)
 	assert.Equal(t, pr.BaseRepoID, pr.BaseRepo.ID)
-	assert.NoError(t, pr.GetBaseRepo())
+	assert.NoError(t, pr.LoadBaseRepo())
 	assert.NotNil(t, pr.BaseRepo)
 	assert.Equal(t, pr.BaseRepoID, pr.BaseRepo.ID)
 }
 
-func TestPullRequest_GetHeadRepo(t *testing.T) {
+func TestPullRequest_LoadHeadRepo(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	pr := AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)
-	assert.NoError(t, pr.GetHeadRepo())
+	assert.NoError(t, pr.LoadHeadRepo())
 	assert.NotNil(t, pr.HeadRepo)
 	assert.Equal(t, pr.HeadRepoID, pr.HeadRepo.ID)
 }

routers/api/v1/repo/pull.go

@@ -93,14 +93,6 @@ func ListPullRequests(ctx *context.APIContext, form api.ListPullRequestsOptions)
 			ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
 			return
 		}
-		if err = prs[i].GetBaseRepo(); err != nil {
-			ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
-			return
-		}
-		if err = prs[i].GetHeadRepo(); err != nil {
-			ctx.Error(http.StatusInternalServerError, "GetHeadRepo", err)
-			return
-		}
 		apiPrs[i] = prs[i].APIFormat()
 	}
 
@@ -146,14 +138,6 @@ func GetPullRequest(ctx *context.APIContext) {
 		return
 	}
 
-	if err = pr.GetBaseRepo(); err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
-		return
-	}
-	if err = pr.GetHeadRepo(); err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetHeadRepo", err)
-		return
-	}
 	ctx.JSON(http.StatusOK, pr.APIFormat())
 }
 
@@ -569,8 +553,12 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
 		return
 	}
 
-	if err = pr.GetHeadRepo(); err != nil {
+	if err = pr.LoadHeadRepo(); err != nil {
-		ctx.ServerError("GetHeadRepo", err)
+		ctx.ServerError("LoadHeadRepo", err)
+		return
+	}
+	if pr.HeadRepo == nil {
+		ctx.ServerError("LoadHeadRepo", models.ErrHeadRepoMissed{pr.HeadRepoID, pr.ID})
 		return
 	}
 

routers/repo/issue.go

@@ -912,8 +912,8 @@ func ViewIssue(ctx *context.Context) {
 		canDelete := false
 
 		if ctx.IsSigned {
-			if err := pull.GetHeadRepo(); err != nil {
+			if err := pull.LoadHeadRepo(); err != nil {
-				log.Error("GetHeadRepo: %v", err)
+				log.Error("LoadHeadRepo: %v", err)
 			} else if pull.HeadRepo != nil && pull.HeadBranch != pull.HeadRepo.DefaultBranch {
 				perm, err := models.GetUserRepoPermission(pull.HeadRepo, ctx.User)
 				if err != nil {

routers/repo/pull.go

@@ -271,8 +271,8 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
 		return nil
 	}
 
-	if err = issue.PullRequest.GetHeadRepo(); err != nil {
+	if err = issue.PullRequest.LoadHeadRepo(); err != nil {
-		ctx.ServerError("GetHeadRepo", err)
+		ctx.ServerError("LoadHeadRepo", err)
 		return nil
 	}
 
@@ -330,13 +330,13 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
 	repo := ctx.Repo.Repository
 	pull := issue.PullRequest
 
-	if err := pull.GetHeadRepo(); err != nil {
+	if err := pull.LoadHeadRepo(); err != nil {
-		ctx.ServerError("GetHeadRepo", err)
+		ctx.ServerError("LoadHeadRepo", err)
 		return nil
 	}
 
-	if err := pull.GetBaseRepo(); err != nil {
+	if err := pull.LoadBaseRepo(); err != nil {
-		ctx.ServerError("GetBaseRepo", err)
+		ctx.ServerError("LoadBaseRepo", err)
 		return nil
 	}
 
@@ -358,14 +358,17 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
 	var headBranchSha string
 	// HeadRepo may be missing
 	if pull.HeadRepo != nil {
-		var err error
+		var headGitRepo *git.Repository
-
+		if pull.BaseRepoID == pull.HeadRepoID {
-		headGitRepo, err := git.OpenRepository(pull.HeadRepo.RepoPath())
+			headGitRepo = baseGitRepo
+		} else {
+			headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
 			if err != nil {
 				ctx.ServerError("OpenRepository", err)
 				return nil
 			}
 			defer headGitRepo.Close()
+		}
 
 		headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
 
@@ -864,15 +867,15 @@ func CleanUpPullRequest(ctx *context.Context) {
 		return
 	}
 
-	if err := pr.GetHeadRepo(); err != nil {
+	if err := pr.LoadHeadRepo(); err != nil {
-		ctx.ServerError("GetHeadRepo", err)
+		ctx.ServerError("LoadHeadRepo", err)
 		return
 	} else if pr.HeadRepo == nil {
 		// Forked repository has already been deleted
 		ctx.NotFound("CleanUpPullRequest", nil)
 		return
-	} else if err = pr.GetBaseRepo(); err != nil {
+	} else if err = pr.LoadBaseRepo(); err != nil {
-		ctx.ServerError("GetBaseRepo", err)
+		ctx.ServerError("LoadBaseRepo", err)
 		return
 	} else if err = pr.HeadRepo.GetOwner(); err != nil {
 		ctx.ServerError("HeadRepo.GetOwner", err)
@@ -891,13 +894,6 @@ func CleanUpPullRequest(ctx *context.Context) {
 
 	fullBranchName := pr.HeadRepo.Owner.Name + "/" + pr.HeadBranch
 
-	gitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
-	if err != nil {
-		ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.RepoPath()), err)
-		return
-	}
-	defer gitRepo.Close()
-
 	gitBaseRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
 	if err != nil {
 		ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.BaseRepo.RepoPath()), err)
@@ -905,6 +901,18 @@ func CleanUpPullRequest(ctx *context.Context) {
 	}
 	defer gitBaseRepo.Close()
 
+	var gitRepo *git.Repository
+	if pr.HeadRepoID == pr.BaseRepoID {
+		gitRepo = gitBaseRepo
+	} else {
+		gitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
+		if err != nil {
+			ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.RepoPath()), err)
+			return
+		}
+		defer gitRepo.Close()
+	}
+
 	defer func() {
 		ctx.JSON(200, map[string]interface{}{
 			"redirect": pr.BaseRepo.Link() + "/pulls/" + com.ToStr(issue.Index),

routers/user/setting/profile.go

@@ -209,7 +209,7 @@ func Repos(ctx *context.Context) {
 		if repos[i].IsFork {
 			err := repos[i].GetBaseRepo()
 			if err != nil {
-				ctx.ServerError("GetBaseRepo", err)
+				ctx.ServerError("LoadBaseRepo", err)
 				return
 			}
 			err = repos[i].BaseRepo.GetOwner()

services/pull/commit_status.go

@@ -95,6 +95,9 @@ func GetPullRequestCommitStatusState(pr *models.PullRequest) (structs.CommitStat
 	if err := pr.LoadHeadRepo(); err != nil {
 		return "", errors.Wrap(err, "LoadHeadRepo")
 	}
+	if pr.HeadRepo == nil {
+		return "", models.ErrHeadRepoMissed{pr.ID, pr.HeadRepoID}
+	}
 
 	// check if all required status checks are successful
 	headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())

services/pull/merge.go

@@ -38,12 +38,15 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 		return fmt.Errorf("Unable to get git version: %v", err)
 	}
 
-	if err = pr.GetHeadRepo(); err != nil {
+	if err = pr.LoadBaseRepo(); err != nil {
-		log.Error("GetHeadRepo: %v", err)
+		log.Error("LoadBaseRepo: %v", err)
+		return fmt.Errorf("LoadBaseRepo: %v", err)
+	} else if err = pr.LoadHeadRepo(); err != nil {
+		log.Error("LoadHeadRepo: %v", err)
 		return fmt.Errorf("GetHeadRepo: %v", err)
-	} else if err = pr.GetBaseRepo(); err != nil {
+	}
-		log.Error("GetBaseRepo: %v", err)
+	if pr.HeadRepo == nil {
-		return fmt.Errorf("GetBaseRepo: %v", err)
+		return models.ErrHeadRepoMissed{pr.ID, pr.HeadRepoID}
 	}
 
 	prUnit, err := pr.BaseRepo.GetUnit(models.UnitTypePullRequests)

services/pull/pull.go

@@ -235,8 +235,11 @@ func PushToBaseRepo(pr *models.PullRequest) (err error) {
 		log.Error("Unable to load head repository for PR[%d] Error: %v", pr.ID, err)
 		return err
 	}
-	headRepoPath := pr.HeadRepo.RepoPath()
+	if pr.HeadRepo == nil {
+		return models.ErrHeadRepoMissed{pr.ID, pr.HeadRepoID}
+	}
 
+	headRepoPath := pr.HeadRepo.RepoPath()
 	if err := git.Clone(headRepoPath, tmpBasePath, git.CloneRepoOptions{
 		Bare:   true,
 		Shared: true,

services/pull/review.go

@@ -111,8 +111,8 @@ func createCodeComment(doer *models.User, repo *models.Repository, issue *models
 		return nil, fmt.Errorf("GetPullRequestByIssueID: %v", err)
 	}
 	pr := issue.PullRequest
-	if err := pr.GetBaseRepo(); err != nil {
+	if err := pr.LoadBaseRepo(); err != nil {
-		return nil, fmt.Errorf("GetHeadRepo: %v", err)
+		return nil, fmt.Errorf("LoadBaseRepo: %v", err)
 	}
 	gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
 	if err != nil {

services/pull/temp_repo.go

@@ -17,17 +17,18 @@ import (
 )
 
 func createTemporaryRepo(pr *models.PullRequest) (string, error) {
-	if err := pr.GetHeadRepo(); err != nil {
+	if err := pr.LoadHeadRepo(); err != nil {
-		log.Error("GetHeadRepo: %v", err)
+		log.Error("LoadHeadRepo: %v", err)
-		return "", fmt.Errorf("GetHeadRepo: %v", err)
+		return "", fmt.Errorf("LoadHeadRepo: %v", err)
 	} else if pr.HeadRepo == nil {
 		log.Error("Pr %d HeadRepo %d does not exist", pr.ID, pr.HeadRepoID)
-		return "", &models.ErrRepoNotExist{
+		return "", &models.ErrHeadRepoMissed{
-			ID: pr.HeadRepoID,
+			PullID:     pr.ID,
+			HeadRepoID: pr.HeadRepoID,
 		}
-	} else if err := pr.GetBaseRepo(); err != nil {
+	} else if err := pr.LoadBaseRepo(); err != nil {
-		log.Error("GetBaseRepo: %v", err)
+		log.Error("LoadBaseRepo: %v", err)
-		return "", fmt.Errorf("GetBaseRepo: %v", err)
+		return "", fmt.Errorf("LoadBaseRepo: %v", err)
 	} else if pr.BaseRepo == nil {
 		log.Error("Pr %d BaseRepo %d does not exist", pr.ID, pr.BaseRepoID)
 		return "", &models.ErrRepoNotExist{