fix tests

Author: kerwin612

routers/web/repo/commit.go

@@ -370,7 +370,7 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, parentCommit, commit, diffTree, nil)
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)

routers/web/repo/compare.go

@@ -644,22 +644,22 @@ func PrepareCompareDiff(
 		return false
 	}
 
+	baseGitRepo := ctx.Repo.GitRepo
+
+	beforeCommit, err := baseGitRepo.GetCommit(beforeCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return false
+	}
+
 	if !fileOnly {
 		diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID)
 		if err != nil {
 			ctx.ServerError("GetDiffTree", err)
 			return false
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, headCommit, diffTree, nil)
-	}
-
-	baseGitRepo := ctx.Repo.GitRepo
-
-	beforeCommit, err := baseGitRepo.GetCommit(beforeCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return false
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, beforeCommit, headCommit, diffTree, nil)
 	}
 
 	commits, err := processGitCommits(ctx, ci.CompareInfo.Commits)

routers/web/repo/pull.go

@@ -822,6 +822,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		return
 	}
 
+	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return
+	}
+
 	if !fileOnly {
 		// note: use mergeBase is set to false because we already have the merge base from the pull request info
 		diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, startCommitID, endCommitID)
@@ -840,18 +846,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, filesViewedState)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, baseCommit, commit, diffTree, filesViewedState)
 	}
 
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0
 
-	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return
-	}
-
 	if ctx.IsSigned && ctx.Doer != nil {
 		if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil {
 			ctx.ServerError("CanMarkConversation", err)

routers/web/repo/treelist.go

@@ -70,14 +70,17 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(ctx *context.Context, commit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(ctx *context.Context, baseCommit *git.Commit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
 		isViewed := filesViewedState[file.HeadPath] == pull_model.Viewed
-		entry, _ := commit.GetTreeEntryByPath(file.HeadPath)
+		entry, _ := headCommit.GetTreeEntryByPath(file.HeadPath)
+		if entry == nil {
+			entry, _ = baseCommit.GetTreeEntryByPath(file.HeadPath)
+		}
 
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,