forked from gitea/gitea
1
0
Fork 0
gitea/routers/repo/commit.go

320 lines
9.3 KiB
Go
Raw Normal View History

2014-03-24 18:25:15 +08:00
// Copyright 2014 The Gogs Authors. All rights reserved.
// Copyright 2019 The Gitea Authors. All rights reserved.
2014-03-24 18:25:15 +08:00
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package repo
import (
"path"
"strings"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
const (
2016-11-24 15:04:31 +08:00
tplCommits base.TplName = "repo/commits"
tplGraph base.TplName = "repo/graph"
2016-11-24 15:04:31 +08:00
tplDiff base.TplName = "repo/diff/page"
)
2016-11-24 15:04:31 +08:00
// RefCommits render commits page
2016-03-12 00:56:52 +08:00
func RefCommits(ctx *context.Context) {
2014-11-07 11:06:41 +08:00
switch {
2016-08-25 12:35:03 +08:00
case len(ctx.Repo.TreePath) == 0:
2014-11-07 11:06:41 +08:00
Commits(ctx)
2016-08-25 12:35:03 +08:00
case ctx.Repo.TreePath == "search":
2014-11-07 11:06:41 +08:00
SearchCommits(ctx)
default:
FileHistory(ctx)
}
}
2016-11-24 15:04:31 +08:00
// Commits render branch's commits
2016-03-12 00:56:52 +08:00
func Commits(ctx *context.Context) {
2015-08-20 20:18:49 +08:00
ctx.Data["PageIsCommits"] = true
if ctx.Repo.Commit == nil {
ctx.NotFound("Commit not found", nil)
return
}
ctx.Data["PageIsViewCode"] = true
commitsCount, err := ctx.Repo.GetCommitsCount()
if err != nil {
ctx.ServerError("GetCommitsCount", err)
return
}
2015-08-20 20:18:49 +08:00
page := ctx.QueryInt("page")
if page <= 1 {
page = 1
}
// Both `git log branchName` and `git log commitId` work.
2014-09-24 03:30:04 +08:00
commits, err := ctx.Repo.Commit.CommitsByRange(page)
if err != nil {
ctx.ServerError("CommitsByRange", err)
return
}
2014-09-26 20:55:13 +08:00
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
2014-09-24 03:30:04 +08:00
ctx.Data["Commits"] = commits
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
ctx.Data["CommitCount"] = commitsCount
ctx.Data["Branch"] = ctx.Repo.BranchName
pager := context.NewPagination(int(commitsCount), git.CommitsRangeSize, page, 5)
pager.SetDefaultParams(ctx)
ctx.Data["Page"] = pager
2016-11-24 15:04:31 +08:00
ctx.HTML(200, tplCommits)
}
// Graph render commit graph - show commits from all branches.
func Graph(ctx *context.Context) {
ctx.Data["PageIsCommits"] = true
ctx.Data["PageIsViewCode"] = true
commitsCount, err := ctx.Repo.GetCommitsCount()
if err != nil {
ctx.ServerError("GetCommitsCount", err)
return
}
graph, err := models.GetCommitGraph(ctx.Repo.GitRepo)
if err != nil {
ctx.ServerError("GetCommitGraph", err)
return
}
ctx.Data["Graph"] = graph
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
ctx.Data["CommitCount"] = commitsCount
ctx.Data["Branch"] = ctx.Repo.BranchName
ctx.Data["RequireGitGraph"] = true
ctx.HTML(200, tplGraph)
}
2016-11-24 15:04:31 +08:00
// SearchCommits render commits filtered by keyword
2016-03-12 00:56:52 +08:00
func SearchCommits(ctx *context.Context) {
2015-08-20 20:18:49 +08:00
ctx.Data["PageIsCommits"] = true
ctx.Data["PageIsViewCode"] = true
query := strings.Trim(ctx.Query("q"), " ")
if len(query) == 0 {
ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchNameSubURL())
return
}
all := ctx.QueryBool("all")
opts := git.NewSearchCommitsOptions(query, all)
commits, err := ctx.Repo.Commit.SearchCommits(opts)
if err != nil {
ctx.ServerError("SearchCommits", err)
return
}
2014-09-26 20:55:13 +08:00
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
ctx.Data["Commits"] = commits
ctx.Data["Keyword"] = query
if all {
ctx.Data["All"] = "checked"
}
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
ctx.Data["CommitCount"] = commits.Len()
ctx.Data["Branch"] = ctx.Repo.BranchName
2016-11-24 15:04:31 +08:00
ctx.HTML(200, tplCommits)
}
2016-11-24 15:04:31 +08:00
// FileHistory show a file's reversions
2016-03-12 00:56:52 +08:00
func FileHistory(ctx *context.Context) {
2014-11-07 11:06:41 +08:00
ctx.Data["IsRepoToolbarCommits"] = true
2016-08-25 12:35:03 +08:00
fileName := ctx.Repo.TreePath
2014-11-07 11:06:41 +08:00
if len(fileName) == 0 {
Commits(ctx)
return
}
branchName := ctx.Repo.BranchName
commitsCount, err := ctx.Repo.GitRepo.FileCommitsCount(branchName, fileName)
if err != nil {
ctx.ServerError("FileCommitsCount", err)
2014-11-07 11:06:41 +08:00
return
} else if commitsCount == 0 {
ctx.NotFound("FileCommitsCount", nil)
2014-11-07 11:06:41 +08:00
return
}
page := ctx.QueryInt("page")
if page <= 1 {
2014-11-07 11:06:41 +08:00
page = 1
}
commits, err := ctx.Repo.GitRepo.CommitsByFileAndRange(branchName, fileName, page)
2014-11-07 11:06:41 +08:00
if err != nil {
ctx.ServerError("CommitsByFileAndRange", err)
2014-11-07 11:06:41 +08:00
return
}
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
2014-11-07 11:06:41 +08:00
ctx.Data["Commits"] = commits
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
2014-11-07 11:06:41 +08:00
ctx.Data["FileName"] = fileName
ctx.Data["CommitCount"] = commitsCount
ctx.Data["Branch"] = branchName
pager := context.NewPagination(int(commitsCount), git.CommitsRangeSize, page, 5)
pager.SetDefaultParams(ctx)
ctx.Data["Page"] = pager
2016-11-24 15:04:31 +08:00
ctx.HTML(200, tplCommits)
2014-11-07 11:06:41 +08:00
}
2016-11-24 15:04:31 +08:00
// Diff show different from current commit to previous commit
2016-03-12 00:56:52 +08:00
func Diff(ctx *context.Context) {
2015-08-21 00:18:30 +08:00
ctx.Data["PageIsDiff"] = true
2016-08-16 22:31:54 +08:00
ctx.Data["RequireHighlightJS"] = true
userName := ctx.Repo.Owner.Name
repoName := ctx.Repo.Repository.Name
2016-03-21 22:49:46 +08:00
commitID := ctx.Params(":sha")
commit, err := ctx.Repo.GitRepo.GetCommit(commitID)
if err != nil {
if git.IsErrNotExist(err) {
ctx.NotFound("Repo.GitRepo.GetCommit", err)
} else {
ctx.ServerError("Repo.GitRepo.GetCommit", err)
}
2016-03-21 22:49:46 +08:00
return
}
if len(commitID) != 40 {
commitID = commit.ID.String()
}
statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, commitID, 0)
if err != nil {
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
2019-04-02 15:48:31 +08:00
log.Error("GetLatestCommitStatus: %v", err)
}
ctx.Data["CommitStatus"] = models.CalcCommitStatus(statuses)
diff, err := models.GetDiffCommit(models.RepoPath(userName, repoName),
commitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
if err != nil {
ctx.NotFound("GetDiffCommit", err)
return
}
parents := make([]string, commit.ParentCount())
for i := 0; i < commit.ParentCount(); i++ {
sha, err := commit.ParentID(i)
parents[i] = sha.String()
if err != nil {
ctx.NotFound("repo.Diff", err)
return
}
}
2016-03-21 22:49:46 +08:00
ctx.Data["CommitID"] = commitID
ctx.Data["Username"] = userName
ctx.Data["Reponame"] = repoName
2015-09-02 16:08:05 +08:00
ctx.Data["IsImageFile"] = commit.IsImageFile
2015-08-31 15:24:28 +08:00
ctx.Data["Title"] = commit.Summary() + " · " + base.ShortSha(commitID)
ctx.Data["Commit"] = commit
ctx.Data["Verification"] = models.ParseCommitWithSignature(commit)
2014-10-11 09:40:51 +08:00
ctx.Data["Author"] = models.ValidateCommitWithEmail(commit)
ctx.Data["Diff"] = diff
ctx.Data["Parents"] = parents
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", commitID)
2015-08-20 20:18:49 +08:00
if commit.ParentCount() > 0 {
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", parents[0])
}
ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", "commit", commitID)
Improve listing performance by using go-git (#6478) * Use go-git for tree reading and commit info lookup. Signed-off-by: Filip Navara <navara@emclient.com> * Use TreeEntry.IsRegular() instead of ObjectType that was removed. Signed-off-by: Filip Navara <navara@emclient.com> * Use the treePath to optimize commit info search. Signed-off-by: Filip Navara <navara@emclient.com> * Extract the latest commit at treePath along with the other commits. Signed-off-by: Filip Navara <navara@emclient.com> * Fix listing commit info for a directory that was created in one commit and never modified after. Signed-off-by: Filip Navara <navara@emclient.com> * Avoid nearly all external 'git' invocations when doing directory listing (.editorconfig code path is still hit). Signed-off-by: Filip Navara <navara@emclient.com> * Use go-git for reading blobs. Signed-off-by: Filip Navara <navara@emclient.com> * Make SHA1 type alias for plumbing.Hash in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Make Signature type alias for object.Signature in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Fix GetCommitsInfo for repository with only one commit. Signed-off-by: Filip Navara <navara@emclient.com> * Fix PGP signature verification. Signed-off-by: Filip Navara <navara@emclient.com> * Fix issues with walking commit graph across merges. Signed-off-by: Filip Navara <navara@emclient.com> * Fix typo in condition. Signed-off-by: Filip Navara <navara@emclient.com> * Speed up loading branch list by keeping the repository reference (and thus all the loaded packfile indexes). Signed-off-by: Filip Navara <navara@emclient.com> * Fix lising submodules. Signed-off-by: Filip Navara <navara@emclient.com> * Fix build Signed-off-by: Filip Navara <navara@emclient.com> * Add back commit cache because of name-rev Signed-off-by: Filip Navara <navara@emclient.com> * Fix tests Signed-off-by: Filip Navara <navara@emclient.com> * Fix code style * Fix spelling * Address PR feedback Signed-off-by: Filip Navara <navara@emclient.com> * Update vendor module list Signed-off-by: Filip Navara <navara@emclient.com> * Fix getting trees by commit id Signed-off-by: Filip Navara <navara@emclient.com> * Fix remaining unit test failures * Fix GetTreeBySHA * Avoid running `git name-rev` if not necessary Signed-off-by: Filip Navara <navara@emclient.com> * Move Branch code to git module * Clean up GPG signature verification and fix it for tagged commits * Address PR feedback (import formatting, copyright headers) * Make blob lookup by SHA working * Update tests to use public API * Allow getting content from any type of object through the blob interface * Change test to actually expect the object content that is in the GIT repository * Change one more test to actually expect the object content that is in the GIT repository * Add comments
2019-04-19 20:17:27 +08:00
ctx.Data["BranchName"], err = commit.GetBranchName()
2016-11-24 15:04:31 +08:00
ctx.HTML(200, tplDiff)
}
2016-11-24 15:04:31 +08:00
// RawDiff dumps diff results of repository in given commit ID to io.Writer
2016-03-21 22:49:46 +08:00
func RawDiff(ctx *context.Context) {
if err := models.GetRawDiff(
models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name),
ctx.Params(":sha"),
models.RawDiffType(ctx.Params(":ext")),
ctx.Resp,
); err != nil {
ctx.ServerError("GetRawDiff", err)
return
}
2016-03-21 22:49:46 +08:00
}
2016-11-24 15:04:31 +08:00
// CompareDiff show different from one commit to another commit
2016-03-12 00:56:52 +08:00
func CompareDiff(ctx *context.Context) {
2014-08-26 20:20:18 +08:00
ctx.Data["IsRepoToolbarCommits"] = true
ctx.Data["IsDiffCompare"] = true
userName := ctx.Repo.Owner.Name
repoName := ctx.Repo.Repository.Name
2015-08-31 15:24:28 +08:00
beforeCommitID := ctx.Params(":before")
afterCommitID := ctx.Params(":after")
2014-08-26 20:20:18 +08:00
2015-08-31 15:24:28 +08:00
commit, err := ctx.Repo.GitRepo.GetCommit(afterCommitID)
2014-08-26 20:20:18 +08:00
if err != nil {
ctx.NotFound("GetCommit", err)
2014-08-26 20:20:18 +08:00
return
}
2015-08-31 15:24:28 +08:00
diff, err := models.GetDiffRange(models.RepoPath(userName, repoName), beforeCommitID,
afterCommitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
2014-08-26 20:20:18 +08:00
if err != nil {
ctx.NotFound("GetDiffRange", err)
2014-08-26 20:20:18 +08:00
return
}
2015-08-31 15:24:28 +08:00
commits, err := commit.CommitsBeforeUntil(beforeCommitID)
2014-08-26 20:20:18 +08:00
if err != nil {
ctx.ServerError("CommitsBeforeUntil", err)
2014-08-26 20:20:18 +08:00
return
}
2014-10-11 09:40:51 +08:00
commits = models.ValidateCommitsWithEmails(commits)
commits = models.ParseCommitsWithSignature(commits)
commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
2014-08-26 20:20:18 +08:00
2015-09-02 07:07:02 +08:00
ctx.Data["CommitRepoLink"] = ctx.Repo.RepoLink
2014-08-26 20:20:18 +08:00
ctx.Data["Commits"] = commits
ctx.Data["CommitCount"] = commits.Len()
2015-08-31 15:24:28 +08:00
ctx.Data["BeforeCommitID"] = beforeCommitID
ctx.Data["AfterCommitID"] = afterCommitID
2014-08-26 20:20:18 +08:00
ctx.Data["Username"] = userName
ctx.Data["Reponame"] = repoName
2015-09-02 16:08:05 +08:00
ctx.Data["IsImageFile"] = commit.IsImageFile
2015-08-31 15:24:28 +08:00
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + "..." + base.ShortSha(afterCommitID) + " · " + userName + "/" + repoName
2014-08-26 20:20:18 +08:00
ctx.Data["Commit"] = commit
ctx.Data["Diff"] = diff
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", afterCommitID)
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", beforeCommitID)
ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", "commit", afterCommitID)
ctx.Data["RequireHighlightJS"] = true
2016-11-24 15:04:31 +08:00
ctx.HTML(200, tplDiff)
2014-08-26 20:20:18 +08:00
}