Changeset 140674 in webkit

Timestamp:

Jan 24, 2013 4:19:37 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Adding "has-landed" command to webkit-patch which compares a
committed patch to the changes which exist locally (ignoring the
ChangeLog file).

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

Patch by Tim 'mithro' Ansell <​mithro@mithis.com> on 2013-01-24
Reviewed by Eric Seidel.

• Scripts/webkitpy/common/checkout/diff_parser.py:

(git_diff_to_svn_diff):

• Scripts/webkitpy/common/net/bugzilla/bug.py:

(Bug.commit_revision):

• Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:

(BugTest.test_is_in_comments):
(BugTest):
(BugTest.test_commit_revision):

• Scripts/webkitpy/tool/commands/upload.py:

(HasLanded):

• Scripts/webkitpy/tool/steps/init.py:
• Scripts/webkitpy/tool/steps/haslanded.py: Added.

(HasLanded):
(HasLanded.convert_to_svn):
(HasLanded.strip_change_log):
(run):

• Scripts/webkitpy/common/net/bugzilla/bug.py:

(Bug.commit_revision):

• Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:

(BugTest.test_is_in_comments):
(BugTest):
(BugTest.test_commit_revision):

• Scripts/webkitpy/tool/commands/upload.py:

(HasLanded):

• Scripts/webkitpy/tool/steps/init.py:
• Scripts/webkitpy/tool/steps/haslanded.py: Added.

(HasLanded):
(HasLanded.convert_to_svn):
(HasLanded.strip_change_log):
(HasLanded.diff_diff):
(HasLanded.run):

• Scripts/webkitpy/tool/steps/haslanded_unittest.py: Added.

(HasLandedTest):
(HasLandedTest.test_run):
(test_convert_to_svn_and_strip_change_log):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/bugzilla/bug.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/bugzilla/bug_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/upload.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/__init__.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/haslanded.py (added)
• Scripts/webkitpy/tool/steps/haslanded_unittest.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-24  Tim 'mithro' Ansell  <mithro@mithis.com>
+
+        Adding "has-landed" command to webkit-patch which compares a
+        committed patch to the changes which exist locally (ignoring the
+        ChangeLog file).
+
+        https://bugs.webkit.org/show_bug.cgi?id=106402
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitpy/common/checkout/diff_parser.py:
+        (git_diff_to_svn_diff):
+        * Scripts/webkitpy/common/net/bugzilla/bug.py:
+        (Bug.commit_revision):
+        * Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:
+        (BugTest.test_is_in_comments):
+        (BugTest):
+        (BugTest.test_commit_revision):
+        * Scripts/webkitpy/tool/commands/upload.py:
+        (HasLanded):
+        * Scripts/webkitpy/tool/steps/__init__.py:
+        * Scripts/webkitpy/tool/steps/haslanded.py: Added.
+        (HasLanded):
+        (HasLanded.convert_to_svn):
+        (HasLanded.strip_change_log):
+        (run):
+
+        * Scripts/webkitpy/common/net/bugzilla/bug.py:
+        (Bug.commit_revision):
+        * Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:
+        (BugTest.test_is_in_comments):
+        (BugTest):
+        (BugTest.test_commit_revision):
+        * Scripts/webkitpy/tool/commands/upload.py:
+        (HasLanded):
+        * Scripts/webkitpy/tool/steps/__init__.py:
+        * Scripts/webkitpy/tool/steps/haslanded.py: Added.
+        (HasLanded):
+        (HasLanded.convert_to_svn):
+        (HasLanded.strip_change_log):
+        (HasLanded.diff_diff):
+        (HasLanded.run):
+        * Scripts/webkitpy/tool/steps/haslanded_unittest.py: Added.
+        (HasLandedTest):
+        (HasLandedTest.test_run):
+        (test_convert_to_svn_and_strip_change_log):
+
 2013-01-24  Dan Carney  <dcarney@google.com>
 

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py

@@ -28 +28 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import re
 
 from .attachment import Attachment
@@ -124 +126 @@
         return False
 
+    def commit_revision(self):
+        # Sort the comments in reverse order as we want the latest committed revision.
+        r = re.compile("Committed r(?P<svn_revision>\d+)")
+        for comment in sorted(self.comments(), reverse=True):
+            rev = r.search(comment['text'])
+            if rev:
+                return int(rev.group('svn_revision'))
+
+        return None

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bug_unittest.py

@@ -46 +46 @@
         self.assertTrue(bug.is_in_comments("Message3."))
         self.assertFalse(bug.is_in_comments("Message."))
+
+    def test_commit_revision(self):
+        bug = Bug({"comments": []}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), None)
+
+        bug = Bug({"comments": [
+            {"text": "Comment 1"},
+            {"text": "Comment 2"},
+            ]}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), None)
+
+        bug = Bug({"comments": [
+            {"text": "Committed r138776: <http://trac.webkit.org/changeset/138776>"},
+            ]}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), 138776)
+
+        bug = Bug({"comments": [
+            {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
+            ]}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), 138776)
+
+        bug = Bug({"comments": [
+            {"text": "Comment before"},
+            {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
+            {"text": "Comment after"},
+            ]}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), 138776)
+
+        bug = Bug({"comments": [
+            {"text": "Comment before"},
+            {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
+            {"text": "Comment Middle"},
+            {"text": "(From update of attachment 181280) Clearing flags on attachment: 181280 Committed r138976: <http://trac.webkit.org/changeset/138976>"},
+            {"text": "Comment After"},
+            ]}, bugzilla=None)
+        self.assertEqual(bug.commit_revision(), 138976)

trunk/Tools/Scripts/webkitpy/tool/commands/upload.py

@@ -242 +242 @@
 
 
+class HasLanded(AbstractPatchUploadingCommand):
+    name = "has-landed"
+    help_text = "Check that the current code was successfully landed and no changes remain."
+    argument_names = "[BUGID]"
+    steps = [
+        steps.HasLanded,
+    ]
+
+
 class Prepare(AbstractSequencedCommand):
     name = "prepare"

trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py

@@ -46 +46 @@
 from webkitpy.tool.steps.ensurebugisopenandassigned import EnsureBugIsOpenAndAssigned
 from webkitpy.tool.steps.ensurelocalcommitifneeded import EnsureLocalCommitIfNeeded
+from webkitpy.tool.steps.haslanded import HasLanded
 from webkitpy.tool.steps.obsoletepatches import ObsoletePatches
 from webkitpy.tool.steps.options import Options