Browse Source

#3464 reproduce diff signs

Commited wrong file.
tags/v0.9.99
Unknwon 7 years ago
parent
commit
9349def72e
4 changed files with 13 additions and 4 deletions
  1. 1
    1
      README.md
  2. 1
    1
      gogs.go
  3. 10
    1
      models/git_diff.go
  4. 1
    1
      templates/.VERSION

+ 1
- 1
README.md View File

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra

![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)

##### Current tip version: 0.9.80 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
##### Current tip version: 0.9.81 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)

| Web | UI | Preview |
|:-------------:|:-------:|:-------:|

+ 1
- 1
gogs.go View File

@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)

const APP_VER = "0.9.80.0815"
const APP_VER = "0.9.81.0816"

func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

+ 10
- 1
models/git_diff.go View File

@@ -72,6 +72,15 @@ var (

func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
buf := bytes.NewBuffer(nil)

// Reproduce signs which are cutted for inline diff before.
switch lineType {
case DIFF_LINE_ADD:
buf.WriteByte('+')
case DIFF_LINE_DEL:
buf.WriteByte('-')
}

for i := range diffs {
switch {
case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD:
@@ -167,7 +176,7 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
diff1 = diffLine.Content
diff2 = compareDiffLine.Content
default:
return template.HTML(html.EscapeString(diffLine.Content[1:]))
return template.HTML(html.EscapeString(diffLine.Content))
}

diffRecord := diffMatchPatch.DiffMain(diff1[1:], diff2[1:], true)

+ 1
- 1
templates/.VERSION View File

@@ -1 +1 @@
0.9.80.0815
0.9.81.0816

Loading…
Cancel
Save