Commit792786c

committed

Merge branch 'shazow-master'

2 parentse8554b8 +4d60064 commit792786cCopy full SHA for 792786c

File tree

+48

-9

lines changed

+48

-9

lines changed

Lines changed: 13 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -585,13 +585,15 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {`
`585`	`585`	`iflen(diff.ToDate)>0 {`
`586`	`586`	`toDate="\t"+diff.ToDate`
`587`	`587`	`}`
`588`		`-err:=wf("--- %s%s%s",diff.FromFile,fromDate,diff.Eol)`
`589`		`-iferr!=nil {`
`590`		`-returnerr`
`591`		`-}`
`592`		`-err=wf("+++ %s%s%s",diff.ToFile,toDate,diff.Eol)`
`593`		`-iferr!=nil {`
`594`		`-returnerr`
	`588`	`+ifdiff.FromFile!=""\|\|diff.ToFile!="" {`
	`589`	`+err:=wf("--- %s%s%s",diff.FromFile,fromDate,diff.Eol)`
	`590`	`+iferr!=nil {`
	`591`	`+returnerr`
	`592`	`+}`
	`593`	`+err=wf("+++ %s%s%s",diff.ToFile,toDate,diff.Eol)`
	`594`	`+iferr!=nil {`
	`595`	`+returnerr`
	`596`	`+}`
`595`	`597`	`}`
`596`	`598`	`}`
`597`	`599`	`first,last:=g[0],g[len(g)-1]`
`@@ -710,8 +712,10 @@ func WriteContextDiff(writer io.Writer, diff ContextDiff) error {`
`710`	`712`	`iflen(diff.ToDate)>0 {`
`711`	`713`	`toDate="\t"+diff.ToDate`
`712`	`714`	`}`
`713`		`-wf("*** %s%s%s",diff.FromFile,fromDate,diff.Eol)`
`714`		`-wf("--- %s%s%s",diff.ToFile,toDate,diff.Eol)`
	`715`	`+ifdiff.FromFile!=""\|\|diff.ToFile!="" {`
	`716`	`+wf("*** %s%s%s",diff.FromFile,fromDate,diff.Eol)`
	`717`	`+wf("--- %s%s%s",diff.ToFile,toDate,diff.Eol)`
	`718`	`+}`
`715`	`719`	`}`
`716`	`720`
`717`	`721`	`first,last:=g[0],g[len(g)-1]`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,41 @@ func TestOutputFormatNoTrailingTabOnEmptyFiledate(t *testing.T) {`
`357`	`357`	`assertEqual(t,SplitLines(cd)[:2], []string{"*** Original\n","--- Current\n"})`
`358`	`358`	`}`
`359`	`359`
	`360`	`+funcTestOmitFilenames(t*testing.T) {`
	`361`	`+diff:=UnifiedDiff{`
	`362`	`+A:SplitLines("o\nn\ne\n"),`
	`363`	`+B:SplitLines("t\nw\no\n"),`
	`364`	`+Eol:"\n",`
	`365`	`+}`
	`366`	`+ud,err:=GetUnifiedDiffString(diff)`
	`367`	`+assertEqual(t,err,nil)`
	`368`	`+assertEqual(t,SplitLines(ud), []string{`
	`369`	`+"@@ -0,0 +1,2 @@\n",`
	`370`	`+"+t\n",`
	`371`	`+"+w\n",`
	`372`	`+"@@ -2,2 +3,0 @@\n",`
	`373`	`+"-n\n",`
	`374`	`+"-e\n",`
	`375`	`+"\n",`
	`376`	`+})`
	`377`	`+`
	`378`	`+cd,err:=GetContextDiffString(ContextDiff(diff))`
	`379`	`+assertEqual(t,err,nil)`
	`380`	`+assertEqual(t,SplitLines(cd), []string{`
	`381`	`+"***************\n",`
	`382`	`+"* 0 **\n",`
	`383`	`+"--- 1,2 ----\n",`
	`384`	`+"+ t\n",`
	`385`	`+"+ w\n",`
	`386`	`+"***************\n",`
	`387`	`+"* 2,3 **\n",`
	`388`	`+"- n\n",`
	`389`	`+"- e\n",`
	`390`	`+"--- 3 ----\n",`
	`391`	`+"\n",`
	`392`	`+})`
	`393`	`+}`
	`394`	`+`
`360`	`395`	`funcTestSplitLines(t*testing.T) {`
`361`	`396`	`allTests:= []struct {`
`362`	`397`	`inputstring`

Comments

(0)