Changeset 92609 in webkit

Timestamp:

Aug 8, 2011 11:02:59 AM (13 years ago)

Author:

jochen@chromium.org

Message:

webkit-patch doesn't get along with renamed files
​https://bugs.webkit.org/show_bug.cgi?id=48075

Possibly a bit heavy handed - I removed all instances of -C and
changed every instance of -M with '--no-renames' in git.py. This
forces git to not try to tell us about renames at all, which is
ultimately the behaviour we want. The old file is shown deleted,
then the new file is shown added, followed by any changes that
occurred. Also gets rid of the problem where deleting one file
and adding another file which has similar content would
unexpectedly show up as a rename, and fall out of a diff.

Based on a patch by Wyatt Carss.

Reviewed by Eric Seidel.

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-08  Jochen Eisinger  <jochen@chromium.org>
+
+        webkit-patch doesn't get along with renamed files
+        https://bugs.webkit.org/show_bug.cgi?id=48075
+
+        Possibly a bit heavy handed - I removed all instances of -C and
+        changed every instance of -M with '--no-renames' in git.py. This
+        forces git to not try to tell us about renames at all, which is
+        ultimately the behaviour we want. The old file is shown deleted,
+        then the new file is shown added, followed by any changes that
+        occurred. Also gets rid of the problem where deleting one file
+        and adding another file which has similar content would
+        unexpectedly show up as a rename, and fall out of a diff.
+
+        Based on a patch by Wyatt Carss.
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+
 2011-08-07  Sam White  <samuel.white@rochester.edu>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -145 +145 @@
 
     def working_directory_is_clean(self):
-        return self.run(['git', 'diff', 'HEAD', '--name-only'], cwd=self.checkout_root) == ""
+        return self.run(['git', 'diff', 'HEAD', '--no-renames', '--name-only'], cwd=self.checkout_root) == ""
 
     def clean_working_directory(self):
@@ -158 +158 @@
         # git status returns non-zero when there are changes, so we use git diff name --name-status HEAD instead.
         # No file contents printed, thus utf-8 autodecoding in self.run is fine.
-        return ["git", "diff", "--name-status", "HEAD"]
+        return ["git", "diff", "--name-status", "--no-renames", "HEAD"]
 
     def _status_regexp(self, expected_types):
@@ -187 +187 @@
     def changed_files(self, git_commit=None):
         # FIXME: --diff-filter could be used to avoid the "extract_filenames" step.
-        status_command = ['git', 'diff', '-r', '--name-status', '-C', '-M', "--no-ext-diff", "--full-index", self.merge_base(git_commit)]
+        status_command = ['git', 'diff', '-r', '--name-status', "--no-renames", "--no-ext-diff", "--full-index", self.merge_base(git_commit)]
         # FIXME: I'm not sure we're returning the same set of files that SVN.changed_files is.
         # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R)
@@ -210 +210 @@
         # We do not need to pass decode_output for this diff command
         # as we're passing --name-status which does not output any data.
-        status_command = ['git', 'diff', '--name-status', '-C', '-M', '--diff-filter=U']
+        status_command = ['git', 'diff', '--name-status', '--no-renames', '--diff-filter=U']
         return self.run_status_and_extract_filenames(status_command, self._status_regexp("U"))
 
@@ -245 +245 @@
         Patch files are effectively binary since they may contain
         files of multiple different encodings."""
-        command = ['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "-M", self.merge_base(git_commit), "--"]
+        command = ['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "--no-renames", self.merge_base(git_commit), "--"]
         if changed_files:
             command += changed_files
@@ -283 +283 @@
 
     def diff_for_file(self, path, log=None):
-        return self.run(['git', 'diff', 'HEAD', '--', path], cwd=self.checkout_root)
+        return self.run(['git', 'diff', 'HEAD', '--no-renames', '--', path], cwd=self.checkout_root)
 
     def show_head(self, path):
@@ -463 +463 @@
 
     def files_changed_summary_for_commit(self, commit_id):
-        return self.run(['git', 'diff-tree', '--shortstat', '--no-commit-id', commit_id])
+        return self.run(['git', 'diff-tree', '--shortstat', '--no-renames', '--no-commit-id', commit_id])

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -963 +963 @@
         self.assertEqual(scm.head_svn_revision(), '')
 
+    def test_rename_files(self):
+        scm = self.tracking_scm
+
+        run_command(['git', 'mv', 'foo_file', 'bar_file'])
+        scm.commit_locally_with_message('message')
+
+        patch = scm.create_patch()
+        self.assertFalse(re.search(r'rename from ', patch))
+        self.assertFalse(re.search(r'rename to ', patch))
+
+
 class GitSVNTest(SCMTest):