<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166229] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166229">166229</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-25 05:13:03 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[webkitpy] Improve _parse_bug_description to recognize more descriptions
https://bugs.webkit.org/show_bug.cgi?id=130137
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-03-25
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/common/checkout/changelog.py:
(ChangeLogEntry._parse_bug_description):
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
(test_parse_log_entries_from_changelog):
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
(CheckoutTest.test_commit_info_for_revision):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutchangelogpy">trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutchangelog_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166228 => 166229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-25 09:53:26 UTC (rev 166228)
+++ trunk/Tools/ChangeLog 2014-03-25 12:13:03 UTC (rev 166229)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-25 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ [webkitpy] Improve _parse_bug_description to recognize more descriptions
+ https://bugs.webkit.org/show_bug.cgi?id=130137
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ (ChangeLogEntry._parse_bug_description):
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ (test_parse_log_entries_from_changelog):
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ (CheckoutTest.test_commit_info_for_revision):
+
</ins><span class="cx"> 2014-03-24 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build of TestWebKitAPI.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutchangelogpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (166228 => 166229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2014-03-25 09:53:26 UTC (rev 166228)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2014-03-25 12:13:03 UTC (rev 166229)
</span><span class="lines">@@ -188,15 +188,16 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def _parse_bug_description(cls, text):
</span><del>- # If line 4 is a bug url, line 3 is the bug description.
- # It's too hard to guess in other cases, so we return None.
</del><ins>+ # Line 3 is the bug description in most cases.
</ins><span class="cx"> lines = text.splitlines()
</span><del>- if len(lines) < 4:
</del><ins>+ if len(lines) < 3:
</ins><span class="cx"> return None
</span><del>- for bug_url in (config_urls.bug_url_short, config_urls.bug_url_long):
- if re.match("^\s*" + bug_url + "$", lines[3]):
- return lines[2].strip()
- return None
</del><ins>+ found_reviewed = re.search(ChangeLogEntry.reviewed_by_regexp, lines[2], re.IGNORECASE)
+ found_reviewed_byless = re.search(ChangeLogEntry.reviewed_byless_regexp, lines[2], re.IGNORECASE)
+ found_url = parse_bug_id_from_changelog(lines[2])
+ if found_reviewed or found_reviewed_byless or found_url:
+ return None
+ return lines[2].strip()
</ins><span class="cx">
</span><span class="cx"> def _parse_entry(self):
</span><span class="cx"> match = re.match(self.date_line_regexp, self._contents, re.MULTILINE)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutchangelog_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (166228 => 166229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2014-03-25 09:53:26 UTC (rev 166228)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2014-03-25 12:13:03 UTC (rev 166229)
</span><span class="lines">@@ -241,15 +241,18 @@
</span><span class="cx"> self.assertEqual(parsed_entries[0].date(), "2009-08-17")
</span><span class="cx"> self.assertEqual(parsed_entries[0].reviewer_text(), "David Levin")
</span><span class="cx"> self.assertEqual(parsed_entries[0].is_touched_files_text_clean(), False)
</span><ins>+ self.assertIsNone(parsed_entries[0].bug_description())
</ins><span class="cx"> self.assertEqual(parsed_entries[1].date_line(), "2009-08-16 David Kilzer <ddkilzer@apple.com>")
</span><span class="cx"> self.assertEqual(parsed_entries[1].date(), "2009-08-16")
</span><span class="cx"> self.assertEqual(parsed_entries[1].author_email(), "ddkilzer@apple.com")
</span><ins>+ self.assertEqual(parsed_entries[1].bug_description(), "Backed out r47343 which was mistakenly committed")
</ins><span class="cx"> self.assertEqual(parsed_entries[1].touched_files_text(), " * Scripts/bugzilla-tool:\n * Scripts/modules/scm.py:\n")
</span><span class="cx"> self.assertEqual(parsed_entries[1].is_touched_files_text_clean(), True)
</span><span class="cx"> self.assertEqual(parsed_entries[2].reviewer_text(), "Mark Rowe")
</span><span class="cx"> self.assertEqual(parsed_entries[2].touched_files(), ["DumpRenderTree/mac/DumpRenderTreeWindow.mm"])
</span><span class="cx"> self.assertEqual(parsed_entries[2].touched_functions(), {"DumpRenderTree/mac/DumpRenderTreeWindow.mm": ["-[DumpRenderTreeWindow close]"]})
</span><span class="cx"> self.assertEqual(parsed_entries[2].is_touched_files_text_clean(), False)
</span><ins>+ self.assertIsNone(parsed_entries[2].bug_description())
</ins><span class="cx"> self.assertEqual(parsed_entries[3].author_name(), "Benjamin Poulain")
</span><span class="cx"> self.assertEqual(parsed_entries[3].touched_files(), ["platform/cf/KURLCFNet.cpp", "platform/mac/KURLMac.mm",
</span><span class="cx"> "WebCoreSupport/ChromeClientEfl.cpp", "ewk/ewk_private.h", "ewk/ewk_view.cpp"])
</span><span class="lines">@@ -260,9 +263,13 @@
</span><span class="cx"> self.assertEqual(parsed_entries[4].reviewer_text(), "David Hyatt")
</span><span class="cx"> self.assertIsNone(parsed_entries[4].bug_description())
</span><span class="cx"> self.assertEqual(parsed_entries[5].reviewer_text(), "Adam Roben")
</span><ins>+ self.assertIsNone(parsed_entries[5].bug_description())
</ins><span class="cx"> self.assertEqual(parsed_entries[6].reviewer_text(), "Tony Chang")
</span><ins>+ self.assertIsNone(parsed_entries[6].bug_description())
</ins><span class="cx"> self.assertIsNone(parsed_entries[7].reviewer_text())
</span><ins>+ self.assertEqual(parsed_entries[7].bug_description(), "Unreviewed warning fix.")
</ins><span class="cx"> self.assertEqual(parsed_entries[8].reviewer_text(), 'Darin Adler')
</span><ins>+ self.assertEqual(parsed_entries[8].bug_description(), 'Resolve regular and visited link style in a single pass')
</ins><span class="cx">
</span><span class="cx"> def test_parse_log_entries_from_annotated_file(self):
</span><span class="cx"> # Note that there are trailing spaces on some of the lines intentionally.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (166228 => 166229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-03-25 09:53:26 UTC (rev 166228)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2014-03-25 12:13:03 UTC (rev 166229)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> checkout.changelog_entries_for_revision = lambda revision, changed_files=None: [ChangeLogEntry(_changelog1entry1)]
</span><span class="cx"> commitinfo = checkout.commit_info_for_revision(4)
</span><span class="cx"> self.assertEqual(commitinfo.bug_id(), 36629)
</span><del>- self.assertEqual(commitinfo.bug_description(), None)
</del><ins>+ self.assertEqual(commitinfo.bug_description(), "Unreviewed build fix to un-break webkit-patch land.")
</ins><span class="cx"> self.assertEqual(commitinfo.author_name(), u"Tor Arne Vestb\u00f8")
</span><span class="cx"> self.assertEqual(commitinfo.author_email(), "vestbo@webkit.org")
</span><span class="cx"> self.assertIsNone(commitinfo.reviewer_text())
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> ],
</span><span class="cx"> 'reviewer_text': None,
</span><span class="cx"> 'author_name': u'Tor Arne Vestb\xf8',
</span><del>- 'bug_description': None,
</del><ins>+ 'bug_description': 'Unreviewed build fix to un-break webkit-patch land.',
</ins><span class="cx"> })
</span><span class="cx">
</span><span class="cx"> checkout.changelog_entries_for_revision = lambda revision, changed_files=None: []
</span></span></pre>
</div>
</div>
</body>
</html>