Add support for A+ files.

tests/patch_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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
 import sys
@@ skipping 56 matching lines @@
     '-run during normal compile, but for now, you can user run_plugin.sh to '
         'hack the\n'
     '-build system to do a syntax check.\n'
     '-\n'
     '-Also see http://code.google.com/p/chromium/wiki/WritingClangPlugins\n'
     '-\n')
 
 
 # http://codereview.chromium.org/download/issue6250123_3013_6010.diff
 GIT_RENAME_PARTIAL = (
-    'Index: chrome/browser/chromeos/views/webui_menu_widget.h\n'
-    'diff --git a/chrome/browser/chromeos/views/domui_menu_widget.h '
-        'b/chrome/browser/chromeos/views/webui_menu_widget.h\n'
+    'Index: chromeos/views/webui_menu_widget.h\n'
+    'diff --git a/chromeos/views/DOMui_menu_widget.h '
+        'b/chromeos/views/webui_menu_widget.h\n'
     'similarity index 79%\n'
-    'rename from chrome/browser/chromeos/views/domui_menu_widget.h\n'
-    'rename to chrome/browser/chromeos/views/webui_menu_widget.h\n'
+    'rename from chromeos/views/DOMui_menu_widget.h\n'
+    'rename to chromeos/views/webui_menu_widget.h\n'
     'index 095d4c474fd9718f5aebfa41a1ccb2d951356d41..'
         '157925075434b590e8acaaf605a64f24978ba08b 100644\n'
-    '--- a/chrome/browser/chromeos/views/domui_menu_widget.h\n'
-    '+++ b/chrome/browser/chromeos/views/webui_menu_widget.h\n'
+    '--- a/chromeos/views/DOMui_menu_widget.h\n'
+    '+++ b/chromeos/views/webui_menu_widget.h\n'
     '@@ -1,9 +1,9 @@\n'
     '-// Copyright (c) 2010 The Chromium Authors. All rights reserved.\n'
     '+// Copyright (c) 2011 The Chromium Authors. All rights reserved.\n'
     ' // Use of this source code is governed by a BSD-style license that can be'
         '\n'
     ' // found in the LICENSE file.\n'
     ' \n'
     '-#ifndef CHROME_BROWSER_CHROMEOS_VIEWS_DOMUI_MENU_WIDGET_H_\n'
     '-#define CHROME_BROWSER_CHROMEOS_VIEWS_DOMUI_MENU_WIDGET_H_\n'
     '+#ifndef CHROME_BROWSER_CHROMEOS_VIEWS_WEBUI_MENU_WIDGET_H_\n'
     '+#define CHROME_BROWSER_CHROMEOS_VIEWS_WEBUI_MENU_WIDGET_H_\n'
     ' #pragma once\n'
     ' \n'
     ' #include <string>\n')
 
 
 # http://codereview.chromium.org/download/issue6287022_3001_4010.diff
 GIT_RENAME = (
     'Index: tools/run_local_server.sh\n'
-    'diff --git a/tools/run_local_server.py b/tools/run_local_server.sh\n'
+    'diff --git a/tools/run_local_server.PY b/tools/run_local_server.sh\n'
     'similarity index 100%\n'
-    'rename from tools/run_local_server.py\n'
+    'rename from tools/run_local_server.PY\n'
     'rename to tools/run_local_server.sh\n')
 
 
 GIT_COPY = (
     'diff --git a/PRESUBMIT.py b/pp\n'
     'similarity index 100%\n'
     'copy from PRESUBMIT.py\n'
     'copy to pp\n')
 
 
@@ skipping 19 matching lines @@
     '+++ /dev/null\n'
     '@@ -1,1 +0,0 @@\n'
     '-bar\n')
 
 
 class PatchTest(unittest.TestCase):
   def _check_patch(self,
       p,
       filename,
       diff,
+      source_filename=None,
       is_binary=False,
       is_delete=False,
       is_git_diff=False,
       is_new=False,
       patchlevel=0,
       svn_properties=None):
     svn_properties = svn_properties or []
     self.assertEquals(p.filename, filename)
