Title: [109110] trunk/Tools
- Revision
- 109110
- Author
- [email protected]
- Date
- 2012-02-28 08:49:11 -0800 (Tue, 28 Feb 2012)
Log Message
Teach webkitpy about wkb.ug URLs
Fixes <http://wkb.ug/79799> webkit-patch can't find bug numbers from ChangeLog entries that
use wkb.ug URLs
Patch by Adam Roben <[email protected]> on 2012-02-28
Reviewed by Anders Carlsson.
* Scripts/webkitpy/common/checkout/changelog.py:
(parse_bug_id):
(parse_bug_id_from_changelog):
Fall back to the tiny URL format if neither the short nor long URL formats work.
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
(ChangeLogTest.test_parse_bug_id_from_changelog): Added tests for the above changes.
* Scripts/webkitpy/common/config/urls.py: Added bug_url_tiny, which can be used to match
wkb.ug URLs.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109109 => 109110)
--- trunk/Tools/ChangeLog 2012-02-28 16:27:25 UTC (rev 109109)
+++ trunk/Tools/ChangeLog 2012-02-28 16:49:11 UTC (rev 109110)
@@ -1,3 +1,23 @@
+2012-02-28 Adam Roben <[email protected]>
+
+ Teach webkitpy about wkb.ug URLs
+
+ Fixes <http://wkb.ug/79799> webkit-patch can't find bug numbers from ChangeLog entries that
+ use wkb.ug URLs
+
+ Reviewed by Anders Carlsson.
+
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ (parse_bug_id):
+ (parse_bug_id_from_changelog):
+ Fall back to the tiny URL format if neither the short nor long URL formats work.
+
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ (ChangeLogTest.test_parse_bug_id_from_changelog): Added tests for the above changes.
+
+ * Scripts/webkitpy/common/config/urls.py: Added bug_url_tiny, which can be used to match
+ wkb.ug URLs.
+
2012-02-28 János Badics <[email protected]>
[Qt] build-webkit does not detect the number of CPUs
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (109109 => 109110)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2012-02-28 16:27:25 UTC (rev 109109)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2012-02-28 16:49:11 UTC (rev 109110)
@@ -50,6 +50,9 @@
match = re.search(config_urls.bug_url_long, message)
if match:
return int(match.group('bug_id'))
+ match = re.search(config_urls.bug_url_tiny, message)
+ if match:
+ return int(match.group('bug_id'))
return None
@@ -65,6 +68,9 @@
match = re.search("^\s*" + config_urls.bug_url_long + "$", message, re.MULTILINE)
if match:
return int(match.group('bug_id'))
+ match = re.search("^\s*" + config_urls.bug_url_tiny + "$", message, re.MULTILINE)
+ if match:
+ return int(match.group('bug_id'))
# We weren't able to find a bug URL in the format used by prepare-ChangeLog. Fall back to the
# first bug URL found anywhere in the message.
return parse_bug_id(message)
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (109109 => 109110)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-28 16:27:25 UTC (rev 109109)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-28 16:49:11 UTC (rev 109110)
@@ -197,6 +197,19 @@
self.assertEquals(12345, parse_bug_id_from_changelog(commit_text))
commit_text = '''
+2011-03-23 Ojan Vafai <[email protected]>
+
+ Add failing result for WebKit2. All tests that require
+ focus fail on WebKit2. See https://bugs.webkit.org/show_bug.cgi?id=56988.
+ http://wkb.ug/12345
+
+ * platform/mac-wk2/fast/css/pseudo-any-expected.txt: Added.
+
+ '''
+
+ self.assertEquals(12345, parse_bug_id_from_changelog(commit_text))
+
+ commit_text = '''
2011-03-31 Adam Roben <[email protected]>
Quote the executable path we pass to ::CreateProcessW
@@ -232,6 +245,25 @@
self.assertEquals(57354, parse_bug_id_from_changelog(commit_text))
+ commit_text = '''
+2011-03-31 Adam Roben <[email protected]>
+
+ Quote the executable path we pass to ::CreateProcessW
+
+ This will ensure that spaces in the path will be interpreted correctly.
+
+ Fixes <http://wkb.ug/57569> Web process sometimes fails to launch when there are
+ spaces in its path
+
+ Reviewed by Steve Falkenburg.
+
+ * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+ (WebKit::ProcessLauncher::launchProcess): Surround the executable path in quotes.
+
+ '''
+
+ self.assertEquals(57569, parse_bug_id_from_changelog(commit_text))
+
def test_parse_log_entries_from_changelog(self):
changelog_file = StringIO(self._example_changelog)
parsed_entries = list(ChangeLog.parse_entries_from_file(changelog_file))
Modified: trunk/Tools/Scripts/webkitpy/common/config/urls.py (109109 => 109110)
--- trunk/Tools/Scripts/webkitpy/common/config/urls.py 2012-02-28 16:27:25 UTC (rev 109109)
+++ trunk/Tools/Scripts/webkitpy/common/config/urls.py 2012-02-28 16:49:11 UTC (rev 109110)
@@ -48,6 +48,7 @@
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_short = r"https?\://webkit\.org/b/(?P<bug_id>\d+)"
+bug_url_tiny = r"http://wkb\.ug/(?P<bug_id>\d+)"
buildbot_url = "http://build.webkit.org"
chromium_buildbot_url = "http://build.chromium.org/p/chromium.webkit"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
