@@ -0,0 +1,124 @@ | |||
// Copyright 2019 The Gitea 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 models | |||
import ( | |||
"bufio" | |||
"fmt" | |||
"io" | |||
"os" | |||
"os/exec" | |||
"regexp" | |||
"code.gitea.io/gitea/modules/git" | |||
"code.gitea.io/gitea/modules/process" | |||
) | |||
// BlamePart represents block of blame - continuous lines with one sha | |||
type BlamePart struct { | |||
Sha string | |||
Lines []string | |||
} | |||
// BlameReader returns part of file blame one by one | |||
type BlameReader struct { | |||
cmd *exec.Cmd | |||
pid int64 | |||
output io.ReadCloser | |||
scanner *bufio.Scanner | |||
lastSha *string | |||
} | |||
var shaLineRegex = regexp.MustCompile("^([a-z0-9]{40})") | |||
// NextPart returns next part of blame (sequencial code lines with the same commit) | |||
func (r *BlameReader) NextPart() (*BlamePart, error) { | |||
var blamePart *BlamePart | |||
scanner := r.scanner | |||
if r.lastSha != nil { | |||
blamePart = &BlamePart{*r.lastSha, make([]string, 0, 0)} | |||
} | |||
for scanner.Scan() { | |||
line := scanner.Text() | |||
// Skip empty lines | |||
if len(line) == 0 { | |||
continue | |||
} | |||
lines := shaLineRegex.FindStringSubmatch(line) | |||
if lines != nil { | |||
sha1 := lines[1] | |||
if blamePart == nil { | |||
blamePart = &BlamePart{sha1, make([]string, 0, 0)} | |||
} | |||
if blamePart.Sha != sha1 { | |||
r.lastSha = &sha1 | |||
return blamePart, nil | |||
} | |||
} else if line[0] == '\t' { | |||
code := line[1:] | |||
blamePart.Lines = append(blamePart.Lines, code) | |||
} | |||
} | |||
r.lastSha = nil | |||
return blamePart, nil | |||
} | |||
// Close BlameReader - don't run NextPart after invoking that | |||
func (r *BlameReader) Close() error { | |||
process.GetManager().Remove(r.pid) | |||
if err := r.cmd.Wait(); err != nil { | |||
return fmt.Errorf("Wait: %v", err) | |||
} | |||
return nil | |||
} | |||
// CreateBlameReader creates reader for given repository, commit and file | |||
func CreateBlameReader(repoPath, commitID, file string) (*BlameReader, error) { | |||
_, err := git.OpenRepository(repoPath) | |||
if err != nil { | |||
return nil, err | |||
} | |||
return createBlameReader(repoPath, "git", "blame", commitID, "--porcelain", "--", file) | |||
} | |||
func createBlameReader(dir string, command ...string) (*BlameReader, error) { | |||
cmd := exec.Command(command[0], command[1:]...) | |||
cmd.Dir = dir | |||
cmd.Stderr = os.Stderr | |||
stdout, err := cmd.StdoutPipe() | |||
if err != nil { | |||
return nil, fmt.Errorf("StdoutPipe: %v", err) | |||
} | |||
if err = cmd.Start(); err != nil { | |||
return nil, fmt.Errorf("Start: %v", err) | |||
} | |||
pid := process.GetManager().Add(fmt.Sprintf("GetBlame [repo_path: %s]", dir), cmd) | |||
scanner := bufio.NewScanner(stdout) | |||
return &BlameReader{ | |||
cmd, | |||
pid, | |||
stdout, | |||
scanner, | |||
nil, | |||
}, nil | |||
} |
@@ -0,0 +1,141 @@ | |||
// Copyright 2019 The Gitea 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 models | |||
import ( | |||
"io/ioutil" | |||
"testing" | |||
"github.com/stretchr/testify/assert" | |||
) | |||
const exampleBlame = ` | |||
4b92a6c2df28054ad766bc262f308db9f6066596 1 1 1 | |||
author Unknown | |||
author-mail <joe2010xtmf@163.com> | |||
author-time 1392833071 | |||
author-tz -0500 | |||
committer Unknown | |||
committer-mail <joe2010xtmf@163.com> | |||
committer-time 1392833071 | |||
committer-tz -0500 | |||
summary Add code of delete user | |||
previous be0ba9ea88aff8a658d0495d36accf944b74888d gogs.go | |||
filename gogs.go | |||
// Copyright 2014 The Gogs Authors. All rights reserved. | |||
ce21ed6c3490cdfad797319cbb1145e2330a8fef 2 2 1 | |||
author Joubert RedRat | |||
author-mail <eu+github@redrat.com.br> | |||
author-time 1482322397 | |||
author-tz -0200 | |||
committer Lunny Xiao | |||
committer-mail <xiaolunwen@gmail.com> | |||
committer-time 1482322397 | |||
committer-tz +0800 | |||
summary Remove remaining Gogs reference on locales and cmd (#430) | |||
previous 618407c018cdf668ceedde7454c42fb22ba422d8 main.go | |||
filename main.go | |||
// Copyright 2016 The Gitea Authors. All rights reserved. | |||
4b92a6c2df28054ad766bc262f308db9f6066596 2 3 2 | |||
author Unknown | |||
author-mail <joe2010xtmf@163.com> | |||
author-time 1392833071 | |||
author-tz -0500 | |||
committer Unknown | |||
committer-mail <joe2010xtmf@163.com> | |||
committer-time 1392833071 | |||
committer-tz -0500 | |||
summary Add code of delete user | |||
previous be0ba9ea88aff8a658d0495d36accf944b74888d gogs.go | |||
filename gogs.go | |||
// Use of this source code is governed by a MIT-style | |||
4b92a6c2df28054ad766bc262f308db9f6066596 3 4 | |||
author Unknown | |||
author-mail <joe2010xtmf@163.com> | |||
author-time 1392833071 | |||
author-tz -0500 | |||
committer Unknown | |||
committer-mail <joe2010xtmf@163.com> | |||
committer-time 1392833071 | |||
committer-tz -0500 | |||
summary Add code of delete user | |||
previous be0ba9ea88aff8a658d0495d36accf944b74888d gogs.go | |||
filename gogs.go | |||
// license that can be found in the LICENSE file. | |||
e2aa991e10ffd924a828ec149951f2f20eecead2 6 6 2 | |||
author Lunny Xiao | |||
author-mail <xiaolunwen@gmail.com> | |||
author-time 1478872595 | |||
author-tz +0800 | |||
committer Sandro Santilli | |||
committer-mail <strk@kbt.io> | |||
committer-time 1478872595 | |||
committer-tz +0100 | |||
summary ask for go get from code.gitea.io/gitea and change gogs to gitea on main file (#146) | |||
previous 5fc370e332171b8658caed771b48585576f11737 main.go | |||
filename main.go | |||
// Gitea (git with a cup of tea) is a painless self-hosted Git Service. | |||
e2aa991e10ffd924a828ec149951f2f20eecead2 7 7 | |||
package main // import "code.gitea.io/gitea" | |||
` | |||
func TestReadingBlameOutput(t *testing.T) { | |||
tempFile, err := ioutil.TempFile("", ".txt") | |||
if err != nil { | |||
panic(err) | |||
} | |||
defer tempFile.Close() | |||
if _, err = tempFile.WriteString(exampleBlame); err != nil { | |||
panic(err) | |||
} | |||
blameReader, err := createBlameReader("", "cat", tempFile.Name()) | |||
if err != nil { | |||
panic(err) | |||
} | |||
defer blameReader.Close() | |||
parts := []*BlamePart{ | |||
{ | |||
"4b92a6c2df28054ad766bc262f308db9f6066596", | |||
[]string{ | |||
"// Copyright 2014 The Gogs Authors. All rights reserved.", | |||
}, | |||
}, | |||
{ | |||
"ce21ed6c3490cdfad797319cbb1145e2330a8fef", | |||
[]string{ | |||
"// Copyright 2016 The Gitea Authors. All rights reserved.", | |||
}, | |||
}, | |||
{ | |||
"4b92a6c2df28054ad766bc262f308db9f6066596", | |||
[]string{ | |||
"// Use of this source code is governed by a MIT-style", | |||
"// license that can be found in the LICENSE file.", | |||
"", | |||
}, | |||
}, | |||
{ | |||
"e2aa991e10ffd924a828ec149951f2f20eecead2", | |||
[]string{ | |||
"// Gitea (git with a cup of tea) is a painless self-hosted Git Service.", | |||
"package main // import \"code.gitea.io/gitea\"", | |||
}, | |||
}, | |||
nil, | |||
} | |||
for _, part := range parts { | |||
actualPart, err := blameReader.NextPart() | |||
if err != nil { | |||
panic(err) | |||
} | |||
assert.Equal(t, part, actualPart) | |||
} | |||
} |
@@ -651,6 +651,8 @@ video_not_supported_in_browser = Your browser does not support the HTML5 'video' | |||
audio_not_supported_in_browser = Your browser does not support the HTML5 'audio' tag. | |||
stored_lfs = Stored with Git LFS | |||
commit_graph = Commit Graph | |||
blame = Blame | |||
normal_view = Normal View | |||
editor.new_file = New File | |||
editor.upload_file = Upload File |
@@ -373,6 +373,53 @@ | |||
} | |||
} | |||
} | |||
.lines-commit { | |||
vertical-align: top; | |||
color: #999; | |||
padding: 0; | |||
background: #f5f5f5; | |||
width: 1%; | |||
-moz-user-select: none; | |||
-ms-user-select: none; | |||
-webkit-user-select: none; | |||
user-select: none; | |||
.blame-info { | |||
width: 350px; | |||
max-width: 350px; | |||
display: block; | |||
user-select: none; | |||
padding: 0 0 0 10px; | |||
.blame-data { | |||
display: flex; | |||
font-family: @default-fonts; | |||
.blame-message { | |||
flex-grow: 2; | |||
overflow: hidden; | |||
white-space: nowrap; | |||
text-overflow: ellipsis; | |||
line-height: 20px; | |||
} | |||
.blame-time, .blame-avatar { | |||
flex-shrink: 0; | |||
} | |||
} | |||
} | |||
.ui.avatar.image { | |||
height: 18px; | |||
width: 18px; | |||
} | |||
} | |||
.lines-num, | |||
.lines-code, | |||
.lines-commit { | |||
.bottom-line { | |||
border-bottom: 1px solid #eaecef; | |||
} | |||
} | |||
.active { | |||
background: #ffffdd; | |||
} |
@@ -0,0 +1,253 @@ | |||
// Copyright 2019 The Gitea 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 | |||
import ( | |||
"bytes" | |||
"container/list" | |||
"fmt" | |||
"html" | |||
gotemplate "html/template" | |||
"net/url" | |||
"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/highlight" | |||
"code.gitea.io/gitea/modules/log" | |||
"code.gitea.io/gitea/modules/markup" | |||
"code.gitea.io/gitea/modules/setting" | |||
"code.gitea.io/gitea/modules/util" | |||
) | |||
const ( | |||
tplBlame base.TplName = "repo/home" | |||
) | |||
// RefBlame render blame page | |||
func RefBlame(ctx *context.Context) { | |||
fileName := ctx.Repo.TreePath | |||
if len(fileName) == 0 { | |||
ctx.NotFound("Blame FileName", nil) | |||
return | |||
} | |||
userName := ctx.Repo.Owner.Name | |||
repoName := ctx.Repo.Repository.Name | |||
commitID := ctx.Repo.CommitID | |||
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) | |||
} | |||
return | |||
} | |||
if len(commitID) != 40 { | |||
commitID = commit.ID.String() | |||
} | |||
branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() | |||
treeLink := branchLink | |||
rawLink := ctx.Repo.RepoLink + "/raw/" + ctx.Repo.BranchNameSubURL() | |||
if len(ctx.Repo.TreePath) > 0 { | |||
treeLink += "/" + ctx.Repo.TreePath | |||
} | |||
var treeNames []string | |||
paths := make([]string, 0, 5) | |||
if len(ctx.Repo.TreePath) > 0 { | |||
treeNames = strings.Split(ctx.Repo.TreePath, "/") | |||
for i := range treeNames { | |||
paths = append(paths, strings.Join(treeNames[:i+1], "/")) | |||
} | |||
ctx.Data["HasParentPath"] = true | |||
if len(paths)-2 >= 0 { | |||
ctx.Data["ParentPath"] = "/" + paths[len(paths)-1] | |||
} | |||
} | |||
// Show latest commit info of repository in table header, | |||
// or of directory if not in root directory. | |||
latestCommit := ctx.Repo.Commit | |||
if len(ctx.Repo.TreePath) > 0 { | |||
latestCommit, err = ctx.Repo.Commit.GetCommitByPath(ctx.Repo.TreePath) | |||
if err != nil { | |||
ctx.ServerError("GetCommitByPath", err) | |||
return | |||
} | |||
} | |||
ctx.Data["LatestCommit"] = latestCommit | |||
ctx.Data["LatestCommitVerification"] = models.ParseCommitWithSignature(latestCommit) | |||
ctx.Data["LatestCommitUser"] = models.ValidateCommitWithEmail(latestCommit) | |||
statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, ctx.Repo.Commit.ID.String(), 0) | |||
if err != nil { | |||
log.Error("GetLatestCommitStatus: %v", err) | |||
} | |||
// Get current entry user currently looking at. | |||
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath) | |||
if err != nil { | |||
ctx.NotFoundOrServerError("Repo.Commit.GetTreeEntryByPath", git.IsErrNotExist, err) | |||
return | |||
} | |||
blob := entry.Blob() | |||
ctx.Data["LatestCommitStatus"] = models.CalcCommitStatus(statuses) | |||
ctx.Data["Paths"] = paths | |||
ctx.Data["TreeLink"] = treeLink | |||
ctx.Data["TreeNames"] = treeNames | |||
ctx.Data["BranchLink"] = branchLink | |||
ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(entry.Name()) | |||
if !markup.IsReadmeFile(blob.Name()) { | |||
ctx.Data["RequireHighlightJS"] = true | |||
} | |||
ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath | |||
ctx.Data["PageIsViewCode"] = true | |||
ctx.Data["IsBlame"] = true | |||
if ctx.Repo.CanEnableEditor() { | |||
ctx.Data["CanDeleteFile"] = true | |||
ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") | |||
} else if !ctx.Repo.IsViewBranch { | |||
ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") | |||
} else if !ctx.Repo.CanWrite(models.UnitTypeCode) { | |||
ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access") | |||
} | |||
ctx.Data["FileSize"] = blob.Size() | |||
ctx.Data["FileName"] = blob.Name() | |||
blameReader, err := models.CreateBlameReader(models.RepoPath(userName, repoName), commitID, fileName) | |||
if err != nil { | |||
ctx.NotFound("CreateBlameReader", err) | |||
return | |||
} | |||
defer blameReader.Close() | |||
blameParts := make([]models.BlamePart, 0) | |||
for { | |||
blamePart, err := blameReader.NextPart() | |||
if err != nil { | |||
ctx.NotFound("NextPart", err) | |||
return | |||
} | |||
if blamePart == nil { | |||
break | |||
} | |||
blameParts = append(blameParts, *blamePart) | |||
} | |||
commitNames := make(map[string]models.UserCommit) | |||
commits := list.New() | |||
for _, part := range blameParts { | |||
sha := part.Sha | |||
if _, ok := commitNames[sha]; ok { | |||
continue | |||
} | |||
commit, err := ctx.Repo.GitRepo.GetCommit(sha) | |||
if err != nil { | |||
if git.IsErrNotExist(err) { | |||
ctx.NotFound("Repo.GitRepo.GetCommit", err) | |||
} else { | |||
ctx.ServerError("Repo.GitRepo.GetCommit", err) | |||
} | |||
return | |||
} | |||
commits.PushBack(commit) | |||
commitNames[commit.ID.String()] = models.UserCommit{} | |||
} | |||
commits = models.ValidateCommitsWithEmails(commits) | |||
for e := commits.Front(); e != nil; e = e.Next() { | |||
c := e.Value.(models.UserCommit) | |||
commitNames[c.ID.String()] = c | |||
} | |||
renderBlame(ctx, blameParts, commitNames) | |||
ctx.HTML(200, tplBlame) | |||
} | |||
func renderBlame(ctx *context.Context, blameParts []models.BlamePart, commitNames map[string]models.UserCommit) { | |||
repoLink := ctx.Repo.RepoLink | |||
var lines = make([]string, 0, 0) | |||
var commitInfo bytes.Buffer | |||
var lineNumbers bytes.Buffer | |||
var codeLines bytes.Buffer | |||
var i = 0 | |||
for pi, part := range blameParts { | |||
for index, line := range part.Lines { | |||
i++ | |||
lines = append(lines, line) | |||
var attr = "" | |||
if len(part.Lines)-1 == index && len(blameParts)-1 != pi { | |||
attr = " bottom-line" | |||
} | |||
commit := commitNames[part.Sha] | |||
if index == 0 { | |||
// User avatar image | |||
avatar := "" | |||
commitSince := base.TimeSinceUnix(util.TimeStamp(commit.Author.When.Unix()), ctx.Data["Lang"].(string)) | |||
if commit.User != nil { | |||
authorName := commit.Author.Name | |||
if len(commit.User.FullName) > 0 { | |||
authorName = commit.User.FullName | |||
} | |||
avatar = fmt.Sprintf(`<a href="%s/%s"><img class="ui avatar image" src="%s" title="%s" alt=""/></a>`, setting.AppSubURL, url.PathEscape(commit.User.Name), commit.User.RelAvatarLink(), html.EscapeString(authorName)) | |||
} else { | |||
avatar = fmt.Sprintf(`<img class="ui avatar image" src="%s" title="%s"/>`, html.EscapeString(base.AvatarLink(commit.Author.Email)), html.EscapeString(commit.Author.Name)) | |||
} | |||
commitInfo.WriteString(fmt.Sprintf(`<div class="blame-info%s"><div class="blame-data"><div class="blame-avatar">%s</div><div class="blame-message"><a href="%s/commit/%s" title="%[5]s">%[5]s</a></div><div class="blame-time">%s</div></div></div>`, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) | |||
} else { | |||
commitInfo.WriteString(fmt.Sprintf(`<div class="blame-info%s">​</div>`, attr)) | |||
} | |||
//Line number | |||
if len(part.Lines)-1 == index && len(blameParts)-1 != pi { | |||
lineNumbers.WriteString(fmt.Sprintf(`<span id="L%d" class="bottom-line">%d</span>`, i, i)) | |||
} else { | |||
lineNumbers.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i, i)) | |||
} | |||
//Code line | |||
line = gotemplate.HTMLEscapeString(line) | |||
if i != len(lines) { | |||
line += "\n" | |||
} | |||
if len(part.Lines)-1 == index && len(blameParts)-1 != pi { | |||
codeLines.WriteString(fmt.Sprintf(`<li class="L%d bottom-line" rel="L%d">%s</li>`, i, i, line)) | |||
} else { | |||
codeLines.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, i, i, line)) | |||
} | |||
} | |||
} | |||
ctx.Data["BlameContent"] = gotemplate.HTML(codeLines.String()) | |||
ctx.Data["BlameCommitInfo"] = gotemplate.HTML(commitInfo.String()) | |||
ctx.Data["BlameLineNums"] = gotemplate.HTML(lineNumbers.String()) | |||
} |
@@ -849,6 +849,12 @@ func RegisterRoutes(m *macaron.Macaron) { | |||
m.Get("/*", context.RepoRefByType(context.RepoRefLegacy), repo.RefCommits) | |||
}, repo.MustBeNotEmpty, reqRepoCodeReader) | |||
m.Group("/blame", func() { | |||
m.Get("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.RefBlame) | |||
m.Get("/tag/*", context.RepoRefByType(context.RepoRefTag), repo.RefBlame) | |||
m.Get("/commit/*", context.RepoRefByType(context.RepoRefCommit), repo.RefBlame) | |||
}, repo.MustBeNotEmpty, reqRepoCodeReader) | |||
m.Group("", func() { | |||
m.Get("/graph", repo.Graph) | |||
m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.Diff) |
@@ -0,0 +1,51 @@ | |||
<div class="tab-size-8 non-diff-file-content"> | |||
<h4 class="ui top attached header" id="repo-read-file"> | |||
<div class="ui stackable grid"> | |||
<div class="ten wide column"> | |||
<i class="file text outline icon ui left"></i> | |||
<strong>{{.FileName}}</strong> <span class="text grey normal">{{FileSize .FileSize}}{{if .IsLFSFile}} ({{.i18n.Tr "repo.stored_lfs"}}){{end}}</span> | |||
</div> | |||
<div class="six wide right aligned column"> | |||
<div class="ui right file-actions"> | |||
<div class="ui buttons"> | |||
{{if not .IsViewCommit}} | |||
<a class="ui button" href="{{.RepoLink}}/src/commit/{{.CommitID}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_permalink"}}</a> | |||
{{end}} | |||
<a class="ui button" href="{{.RepoLink}}/src/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.normal_view"}}</a> | |||
<a class="ui button" href="{{.RepoLink}}/commits/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_history"}}</a> | |||
<a class="ui button" href="{{EscapePound $.RawFileLink}}">{{.i18n.Tr "repo.file_raw"}}</a> | |||
</div> | |||
{{if .Repository.CanEnableEditor}} | |||
{{if .CanEditFile}} | |||
<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><i class="octicon octicon-pencil btn-octicon poping up" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i></a> | |||
{{else}} | |||
<i class="octicon octicon-pencil btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i> | |||
{{end}} | |||
{{if .CanDeleteFile}} | |||
<a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><i class="octicon octicon-trashcan btn-octicon btn-octicon-danger poping up" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i></a> | |||
{{else}} | |||
<i class="octicon octicon-trashcan btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i> | |||
{{end}} | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
</h4> | |||
<div class="ui attached table unstackable segment"> | |||
<div class="file-view code-view has-emoji"> | |||
<table> | |||
<tbody> | |||
<tr> | |||
<td class="lines-commit">{{.BlameCommitInfo}}</td> | |||
<td class="lines-num">{{.BlameLineNums}}</td> | |||
<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol class="linenums">{{.BlameContent}}</ol></code></pre></td> | |||
</tr> | |||
</tbody> | |||
</table> | |||
</div> | |||
</div> | |||
</div> |
@@ -86,7 +86,7 @@ | |||
</a> | |||
{{end}} | |||
{{end}} | |||
{{if and (ne $n 0) (not .IsViewFile)}} | |||
{{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }} | |||
<a href="{{.RepoLink}}/commits/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}" class="ui button"> | |||
{{.i18n.Tr "repo.file_history"}} | |||
</a> | |||
@@ -132,6 +132,8 @@ | |||
</div> | |||
{{if .IsViewFile}} | |||
{{template "repo/view_file" .}} | |||
{{else if .IsBlame}} | |||
{{template "repo/blame" .}} | |||
{{else}} | |||
{{template "repo/view_list" .}} | |||
{{end}} |
@@ -21,6 +21,9 @@ | |||
{{if not .IsViewCommit}} | |||
<a class="ui button" href="{{.RepoLink}}/src/commit/{{.CommitID}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_permalink"}}</a> | |||
{{end}} | |||
{{if .IsTextFile}} | |||
<a class="ui button" href="{{.RepoLink}}/blame/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.blame"}}</a> | |||
{{end}} | |||
<a class="ui button" href="{{.RepoLink}}/commits/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.file_history"}}</a> | |||
<a class="ui button" href="{{EscapePound $.RawFileLink}}">{{.i18n.Tr "repo.file_raw"}}</a> | |||
</div> |