diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2016-08-07 13:49:47 -0300 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2016-08-07 09:49:47 -0700 |
| commit | 2772791fdad8f0ec4ae49aad020f8afdff2f9c46 (patch) | |
| tree | fb07f73dfbab67a42d492009ae97119d39a0587a /models/git_diff_test.go | |
| parent | 08c976f8117b92b25ea197e7dc0372b49d9ee412 (diff) | |
| download | gitea-2772791fdad8f0ec4ae49aad020f8afdff2f9c46.tar.gz gitea-2772791fdad8f0ec4ae49aad020f8afdff2f9c46.zip | |
Improve diff highlight (#3390)
- Try to reduce memory allocations
- Add possibility to disable diff highlight (can improve performance for large diffs)
- Tweaking with cost for prettier (cleaner) diffs
- Do not calculate diff when the number of removed lines in a block is not equal to the number of added lines (this usually resulted in ugly diffs)
Diffstat (limited to 'models/git_diff_test.go')
| -rw-r--r-- | models/git_diff_test.go | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/models/git_diff_test.go b/models/git_diff_test.go index 3a1312ca56..e673094d2e 100644 --- a/models/git_diff_test.go +++ b/models/git_diff_test.go @@ -33,38 +33,3 @@ func TestDiffToHTML(t *testing.T) { dmp.Diff{dmp.DiffEqual, " biz"}, }, DIFF_LINE_DEL)) } - -// test if GetLine is return the correct lines -func TestGetLine(t *testing.T) { - ds := DiffSection{Lines: []*DiffLine{ - &DiffLine{LeftIdx: 28, RightIdx: 28, Type: DIFF_LINE_PLAIN}, - &DiffLine{LeftIdx: 29, RightIdx: 29, Type: DIFF_LINE_PLAIN}, - &DiffLine{LeftIdx: 30, RightIdx: 30, Type: DIFF_LINE_PLAIN}, - &DiffLine{LeftIdx: 31, RightIdx: 0, Type: DIFF_LINE_DEL}, - &DiffLine{LeftIdx: 0, RightIdx: 31, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 0, RightIdx: 32, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 32, RightIdx: 33, Type: DIFF_LINE_PLAIN}, - &DiffLine{LeftIdx: 33, RightIdx: 0, Type: DIFF_LINE_DEL}, - &DiffLine{LeftIdx: 34, RightIdx: 0, Type: DIFF_LINE_DEL}, - &DiffLine{LeftIdx: 35, RightIdx: 0, Type: DIFF_LINE_DEL}, - &DiffLine{LeftIdx: 36, RightIdx: 0, Type: DIFF_LINE_DEL}, - &DiffLine{LeftIdx: 0, RightIdx: 34, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 0, RightIdx: 35, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 0, RightIdx: 36, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 0, RightIdx: 37, Type: DIFF_LINE_ADD}, - &DiffLine{LeftIdx: 37, RightIdx: 38, Type: DIFF_LINE_PLAIN}, - &DiffLine{LeftIdx: 38, RightIdx: 39, Type: DIFF_LINE_PLAIN}, - }} - - assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 31), ds.Lines[4]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 31), ds.Lines[3]) - - assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 33), ds.Lines[11]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 34), ds.Lines[12]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 35), ds.Lines[13]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 36), ds.Lines[14]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 34), ds.Lines[7]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 35), ds.Lines[8]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 36), ds.Lines[9]) - assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 37), ds.Lines[10]) -} |