Merge pull request kpdecker#88 from NodeOS/splitDiffs

Split diffs based on file headers instead of 'Index:' metadata

Author: kpdecker

src/patch/parse.js

@@ -7,41 +7,42 @@ export function parsePatch(uniDiff, options = {}) {
     let index = {};
     list.push(index);
 
-    // Ignore any leading junk
+    // Parse diff metadata
     while (i < diffstr.length) {
-      if (/^(Index:|diff -r|@@)/.test(diffstr[i])) {
+      let line = diffstr[i];
+
+      // File header found, end parsing diff metadata
+      if (/^(\-\-\-|\+\+\+|@@)\s/.test(line)) {
         break;
       }
-      i++;
-    }
-
-    let header = (/^(?:Index:|diff(?: -r \w+)+) (.*)/.exec(diffstr[i]));
-    if (header) {
-      index.index = header[1];
-      i++;
 
-      if (/^===/.test(diffstr[i])) {
-        i++;
+      // Diff index
+      let header = (/^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/).exec(line);
+      if (header) {
+        index.index = header[1];
       }
 
-      parseFileHeader(index);
-      parseFileHeader(index);
-    } else {
-      // Ignore erant header components that might occur at the start of the file
-      parseFileHeader({});
-      parseFileHeader({});
+      i++;
     }
 
+    // Parse file headers if they are defined. Unified diff requires them, but
+    // there's no technical issues to have an isolated hunk without file header
+    parseFileHeader(index);
+    parseFileHeader(index);
+
+    // Parse hunks
     index.hunks = [];
 
     while (i < diffstr.length) {
-      if (/^(Index:|diff -r)/.test(diffstr[i])) {
+      let line = diffstr[i];
+
+      if (/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(line)) {
         break;
-      } else if (/^@@/.test(diffstr[i])) {
+      } else if (/^@@/.test(line)) {
         index.hunks.push(parseHunk());
-      } else if (diffstr[i] && options.strict) {
+      } else if (line && options.strict) {
         // Ignore unexpected content unless in strict mode
-        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(diffstr[i]));
+        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(line));
       } else {
         i++;
       }
@@ -51,7 +52,7 @@ export function parsePatch(uniDiff, options = {}) {
   // Parses the --- and +++ headers, if none are found, no lines
   // are consumed.
   function parseFileHeader(index) {
-    let fileHeader = (/^(\-\-\-|\+\+\+)\s(\S+)\s?(.*)/.exec(diffstr[i]));
+    let fileHeader = (/^(\-\-\-|\+\+\+)\s+(\S+)\s?(.+?)\s*$/).exec(diffstr[i]);
     if (fileHeader) {
       let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';
       index[keyPrefix + 'FileName'] = fileHeader[2];

test/patch/apply.js

@@ -554,5 +554,36 @@ describe('patch/apply', function() {
         }
       });
     });
+    it('should handle patches without Index', function(done) {
+      const patch =
+            '===================================================================\n'
+            + '--- test\theader1\n'
+            + '+++ test\theader2\n'
+            + '@@ -1,3 +1,4 @@\n'
+            + ' line2\n'
+            + ' line3\n'
+            + '+line4\n'
+            + ' line5\n'
+            + '===================================================================\n'
+            + '--- test2\theader1\n'
+            + '+++ test2\theader2\n'
+            + '@@ -1,3 +1,4 @@\n'
+            + ' foo2\n'
+            + ' foo3\n'
+            + '+foo4\n'
+            + ' foo5\n';
+
+      applyPatches(patch, {
+        loadFile(index, callback) {
+          callback(undefined, contents[index.oldFileName]);
+        },
+        patched(index, content) {
+          expect(content)
+              .to.equal(expected[index.newFileName])
+              .to.not.be.undefined;
+        },
+        complete: done
+      });
+    });
   });
 });

test/patch/parse.js

@@ -248,8 +248,8 @@ Index: test2
     });
     it('should throw on invalid input in strict mode', function() {
       expect(function() {
-        parsePatch('Index: foo\nfoo', {strict: true});
-      }).to['throw'](/Unknown line 2 "foo"/);
+        parsePatch('Index: foo\n+++ bar\nblah', {strict: true});
+      }).to['throw'](/Unknown line 3 "blah"/);
     });
   });
 });