Changeset 51005 in webkit

Timestamp:

Nov 15, 2009 3:32:34 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Eric Seidel.

bugzilla-tool should post git binary diff
​https://bugs.webkit.org/show_bug.cgi?id=31458

Add --binary option to Git.create_patch.

• Scripts/modules/scm.py:
• Scripts/modules/scm_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/scm.py (modified) (2 diffs)
• Scripts/modules/scm_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        bugzilla-tool should post git binary diff
+        https://bugs.webkit.org/show_bug.cgi?id=31458
+
+        Add --binary option to Git.create_patch.
+
+        * Scripts/modules/scm.py:
+        * Scripts/modules/scm_unittest.py:
+
 2009-11-15  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/scm.py

@@ -453 +453 @@
 
     def create_patch(self):
-        return self.run_command(['git', 'diff', 'HEAD'])
+        return self.run_command(['git', 'diff', '--binary', 'HEAD'])
 
     @classmethod
@@ -496 +496 @@
 
     def create_patch_from_local_commit(self, commit_id):
-        return self.run_command(['git', 'diff', commit_id + "^.." + commit_id])
+        return self.run_command(['git', 'diff', '--binary', commit_id + "^.." + commit_id])
 
     def create_patch_since_local_commit(self, commit_id):
-        return self.run_command(['git', 'diff', commit_id])
+        return self.run_command(['git', 'diff', '--binary', commit_id])
 
     def commit_locally_with_message(self, message):

trunk/WebKitTools/Scripts/modules/scm_unittest.py

@@ -561 +561 @@
         self._shared_test_svn_apply_git_patch()
 
+    def test_create_binary_patch(self):
+        # Create a git binary patch and check the contents.
+        scm = detect_scm_system(self.git_checkout_path)
+        test_file_path = os.path.join(self.git_checkout_path, 'binary_file')
+        file_contents = ''.join(map(chr, range(256)))
+        write_into_file_at_path(test_file_path, file_contents)
+        run(['git', 'add', test_file_path])
+        patch = scm.create_patch()
+        self.assertTrue(re.search(r'\nliteral 0\n', patch))
+        self.assertTrue(re.search(r'\nliteral 256\n', patch))
+
+        # Check if we can apply the created patch.
+        run(['git', 'rm', '-f', test_file_path])
+        self._setup_webkittools_scripts_symlink(scm)
+        self.scm.apply_patch(self._create_patch(patch))
+        self.assertEqual(file_contents, read_from_path(test_file_path))
+
+        # Check if we can create a patch from a local commit.
+        write_into_file_at_path(test_file_path, file_contents)
+        run(['git', 'add', test_file_path])
+        run(['git', 'commit', '-m', 'binary diff'])
+        patch_from_local_commit = scm.create_patch_from_local_commit('HEAD')
+        self.assertTrue(re.search(r'\nliteral 0\n', patch_from_local_commit))
+        self.assertTrue(re.search(r'\nliteral 256\n', patch_from_local_commit))
+        patch_since_local_commit = scm.create_patch_since_local_commit('HEAD^1')
+        self.assertTrue(re.search(r'\nliteral 0\n', patch_since_local_commit))
+        self.assertTrue(re.search(r'\nliteral 256\n', patch_since_local_commit))
+        self.assertEqual(patch_from_local_commit, patch_since_local_commit)
+
+
 if __name__ == '__main__':
     unittest.main()