Changeset 56032 in webkit

Timestamp:

Mar 15, 2010 9:15:20 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-03-15 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

webkit-patch rollout should error out on conflicts
​https://bugs.webkit.org/show_bug.cgi?id=36151

Instead of blindingly plowing ahead, we now throw an exception if there
are conflicts after applying a reverse diff.

• Scripts/webkitpy/scm.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/scm.py (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-15  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        webkit-patch rollout should error out on conflicts
+        https://bugs.webkit.org/show_bug.cgi?id=36151
+
+        Instead of blindingly plowing ahead, we now throw an exception if there
+        are conflicts after applying a reverse diff.
+
+        * Scripts/webkitpy/scm.py:
+
 2010-03-15  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/scm.py

@@ -211 +211 @@
         raise NotImplementedError, "subclasses must implement"
 
+    def conflicted_files(self):
+        raise NotImplementedError, "subclasses must implement"
+
     def display_name(self):
         raise NotImplementedError, "subclasses must implement"
@@ -335 +338 @@
         return self.run_status_and_extract_filenames(self.status_command(), status_regexp)
 
+    def conflicted_files(self):
+        if self.svn_version() > "1.6":
+            status_regexp = "^(?P<status>[C]).{6} (?P<filename>.+)$"
+        else:
+            status_regexp = "^(?P<status>[C]).{5} (?P<filename>.+)$"
+        return self.run_status_and_extract_filenames(self.status_command(), status_regexp)
+
     @staticmethod
     def supports_local_commits():
@@ -433 +443 @@
         status_regexp = '^(?P<status>[ADM])\t(?P<filename>.+)$'
         return self.run_status_and_extract_filenames(status_command, status_regexp)
-    
+
+    def conflicted_files(self):
+        status_command = ['git', 'diff', '--name-status', '-C', '-M', '--diff-filter=U']
+        status_regexp = '^(?P<status>[U])\t(?P<filename>.+)$'
+        return self.run_status_and_extract_filenames(status_command, status_regexp)
+
     @staticmethod
     def supports_local_commits():
@@ -460 +475 @@
 
         # I think this will always fail due to ChangeLogs.
-        # FIXME: We need to detec specific failure conditions and handle them.
         run_command(['git', 'revert', '--no-commit', git_commit], error_handler=Executive.ignore_error)
 
@@ -467 +481 @@
         if len(changelog_paths):
             run_command([self.script_path('resolve-ChangeLogs')] + changelog_paths)
+
+        conflicts = self.conflicted_files()
+        if len(conflicts):
+            raise ScriptError(message="Failed to apply reverse diff for revision %s because of the following conflicts:\n%s" % (revision, "\n".join(conflicts)))
 
     def revert_files(self, file_paths):