Fix hunk handling for 'default hunk header values'.

tests/patch_test.py

 #!/usr/bin/env python
 # coding: utf-8
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for patch.py."""
 
 import logging
 import os
@@ skipping 342 matching lines @@
         'tools/run_local_server.sh',
         'bar',
         'chrome/file.cc',
         'foo',
         'other/place/foo',
         'tools/clang_check/README.chromium',
     ]
     patchset = patch.PatchSet(patches)
     self.assertEquals(expected, patchset.filenames)
 
+  def testGitPatch(self):
+    p = patch.FilePatchDiff('chrome/file.cc', GIT.PATCH, [])
+    self._check_patch(
+        p, 'chrome/file.cc', GIT.PATCH, is_git_diff=True, patchlevel=1,
+        nb_hunks=1)
+
+  def testGitPatchShortHunkHeader(self):
+    p = patch.FilePatchDiff(
+        'chrome/browser/api/OWNERS', GIT.PATCH_SHORT_HUNK_HEADER, [])
+    self._check_patch(
+        p, 'chrome/browser/api/OWNERS', GIT.PATCH_SHORT_HUNK_HEADER,
+        is_git_diff=True, patchlevel=1, nb_hunks=1)
+
 
 class PatchTestFail(unittest.TestCase):
   # All patches that should throw.
   def testFilePatchDelete(self):
     self.assertFalse(hasattr(patch.FilePatchDelete('foo', False), 'get'))
 
   def testFilePatchDeleteBin(self):
     self.assertFalse(hasattr(patch.FilePatchDelete('foo', True), 'get'))
 
   def testFilePatchDiffBad(self):
@@ skipping 133 matching lines @@
     except patch.UnsupportedPatchFormat:
       pass
 
   def testInvertedOnlyHeader(self):
     try:
       patch.FilePatchDiff('file_a', '+++ file_a\n--- file_a\n', [])
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
+  def testBadHunkCommas(self):
+    try:
+      patch.FilePatchDiff(
+        'file_a',
+        '--- file_a\n'
+        '+++ file_a\n'
+        '@@ -0,,0 +1 @@\n'
+        '+foo\n',
+        [])
+      self.fail()
+    except patch.UnsupportedPatchFormat:
+      pass
+
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()