Changeset 58297 in webkit

Timestamp:

Apr 27, 2010 2:10:12 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-04-27 Adam Barth <​abarth@webkit.org>

Reviewed by Maciej Stachowiak.

REGRESSION(r58261): webkit-patch upload does not work in an SVN checkout.
​https://bugs.webkit.org/show_bug.cgi?id=38186

Unfortunately, we don't have a good way of testing this change because
our test coverage of the scm.py API is poor...

• Scripts/webkitpy/common/checkout/scm.py:
• Scripts/webkitpy/tool/steps/preparechangelog.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (2 diffs)
• Scripts/webkitpy/tool/steps/preparechangelog.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        REGRESSION(r58261): webkit-patch upload does not work in an SVN checkout.
+        https://bugs.webkit.org/show_bug.cgi?id=38186
+
+        Unfortunately, we don't have a good way of testing this change because
+        our test coverage of the scm.py API is poor...
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/tool/steps/preparechangelog.py:
+
 2010-04-26  Eric Seidel  <eric@webkit.org>
 

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

@@ -212 +212 @@
         raise NotImplementedError, "subclasses must implement"
 
+    def should_squash(self, squash):
+        raise NotImplementedError, "subclasses must implement"
+
     def commit_with_message(self, message, username=None, git_commit=None, squash=None):
         raise NotImplementedError, "subclasses must implement"
@@ -392 +395 @@
         run_command(['svn', 'revert'] + file_paths)
 
+    def should_squash(self, squash):
+        # SVN doesn't support the concept of squashing.
+        return False
+
     def commit_with_message(self, message, username=None, git_commit=None, squash=None):
         # squash and git-commit are not used by SVN.

trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py

@@ -56 +56 @@
         if self._options.email:
             args.append("--email=%s" % self._options.email)
-        if (self._tool.scm().supports_local_commits() and
-            self._tool.scm().should_squash(self._options.squash)):
+        if self._tool.scm().should_squash(self._options.squash):
             args.append("--merge-base=%s" % self._tool.scm().svn_merge_base())
         if self._options.git_commit: