2014-03-24 15:55:15 +05:30
|
|
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package repo
|
|
|
|
|
2014-07-26 11:58:04 +05:30
|
|
|
import (
|
2014-12-05 15:32:52 +05:30
|
|
|
"container/list"
|
2014-07-26 11:58:04 +05:30
|
|
|
"path"
|
|
|
|
|
2015-08-20 17:48:49 +05:30
|
|
|
"github.com/Unknwon/paginater"
|
2014-07-26 11:58:04 +05:30
|
|
|
|
2015-12-16 03:55:45 +05:30
|
|
|
"github.com/gogits/git-module"
|
2015-12-10 07:16:05 +05:30
|
|
|
|
2014-07-26 11:58:04 +05:30
|
|
|
"github.com/gogits/gogs/models"
|
|
|
|
"github.com/gogits/gogs/modules/base"
|
|
|
|
"github.com/gogits/gogs/modules/middleware"
|
2014-09-17 09:33:03 +05:30
|
|
|
"github.com/gogits/gogs/modules/setting"
|
2014-07-26 11:58:04 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
COMMITS base.TplName = "repo/commits"
|
|
|
|
DIFF base.TplName = "repo/diff"
|
|
|
|
)
|
|
|
|
|
2014-11-07 08:36:41 +05:30
|
|
|
func RefCommits(ctx *middleware.Context) {
|
|
|
|
switch {
|
|
|
|
case len(ctx.Repo.TreeName) == 0:
|
|
|
|
Commits(ctx)
|
|
|
|
case ctx.Repo.TreeName == "search":
|
|
|
|
SearchCommits(ctx)
|
|
|
|
default:
|
|
|
|
FileHistory(ctx)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-09 12:48:25 +05:30
|
|
|
func RenderIssueLinks(oldCommits *list.List, repoLink string) *list.List {
|
|
|
|
newCommits := list.New()
|
|
|
|
for e := oldCommits.Front(); e != nil; e = e.Next() {
|
|
|
|
c := e.Value.(*git.Commit)
|
|
|
|
newCommits.PushBack(c)
|
|
|
|
}
|
|
|
|
return newCommits
|
|
|
|
}
|
|
|
|
|
2014-07-26 11:58:04 +05:30
|
|
|
func Commits(ctx *middleware.Context) {
|
2015-08-20 17:48:49 +05:30
|
|
|
ctx.Data["PageIsCommits"] = true
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
commitsCount, err := ctx.Repo.Commit.CommitsCount()
|
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(500, "GetCommitsCount", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-08-20 17:48:49 +05:30
|
|
|
page := ctx.QueryInt("page")
|
|
|
|
if page <= 1 {
|
2014-07-26 11:58:04 +05:30
|
|
|
page = 1
|
|
|
|
}
|
2015-12-10 07:16:05 +05:30
|
|
|
ctx.Data["Page"] = paginater.New(int(commitsCount), git.CommitsRangeSize, page, 5)
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
// Both `git log branchName` and `git log commitId` work.
|
2014-09-24 01:00:04 +05:30
|
|
|
commits, err := ctx.Repo.Commit.CommitsByRange(page)
|
2014-07-26 11:58:04 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(500, "CommitsByRange", err)
|
|
|
|
return
|
|
|
|
}
|
2014-12-05 15:32:52 +05:30
|
|
|
commits = RenderIssueLinks(commits, ctx.Repo.RepoLink)
|
2014-09-26 18:25:13 +05:30
|
|
|
commits = models.ValidateCommitsWithEmails(commits)
|
2014-09-24 01:00:04 +05:30
|
|
|
ctx.Data["Commits"] = commits
|
2015-11-11 03:16:17 +05:30
|
|
|
|
|
|
|
ctx.Data["Username"] = ctx.Repo.Owner.Name
|
|
|
|
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.Data["CommitCount"] = commitsCount
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Data["Branch"] = ctx.Repo.BranchName
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.HTML(200, COMMITS)
|
|
|
|
}
|
|
|
|
|
|
|
|
func SearchCommits(ctx *middleware.Context) {
|
2015-08-20 17:48:49 +05:30
|
|
|
ctx.Data["PageIsCommits"] = true
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
keyword := ctx.Query("q")
|
|
|
|
if len(keyword) == 0 {
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
commits, err := ctx.Repo.Commit.SearchCommits(keyword)
|
|
|
|
if err != nil {
|
2014-09-26 06:25:14 +05:30
|
|
|
ctx.Handle(500, "SearchCommits", err)
|
2014-07-26 11:58:04 +05:30
|
|
|
return
|
|
|
|
}
|
2014-12-05 15:32:52 +05:30
|
|
|
commits = RenderIssueLinks(commits, ctx.Repo.RepoLink)
|
2014-09-26 18:25:13 +05:30
|
|
|
commits = models.ValidateCommitsWithEmails(commits)
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Data["Commits"] = commits
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
ctx.Data["Keyword"] = keyword
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Data["Username"] = ctx.Repo.Owner.Name
|
|
|
|
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.Data["CommitCount"] = commits.Len()
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Data["Branch"] = ctx.Repo.BranchName
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.HTML(200, COMMITS)
|
|
|
|
}
|
|
|
|
|
2014-11-07 08:36:41 +05:30
|
|
|
func FileHistory(ctx *middleware.Context) {
|
|
|
|
ctx.Data["IsRepoToolbarCommits"] = true
|
|
|
|
|
|
|
|
fileName := ctx.Repo.TreeName
|
|
|
|
if len(fileName) == 0 {
|
|
|
|
Commits(ctx)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
branchName := ctx.Repo.BranchName
|
|
|
|
commitsCount, err := ctx.Repo.GitRepo.FileCommitsCount(branchName, fileName)
|
|
|
|
if err != nil {
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Handle(500, "FileCommitsCount", err)
|
2014-11-07 08:36:41 +05:30
|
|
|
return
|
|
|
|
} else if commitsCount == 0 {
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Handle(404, "FileCommitsCount", nil)
|
2014-11-07 08:36:41 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-11-11 03:16:17 +05:30
|
|
|
page := ctx.QueryInt("page")
|
|
|
|
if page <= 1 {
|
2014-11-07 08:36:41 +05:30
|
|
|
page = 1
|
|
|
|
}
|
2015-12-10 07:16:05 +05:30
|
|
|
ctx.Data["Page"] = paginater.New(int(commitsCount), git.CommitsRangeSize, page, 5)
|
2014-11-07 08:36:41 +05:30
|
|
|
|
2015-11-11 03:16:17 +05:30
|
|
|
commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange(branchName, fileName, page)
|
2014-11-07 08:36:41 +05:30
|
|
|
if err != nil {
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Handle(500, "CommitsByFileAndRange", err)
|
2014-11-07 08:36:41 +05:30
|
|
|
return
|
|
|
|
}
|
2014-12-05 15:32:52 +05:30
|
|
|
commits = RenderIssueLinks(commits, ctx.Repo.RepoLink)
|
2014-11-07 08:36:41 +05:30
|
|
|
commits = models.ValidateCommitsWithEmails(commits)
|
|
|
|
ctx.Data["Commits"] = commits
|
2015-11-11 03:16:17 +05:30
|
|
|
|
|
|
|
ctx.Data["Username"] = ctx.Repo.Owner.Name
|
|
|
|
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
|
2014-11-07 08:36:41 +05:30
|
|
|
ctx.Data["FileName"] = fileName
|
|
|
|
ctx.Data["CommitCount"] = commitsCount
|
2015-11-11 03:16:17 +05:30
|
|
|
ctx.Data["Branch"] = branchName
|
2014-11-07 08:36:41 +05:30
|
|
|
ctx.HTML(200, COMMITS)
|
|
|
|
}
|
|
|
|
|
2014-07-26 11:58:04 +05:30
|
|
|
func Diff(ctx *middleware.Context) {
|
2015-08-20 21:48:30 +05:30
|
|
|
ctx.Data["PageIsDiff"] = true
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
userName := ctx.Repo.Owner.Name
|
|
|
|
repoName := ctx.Repo.Repository.Name
|
2015-08-31 12:54:28 +05:30
|
|
|
commitID := ctx.Repo.CommitID
|
2014-07-26 11:58:04 +05:30
|
|
|
|
|
|
|
commit := ctx.Repo.Commit
|
2014-09-17 09:33:03 +05:30
|
|
|
diff, err := models.GetDiffCommit(models.RepoPath(userName, repoName),
|
2015-08-31 12:54:28 +05:30
|
|
|
commitID, setting.Git.MaxGitDiffLines)
|
2014-07-26 11:58:04 +05:30
|
|
|
if err != nil {
|
2014-08-26 17:50:18 +05:30
|
|
|
ctx.Handle(404, "GetDiffCommit", err)
|
2014-07-26 11:58:04 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
parents := make([]string, commit.ParentCount())
|
|
|
|
for i := 0; i < commit.ParentCount(); i++ {
|
2015-12-10 07:16:05 +05:30
|
|
|
sha, err := commit.ParentID(i)
|
2014-07-26 11:58:04 +05:30
|
|
|
parents[i] = sha.String()
|
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(404, "repo.Diff", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Data["Username"] = userName
|
|
|
|
ctx.Data["Reponame"] = repoName
|
2015-09-02 13:38:05 +05:30
|
|
|
ctx.Data["IsImageFile"] = commit.IsImageFile
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["Title"] = commit.Summary() + " · " + base.ShortSha(commitID)
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.Data["Commit"] = commit
|
2014-10-11 07:10:51 +05:30
|
|
|
ctx.Data["Author"] = models.ValidateCommitWithEmail(commit)
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.Data["Diff"] = diff
|
|
|
|
ctx.Data["Parents"] = parents
|
|
|
|
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", commitID)
|
2015-08-20 17:48:49 +05:30
|
|
|
if commit.ParentCount() > 0 {
|
2015-02-06 14:32:32 +05:30
|
|
|
ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", parents[0])
|
|
|
|
}
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "raw", commitID)
|
2014-07-26 11:58:04 +05:30
|
|
|
ctx.HTML(200, DIFF)
|
|
|
|
}
|
|
|
|
|
2014-08-26 17:50:18 +05:30
|
|
|
func CompareDiff(ctx *middleware.Context) {
|
|
|
|
ctx.Data["IsRepoToolbarCommits"] = true
|
|
|
|
ctx.Data["IsDiffCompare"] = true
|
|
|
|
userName := ctx.Repo.Owner.Name
|
|
|
|
repoName := ctx.Repo.Repository.Name
|
2015-08-31 12:54:28 +05:30
|
|
|
beforeCommitID := ctx.Params(":before")
|
|
|
|
afterCommitID := ctx.Params(":after")
|
2014-08-26 17:50:18 +05:30
|
|
|
|
2015-08-31 12:54:28 +05:30
|
|
|
commit, err := ctx.Repo.GitRepo.GetCommit(afterCommitID)
|
2014-08-26 17:50:18 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(404, "GetCommit", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-08-31 12:54:28 +05:30
|
|
|
diff, err := models.GetDiffRange(models.RepoPath(userName, repoName), beforeCommitID,
|
|
|
|
afterCommitID, setting.Git.MaxGitDiffLines)
|
2014-08-26 17:50:18 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(404, "GetDiffRange", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-08-31 12:54:28 +05:30
|
|
|
commits, err := commit.CommitsBeforeUntil(beforeCommitID)
|
2014-08-26 17:50:18 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.Handle(500, "CommitsBeforeUntil", err)
|
|
|
|
return
|
|
|
|
}
|
2014-10-11 07:10:51 +05:30
|
|
|
commits = models.ValidateCommitsWithEmails(commits)
|
2014-08-26 17:50:18 +05:30
|
|
|
|
2015-09-02 04:37:02 +05:30
|
|
|
ctx.Data["CommitRepoLink"] = ctx.Repo.RepoLink
|
2014-08-26 17:50:18 +05:30
|
|
|
ctx.Data["Commits"] = commits
|
|
|
|
ctx.Data["CommitCount"] = commits.Len()
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["BeforeCommitID"] = beforeCommitID
|
|
|
|
ctx.Data["AfterCommitID"] = afterCommitID
|
2014-08-26 17:50:18 +05:30
|
|
|
ctx.Data["Username"] = userName
|
|
|
|
ctx.Data["Reponame"] = repoName
|
2015-09-02 13:38:05 +05:30
|
|
|
ctx.Data["IsImageFile"] = commit.IsImageFile
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + "..." + base.ShortSha(afterCommitID) + " · " + userName + "/" + repoName
|
2014-08-26 17:50:18 +05:30
|
|
|
ctx.Data["Commit"] = commit
|
|
|
|
ctx.Data["Diff"] = diff
|
|
|
|
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
|
2015-08-31 12:54:28 +05:30
|
|
|
ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", afterCommitID)
|
|
|
|
ctx.Data["BeforeSourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", beforeCommitID)
|
|
|
|
ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "raw", afterCommitID)
|
2014-08-26 17:50:18 +05:30
|
|
|
ctx.HTML(200, DIFF)
|
|
|
|
}
|