Fix #166
This commit is contained in:
parent
c117f9e73f
commit
98dbbae2ef
6 changed files with 7 additions and 6 deletions
|
@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
|
||||||
|
|
||||||
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
||||||
|
|
||||||
##### Current version: 0.3.3 Alpha
|
##### Current version: 0.3.4 Alpha
|
||||||
|
|
||||||
### NOTICES
|
### NOTICES
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
|
||||||
|
|
||||||
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
||||||
|
|
||||||
##### 当前版本:0.3.3 Alpha
|
##### 当前版本:0.3.4 Alpha
|
||||||
|
|
||||||
## 开发目的
|
## 开发目的
|
||||||
|
|
||||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/base"
|
"github.com/gogits/gogs/modules/base"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.3.3.0512 Alpha"
|
const APP_VER = "0.3.4.0513 Alpha"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
base.AppVer = APP_VER
|
base.AppVer = APP_VER
|
||||||
|
|
|
@ -49,6 +49,7 @@ type DiffSection struct {
|
||||||
|
|
||||||
type DiffFile struct {
|
type DiffFile struct {
|
||||||
Name string
|
Name string
|
||||||
|
Index int
|
||||||
Addition, Deletion int
|
Addition, Deletion int
|
||||||
Type int
|
Type int
|
||||||
IsBin bool
|
IsBin bool
|
||||||
|
@ -144,6 +145,7 @@ func ParsePatch(reader io.Reader) (*Diff, error) {
|
||||||
|
|
||||||
curFile = &DiffFile{
|
curFile = &DiffFile{
|
||||||
Name: a[strings.Index(a, "/")+1:],
|
Name: a[strings.Index(a, "/")+1:],
|
||||||
|
Index: len(diff.Files) + 1,
|
||||||
Type: DIFF_FILE_CHANGE,
|
Type: DIFF_FILE_CHANGE,
|
||||||
Sections: make([]*DiffSection, 0, 10),
|
Sections: make([]*DiffSection, 0, 10),
|
||||||
}
|
}
|
||||||
|
|
|
@ -226,7 +226,6 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
|
||||||
|
|
||||||
ctx.Data["IsBranch"] = ctx.Repo.IsBranch
|
ctx.Data["IsBranch"] = ctx.Repo.IsBranch
|
||||||
ctx.Data["IsCommit"] = ctx.Repo.IsCommit
|
ctx.Data["IsCommit"] = ctx.Repo.IsCommit
|
||||||
log.Debug("Repo.Commit: %v", ctx.Repo.Commit)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debug("displayBare: %v; IsBare: %v", displayBare, ctx.Repo.Repository.IsBare)
|
log.Debug("displayBare: %v; IsBare: %v", displayBare, ctx.Repo.Repository.IsBare)
|
||||||
|
|
|
@ -51,14 +51,14 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- todo finish all file status, now modify, add, delete and rename -->
|
<!-- todo finish all file status, now modify, add, delete and rename -->
|
||||||
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}"> </span>
|
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}"> </span>
|
||||||
<a class="file" href="#diff-1">{{.Name}}</a>
|
<a class="file" href="#diff-{{.Index}}">{{.Name}}</a>
|
||||||
</li>
|
</li>
|
||||||
{{end}}
|
{{end}}
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{range .Diff.Files}}
|
{{range .Diff.Files}}
|
||||||
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-2">
|
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-{{.Index}}">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<div class="diff-counter count pull-left">
|
<div class="diff-counter count pull-left">
|
||||||
{{if not .IsBin}}
|
{{if not .IsBin}}
|
||||||
|
|
Reference in a new issue