webkit-patch apply-attachment is very slow for big patches

https://bugs.webkit.org/show_bug.cgi?id=74929

Add "excludefield=attachmentdata" to the URL everywhere
"ctype=xml" is used to exclude this field from the XML.

Reviewed by Adam Barth.

* Scripts/prepare-ChangeLog:
(fetchBugDescriptionFromURL):
* Scripts/webkitpy/common/config/urls.py:
* Scripts/webkitpy/common/config/urls_unittest.py:
(URLsTest.test_parse_bug_id):
* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
(Bugzilla.bug_url_for_bug_id):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@116934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1600b538a149a67ab76147ce409c0b731325031c..8d5c73d90ecfa453d3a7be54f17ae4c6cd171c07 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2012-05-14  David Kilzer  <ddkilzer@apple.com>
+
+        webkit-patch apply-attachment is very slow for big patches
+        https://bugs.webkit.org/show_bug.cgi?id=74929
+
+        Add "excludefield=attachmentdata" to the URL everywhere
+        "ctype=xml" is used to exclude this field from the XML.
+
+        Reviewed by Adam Barth.
+
+        * Scripts/prepare-ChangeLog:
+        (fetchBugDescriptionFromURL):
+        * Scripts/webkitpy/common/config/urls.py:
+        * Scripts/webkitpy/common/config/urls_unittest.py:
+        (URLsTest.test_parse_bug_id):
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+        (Bugzilla.bug_url_for_bug_id):
+
 2012-05-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         performance tests should be able to measure runs/sec rather than time

diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog
index 8a48e567ec58c3a8c8569e034c3a8a063c9abb7e..df687dc2c992416c5fe5ae6178b8abc889854a44 100755 (executable)
--- a/Tools/Scripts/prepare-ChangeLog
+++ b/Tools/Scripts/prepare-ChangeLog
@@ -345,7 +345,7 @@ sub fetchBugDescriptionFromURL($$)
 {
     my ($bugURL, $bugNumber) = @_;
 
-    my $bugXMLURL = "$bugURL&ctype=xml";
+    my $bugXMLURL = "$bugURL&ctype=xml&excludefield=attachmentdata";
     # Perl has no built in XML processing, so we'll fetch and parse with curl and grep
     # Pass --insecure because some cygwin installs have no certs we don't
     # care about validating that bugs.webkit.org is who it says it is here.

diff --git a/Tools/Scripts/webkitpy/common/config/urls.py b/Tools/Scripts/webkitpy/common/config/urls.py
index 48830c5643534357a61999d34641b80e49847e87..88ad373a17062a7cfdd6589397700db9e1d238af 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/urls.py
+++ b/Tools/Scripts/webkitpy/common/config/urls.py
@@ -47,7 +47,7 @@ bug_server_domain = "webkit.org"
 bug_server_host = "bugs." + bug_server_domain
 _bug_server_regex = "https?://%s/" % re.sub('\.', '\\.', bug_server_host)
 bug_server_url = "https://%s/" % bug_server_host
-bug_url_long = _bug_server_regex + r"show_bug\.cgi\?id=(?P<bug_id>\d+)(&ctype=xml)?"
+bug_url_long = _bug_server_regex + r"show_bug\.cgi\?id=(?P<bug_id>\d+)(&ctype=xml|&excludefield=attachmentdata)*"
 bug_url_short = r"https?\://%s/b/(?P<bug_id>\d+)" % bug_server_domain
 
 attachment_url = _bug_server_regex + r"attachment\.cgi\?id=(?P<attachment_id>\d+)(&action=(?P<action>\w+))?"

diff --git a/Tools/Scripts/webkitpy/common/config/urls_unittest.py b/Tools/Scripts/webkitpy/common/config/urls_unittest.py
index 74c224090578707e8bde0af015efb58858c5e7d0..2b94b860e694fed5d0c0b0be16f2bca63f363b5d 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/urls_unittest.py
+++ b/Tools/Scripts/webkitpy/common/config/urls_unittest.py
@@ -37,10 +37,17 @@ class URLsTest(unittest.TestCase):
         self.assertEquals(12345, parse_bug_id("http://webkit.org/b/12345"))
         self.assertEquals(12345, parse_bug_id("foo\n\nhttp://webkit.org/b/12345\nbar\n\n"))
         self.assertEquals(12345, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?id=12345"))
+        self.assertEquals(12345, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?id=12345&ctype=xml"))
+        self.assertEquals(12345, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?id=12345&ctype=xml&excludefield=attachmentdata"))
+        self.assertEquals(12345, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?id=12345excludefield=attachmentdata&ctype=xml"))
 
         # Our url parser is super-fragile, but at least we're testing it.
         self.assertEquals(None, parse_bug_id("http://www.webkit.org/b/12345"))
         self.assertEquals(None, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?ctype=xml&id=12345"))
+        self.assertEquals(None, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?ctype=xml&id=12345&excludefield=attachmentdata"))
+        self.assertEquals(None, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?ctype=xml&excludefield=attachmentdata&id=12345"))
+        self.assertEquals(None, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?excludefield=attachmentdata&ctype=xml&id=12345"))
+        self.assertEquals(None, parse_bug_id("http://bugs.webkit.org/show_bug.cgi?excludefield=attachmentdata&id=12345&ctype=xml"))
 
     def test_parse_attachment_id(self):
         self.assertEquals(12345, parse_attachment_id("https://bugs.webkit.org/attachment.cgi?id=12345&action=review"))

diff --git a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
index 6186a9559479f7d333e384ec6f13be5692edc585..1afa287de36dcf0652e8a5e42ef42740d2ce393b 100644 (file)
--- a/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
+++ b/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
@@ -308,7 +308,7 @@ class Bugzilla(object):
     def bug_url_for_bug_id(self, bug_id, xml=False):
         if not bug_id:
             return None
-        content_type = "&ctype=xml" if xml else ""
+        content_type = "&ctype=xml&excludefield=attachmentdata" if xml else ""
         return "%sshow_bug.cgi?id=%s%s" % (config_urls.bug_server_url, bug_id, content_type)
 
     def short_bug_url_for_bug_id(self, bug_id):