Commit9bbc87a

committed

Fix parsing of binary files

1 parent2f53bf7 commit9bbc87aCopy full SHA for 9bbc87a

File tree

+27

-4

lines changed

+27

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`"release":"./scripts/release.sh",`
`40`	`40`	`"release-bower":"./scripts/update-bower-version.sh",`
`41`	`41`	`"templates":"./scripts/hulk.js --wrapper node --variable 'browserTemplates' ./src/templates/*.mustache > ./src/templates/diff2html-templates.js",`
`42`		`-"style":"jscs src/.js src/ui/js/.js",`
	`42`	`+"style":"eslint src/.js src/ui/js/.js",`
`43`	`43`	`"coverage":"istanbul cover _mocha -- -u exports -R spec ./test/*/",`
`44`	`44`	`"check-coverage":"istanbul check-coverage --statements 90 --functions 90 --branches 85 --lines 90 ./coverage/coverage.json",`
`45`	`45`	`"test":"npm run style && npm run coverage && npm run check-coverage",`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,10 +211,10 @@`
`211`	`211`	`*/`
`212`	`212`	`if(`
`213`	`213`	`(utils.startsWith(line,oldFileNameHeader)&&`
`214`		`-utils.startsWith(nxtLine,newFileNameHeader)&&utils.startsWith(afterNxtLine,hunkHeaderPrefix))\|\|`
	`214`	`+utils.startsWith(nxtLine,newFileNameHeader))\|\|`
`215`	`215`
`216`	`216`	`(utils.startsWith(line,newFileNameHeader)&&`
`217`		`-utils.startsWith(prevLine,oldFileNameHeader)&&utils.startsWith(nxtLine,hunkHeaderPrefix))`
	`217`	`+utils.startsWith(prevLine,oldFileNameHeader))`
`218`	`218`	`){`
`219`	`219`	`/*`
`220`	`220`	`* --- Date Timestamp[FractionalSeconds] TimeZone`
`@@ -239,7 +239,10 @@`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`
`242`		`-if(currentFile&&utils.startsWith(line,hunkHeaderPrefix)){`
	`242`	`+if(`
	`243`	`+(currentFile&&utils.startsWith(line,hunkHeaderPrefix))\|\|`
	`244`	`+(currentFile.isGitDiff&&currentFile&&currentFile.oldName&&currentFile.newName&&!currentBlock)`
	`245`	`+){`
`243`	`246`	`startBlock(line);`
`244`	`247`	`return;`
`245`	`248`	`}`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -523,5 +523,25 @@ describe('DiffParser', function() {`
`523`	`523`	`assert.deepEqual(linesContent,[' test']);`
`524`	`524`	`});`
`525`	`525`
	`526`	`+it('should parse binary file diff',function(){`
	`527`	`+vardiff=`
	`528`	`+'diff --git a/last-changes-config.png b/last-changes-config.png\n'+`
	`529`	`+'index 322248b..56fc1f2 100644\n'+`
	`530`	`+'--- a/last-changes-config.png\n'+`
	`531`	`+'+++ b/last-changes-config.png\n'+`
	`532`	`+'Binary files differ';`
	`533`	`+`
	`534`	`+varresult=DiffParser.generateDiffJson(diff);`
	`535`	`+varfile1=result[0];`
	`536`	`+assert.equal(1,result.length);`
	`537`	`+assert.equal(0,file1.addedLines);`
	`538`	`+assert.equal(0,file1.deletedLines);`
	`539`	`+assert.equal('last-changes-config.png',file1.oldName);`
	`540`	`+assert.equal('last-changes-config.png',file1.newName);`
	`541`	`+assert.equal(1,file1.blocks.length);`
	`542`	`+assert.equal(0,file1.blocks[0].lines.length);`
	`543`	`+assert.equal('Binary files differ',file1.blocks[0].header);`
	`544`	`+});`
	`545`	`+`
`526`	`546`	`});`
`527`	`547`	`});`

Comments

(0)