Title: [109115] trunk/Tools
- Revision
- 109115
- Author
- [email protected]
- Date
- 2012-02-28 09:20:30 -0800 (Tue, 28 Feb 2012)
Log Message
Unreviewed, rolling out r109110.
http://trac.webkit.org/changeset/109110
https://bugs.webkit.org/show_bug.cgi?id=79806
webkitpy makes it too easy to add wkb.ug URLs to ChangeLogs
(Requested by aroben on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-02-28
* Scripts/webkitpy/common/checkout/changelog.py:
(parse_bug_id):
(parse_bug_id_from_changelog):
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
* Scripts/webkitpy/common/config/urls.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109114 => 109115)
--- trunk/Tools/ChangeLog 2012-02-28 17:05:28 UTC (rev 109114)
+++ trunk/Tools/ChangeLog 2012-02-28 17:20:30 UTC (rev 109115)
@@ -1,3 +1,18 @@
+2012-02-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r109110.
+ http://trac.webkit.org/changeset/109110
+ https://bugs.webkit.org/show_bug.cgi?id=79806
+
+ webkitpy makes it too easy to add wkb.ug URLs to ChangeLogs
+ (Requested by aroben on #webkit).
+
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ (parse_bug_id):
+ (parse_bug_id_from_changelog):
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ * Scripts/webkitpy/common/config/urls.py:
+
2012-02-28 Adam Roben <[email protected]>
Add my new email address
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (109114 => 109115)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2012-02-28 17:05:28 UTC (rev 109114)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2012-02-28 17:20:30 UTC (rev 109115)
@@ -50,9 +50,6 @@
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
@@ -68,9 +65,6 @@
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 (109114 => 109115)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-28 17:05:28 UTC (rev 109114)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-28 17:20:30 UTC (rev 109115)
@@ -197,19 +197,6 @@
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
@@ -245,25 +232,6 @@
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 (109114 => 109115)
--- trunk/Tools/Scripts/webkitpy/common/config/urls.py 2012-02-28 17:05:28 UTC (rev 109114)
+++ trunk/Tools/Scripts/webkitpy/common/config/urls.py 2012-02-28 17:20:30 UTC (rev 109115)
@@ -48,7 +48,6 @@
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
