Diff
Modified: trunk/Tools/ChangeLog (188480 => 188481)
--- trunk/Tools/ChangeLog 2015-08-14 18:43:46 UTC (rev 188480)
+++ trunk/Tools/ChangeLog 2015-08-14 18:48:34 UTC (rev 188481)
@@ -1,3 +1,18 @@
+2015-08-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r187357.
+ https://bugs.webkit.org/show_bug.cgi?id=148032
+
+ webkit-patch generates incorrect patches that cannot be
+ applied (Requested by dydz on #webkit).
+
+ Reverted changeset:
+
+ "Call fixChangeLogPatch when generating patches from webkit-
+ patch"
+ https://bugs.webkit.org/show_bug.cgi?id=147248
+ http://trac.webkit.org/changeset/187357
+
2015-08-14 Jason Marcell <[email protected]>
Refactor BuildbotQueueView._appendPendingRevisionCount to work more generically with repositories
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (188480 => 188481)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-08-14 18:43:46 UTC (rev 188480)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2015-08-14 18:48:34 UTC (rev 188481)
@@ -321,9 +321,7 @@
command += ["--"]
if changed_files:
command += changed_files
- return self.fix_changelog_patch(
- self.prepend_svn_revision(
- self.run(command, decode_output=False, cwd=self.checkout_root)))
+ return self.prepend_svn_revision(self.run(command, decode_output=False, cwd=self.checkout_root))
def _run_git_svn_find_rev(self, revision_or_treeish, branch=None):
# git svn find-rev requires SVN revisions to begin with the character 'r'.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (188480 => 188481)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-08-14 18:43:46 UTC (rev 188480)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2015-08-14 18:48:34 UTC (rev 188481)
@@ -77,12 +77,6 @@
return_stderr=return_stderr,
decode_output=decode_output)
- def fix_changelog_patch(self, diff):
- return self.run(
- ['perl', '-e', 'use VCSUtils; print(fixChangeLogPatch(join("", <STDIN>))->{"patch"});'],
- cwd=self._filesystem.join(self.checkout_root, 'Tools', 'Scripts'),
- input=diff, decode_output=False)
-
# SCM always returns repository relative path, but sometimes we need
# absolute paths to pass to rm, etc.
def absolute_path(self, repository_relative_path):
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (188480 => 188481)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-08-14 18:43:46 UTC (rev 188480)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2015-08-14 18:48:34 UTC (rev 188481)
@@ -273,10 +273,9 @@
elif changed_files == None:
changed_files = []
script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
- return self.fix_changelog_patch(
- self.run([script_path, "--no-style"] + changed_files,
- cwd=self.checkout_root, return_stderr=False,
- decode_output=False))
+ return self.run([script_path, "--no-style"] + changed_files,
+ cwd=self.checkout_root, return_stderr=False,
+ decode_output=False)
def committer_email_for_revision(self, revision):
return self._run_svn(["propget", "svn:author", "--revprop", "-r", revision]).rstrip()