+    self.assertEquals(p.source_filename, source_filename)
     self.assertEquals(p.is_binary, is_binary)
     self.assertEquals(p.is_delete, is_delete)
     if hasattr(p, 'is_git_diff'):
       self.assertEquals(p.is_git_diff, is_git_diff)
     self.assertEquals(p.is_new, is_new)
     if hasattr(p, 'patchlevel'):
       self.assertEquals(p.patchlevel, patchlevel)
     if diff:
       self.assertEquals(p.get(), diff)
     if hasattr(p, 'svn_properties'):
@@ skipping 205 matching lines @@
     self.assertEquals('', p.diff_hunks)
     self.assertEquals(text, p.get())
 
   def testRelPath(self):
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome/file.cc', SVN_PATCH, []),
         patch.FilePatchDiff(
             'tools\\clang_check/README.chromium', GIT_DELETE, []),
         patch.FilePatchDiff('tools/run_local_server.sh', GIT_RENAME, []),
         patch.FilePatchDiff(
-            'chrome\\browser/chromeos/views/webui_menu_widget.h',
-            GIT_RENAME_PARTIAL, []),
+            'chromeos\\views/webui_menu_widget.h', GIT_RENAME_PARTIAL, []),
         patch.FilePatchDiff('pp', GIT_COPY, []),
         patch.FilePatchDiff('foo', GIT_NEW, []),
         patch.FilePatchDelete('other/place/foo', True),
         patch.FilePatchBinary('bar', 'data', [], is_new=False),
     ])
     expected = [
         'chrome/file.cc', 'tools/clang_check/README.chromium',
         'tools/run_local_server.sh',
-        'chrome/browser/chromeos/views/webui_menu_widget.h', 'pp', 'foo',
+        'chromeos/views/webui_menu_widget.h', 'pp', 'foo',
         'other/place/foo', 'bar']
     self.assertEquals(expected, patches.filenames)
     orig_name = patches.patches[0].filename
+    orig_source_name = patches.patches[0].source_filename or orig_name
     patches.set_relpath(os.path.join('a', 'bb'))
     expected = [os.path.join('a', 'bb', x) for x in expected]
     self.assertEquals(expected, patches.filenames)
     # Make sure each header is updated accordingly.
     header = []
     new_name = os.path.join('a', 'bb', orig_name)
+    new_source_name = os.path.join('a', 'bb', orig_source_name)
     for line in SVN_PATCH.splitlines(True):
       if line.startswith('@@'):
         break
-      if line[:3] in ('---', '+++', 'Ind'):
+      if line[:3] == '---':
+        line = line.replace(orig_source_name, new_source_name)
+      if line[:3] == '+++':
         line = line.replace(orig_name, new_name)
       header.append(line)
     header = ''.join(header)
     self.assertEquals(header, patches.patches[0].diff_header)
 
   def testRelPathBad(self):
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome\\file.cc', SVN_PATCH, []),
         patch.FilePatchDelete('other\\place\\foo', True),
     ])
     try:
       patches.set_relpath('..')
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
   def testRelPathEmpty(self):
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome\\file.cc', SVN_PATCH, []),
         patch.FilePatchDelete('other\\place\\foo', True),
     ])
     patches.set_relpath('')
     self.assertEquals(
         ['chrome/file.cc', 'other/place/foo'],
         [f.filename for f in patches])
