Changeset 70169 in webkit

Timestamp:

Oct 20, 2010 1:36:23 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-10-20 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

webkit-patch doesn't get along with git rm
​https://bugs.webkit.org/show_bug.cgi?id=47940

Turns out we need to pass "--" to tell git this is a path.

• Scripts/webkitpy/common/checkout/scm.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-20  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        webkit-patch doesn't get along with git rm
+        https://bugs.webkit.org/show_bug.cgi?id=47940
+
+        Turns out we need to pass "--" to tell git this is a path.
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2010-10-20  Robert Hogan  <robert@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py

@@ -695 +695 @@
         files of multiple different encodings."""
         # FIXME: This should probably use cwd=self.checkout_root
-        return self.run(['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "-M", self.merge_base(git_commit)] + changed_files, decode_output=False)
+        return self.run(['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "-M", self.merge_base(git_commit), "--"] + changed_files, decode_output=False)
 
     @classmethod

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py

@@ -1099 +1099 @@
         self.assertTrue(re.search(r'test_file_commit1', patch))
 
+    def test_create_patch_with_changed_files(self):
+        self._one_local_commit_plus_working_copy_changes()
+        scm = detect_scm_system(self.git_checkout_path)
+        patch = scm.create_patch(changed_files=['test_file_commit2'])
+        self.assertTrue(re.search(r'test_file_commit2', patch))
+
+    def test_create_patch_with_rm_and_changed_files(self):
+        self._one_local_commit_plus_working_copy_changes()
+        scm = detect_scm_system(self.git_checkout_path)
+        os.remove('test_file_commit1')
+        patch = scm.create_patch()
+        patch_with_changed_files = scm.create_patch(changed_files=['test_file_commit1', 'test_file_commit2'])
+        self.assertEquals(patch, patch_with_changed_files)
+
     def test_create_patch_git_commit(self):
         self._two_local_commits()