Less restrictive regexp & 'should handle patches without Index' test

Author: piranna

src/patch/parse.js

@@ -25,6 +25,8 @@ export function parsePatch(uniDiff, options = {}) {
       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);
 
@@ -36,7 +38,7 @@ export function parsePatch(uniDiff, options = {}) {
 
       if (/^(Index:|diff|\-\-\-|\+\+\+)\s/.test(line)) {
         break;
-      } else if (/^@@\s/.test(line)) {
+      } else if (/^@@/.test(line)) {
         index.hunks.push(parseHunk());
       } else if (line && options.strict) {
         // Ignore unexpected content unless in strict mode
@@ -50,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
+      });
+    });
   });
 });