+    self.assertEquals([None, None], [f.source_filename for f in patches])
 
   def testBackSlash(self):
     mangled_patch = SVN_PATCH.replace('chrome/', 'chrome\\')
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome\\file.cc', mangled_patch, []),
         patch.FilePatchDelete('other\\place\\foo', True),
     ])
     expected = ['chrome/file.cc', 'other/place/foo']
     self.assertEquals(expected, patches.filenames)
     self.assertEquals(SVN_PATCH, patches.patches[0].get())
 
   def testDelete(self):
     p = patch.FilePatchDiff('tools/clang_check/README.chromium', DELETE, [])
     self._check_patch(
         p, 'tools/clang_check/README.chromium', DELETE, is_delete=True)
 
   def testGitDelete(self):
     p = patch.FilePatchDiff('tools/clang_check/README.chromium', GIT_DELETE, [])
     self._check_patch(
         p, 'tools/clang_check/README.chromium', GIT_DELETE, is_delete=True,
         is_git_diff=True, patchlevel=1)
 
   def testGitRename(self):
     p = patch.FilePatchDiff('tools/run_local_server.sh', GIT_RENAME, [])
     self._check_patch(p, 'tools/run_local_server.sh', GIT_RENAME,
-        is_git_diff=True, patchlevel=1)
+        is_git_diff=True, patchlevel=1,
+        source_filename='tools/run_local_server.PY')
 
   def testGitRenamePartial(self):
     p = patch.FilePatchDiff(
-        'chrome/browser/chromeos/views/webui_menu_widget.h',
-        GIT_RENAME_PARTIAL, [])
+        'chromeos/views/webui_menu_widget.h', GIT_RENAME_PARTIAL, [])
     self._check_patch(
-        p, 'chrome/browser/chromeos/views/webui_menu_widget.h',
-        GIT_RENAME_PARTIAL, is_git_diff=True, patchlevel=1)
+        p, 'chromeos/views/webui_menu_widget.h', GIT_RENAME_PARTIAL,
+        source_filename='chromeos/views/DOMui_menu_widget.h', is_git_diff=True,
+        patchlevel=1)
 
   def testGitCopy(self):
     p = patch.FilePatchDiff('pp', GIT_COPY, [])
-    self._check_patch(p, 'pp', GIT_COPY, is_git_diff=True, patchlevel=1)
+    self._check_patch(p, 'pp', GIT_COPY, is_git_diff=True, patchlevel=1,
+        source_filename='PRESUBMIT.py')
 
   def testOnlyHeader(self):
     diff = '--- file_a\n+++ file_a\n'
     p = patch.FilePatchDiff('file_a', diff, [])
     self._check_patch(p, 'file_a', diff)
 
   def testSmallest(self):
     diff = '--- file_a\n+++ file_a\n@@ -0,0 +1 @@\n+foo\n'
     p = patch.FilePatchDiff('file_a', diff, [])
     self._check_patch(p, 'file_a', diff)
@@ skipping 10 matching lines @@
     try:
       patch.FilePatchDiff('file_a', '+++ file_a\n--- file_a\n', [])
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
   def testRenameOnlyHeader(self):
     diff = '--- file_a\n+++ file_b\n'
     p = patch.FilePatchDiff('file_b', diff, [])
     # Should it be marked as new?
-    self._check_patch(p, 'file_b', diff)
+    self._check_patch(p, 'file_b', diff, source_filename='file_a')
 
   def testGitCopyPartial(self):
     diff = (
         'diff --git a/wtf b/wtf2\n'
         'similarity index 98%\n'
         'copy from wtf\n'
         'copy to wtf2\n'
         'index 79fbaf3..3560689 100755\n'
         '--- a/wtf\n'
         '+++ b/wtf2\n'
         '@@ -1,4 +1,4 @@\n'
         '-#!/usr/bin/env python\n'
         '+#!/usr/bin/env python1.3\n'
         ' # Copyright (c) 2010 The Chromium Authors. All rights reserved.\n'
         ' # blah blah blah as\n'
         ' # found in the LICENSE file.\n')
     p = patch.FilePatchDiff('wtf2', diff, [])
     # Should it be marked as new?
-    self._check_patch(p, 'wtf2', diff, is_git_diff=True, patchlevel=1)
+    self._check_patch(
+        p, 'wtf2', diff, source_filename='wtf', is_git_diff=True, patchlevel=1)
 
   def testGitExe(self):
     diff = (
         'diff --git a/natsort_test.py b/natsort_test.py\n'
         'new file mode 100755\n'
         '--- /dev/null\n'
         '+++ b/natsort_test.py\n'
         '@@ -0,0 +1,1 @@\n'
         '+#!/usr/bin/env python\n')
     p = patch.FilePatchDiff('natsort_test.py', diff, [])
@@ skipping 12 matching lines @@
     p = patch.FilePatchDiff('natsort_test.py', diff, [])
     self._check_patch(
         p, 'natsort_test.py', diff, is_new=True, is_git_diff=True, patchlevel=1)
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()