Title: [123924] trunk/Tools
Revision
123924
Author
[email protected]
Date
2012-07-27 15:10:30 -0700 (Fri, 27 Jul 2012)

Log Message

"webkit-patch upload" should strip colors from patch if necessary
https://bugs.webkit.org/show_bug.cgi?id=92306

Patch by Rafael Brandao <[email protected]> on 2012-07-27
Reviewed by Adam Barth.

* Scripts/webkitpy/common/checkout/scm/git.py: Explicity remove colors from diff.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (123923 => 123924)


--- trunk/Tools/ChangeLog	2012-07-27 22:07:17 UTC (rev 123923)
+++ trunk/Tools/ChangeLog	2012-07-27 22:10:30 UTC (rev 123924)
@@ -1,3 +1,12 @@
+2012-07-27  Rafael Brandao  <[email protected]>
+
+        "webkit-patch upload" should strip colors from patch if necessary
+        https://bugs.webkit.org/show_bug.cgi?id=92306
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py: Explicity remove colors from diff.
+
 2012-07-27  Eric Seidel  <[email protected]>
 
         clean-pending-commit throws exception when encountering Ossy

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (123923 => 123924)


--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py	2012-07-27 22:07:17 UTC (rev 123923)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py	2012-07-27 22:10:30 UTC (rev 123924)
@@ -274,7 +274,7 @@
         if self._filesystem.exists(order_file):
             order = "-O%s" % order_file
 
-        command = [self.executable_name, 'diff', '--binary', "--no-ext-diff", "--full-index", "--no-renames", order, self.merge_base(git_commit), "--"]
+        command = [self.executable_name, 'diff', '--binary', '--no-color', "--no-ext-diff", "--full-index", "--no-renames", order, self.merge_base(git_commit), "--"]
         if changed_files:
             command += changed_files
         return self.prepend_svn_revision(self.run(command, decode_output=False, cwd=self.checkout_root))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to