Changeset 53120 in webkit


Ignore:
Timestamp:
Jan 12, 2010 1:40:54 AM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-01-12 Adam Barth <abarth@webkit.org>

Reviewed by Eric Seidel.

Add experimental "land-safely" command to webkit-patch
https://bugs.webkit.org/show_bug.cgi?id=33518

  • Scripts/webkitpy/commands/upload.py:
  • Scripts/webkitpy/commands/upload_unittest.py:
  • Scripts/webkitpy/steps/init.py:
  • Scripts/webkitpy/steps/postdiffforcommit.py: Added.
Location:
trunk/WebKitTools
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r53112 r53120  
     12010-01-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add experimental "land-safely" command to webkit-patch
     6        https://bugs.webkit.org/show_bug.cgi?id=33518
     7
     8        * Scripts/webkitpy/commands/upload.py:
     9        * Scripts/webkitpy/commands/upload_unittest.py:
     10        * Scripts/webkitpy/steps/__init__.py:
     11        * Scripts/webkitpy/steps/postdiffforcommit.py: Added.
     12
    1132010-01-11  Kevin Ollivier  <kevino@theolliviers.com>
    214
  • trunk/WebKitTools/Scripts/webkitpy/commands/upload.py

    r53105 r53120  
    109109        return bug_id
    110110
     111    def _prepare_state(self, options, args, tool):
     112        state = {}
     113        state["bug_id"] = self._bug_id(args, tool, state)
     114        if not state["bug_id"]:
     115            error("No bug id passed and no bug url found in diff.")
     116        return state
     117
    111118
    112119class Post(AbstractPatchUploadingCommand):
     
    122129    ]
    123130
    124     def _prepare_state(self, options, args, tool):
    125         state = {}
    126         state["bug_id"] = self._bug_id(args, tool, state)
    127         if not state["bug_id"]:
    128             error("No bug id passed and no bug url found in diff, can't post.")
    129         return state
     131
     132class LandSafely(AbstractPatchUploadingCommand):
     133    name = "land-safely"
     134    help_text = "Land the current diff via the commit-queue (Experimental)"
     135    argument_names = "[BUGID]"
     136    steps = [
     137        steps.UpdateChangeLogsWithReviewer,
     138        steps.PostDiffForCommit,
     139    ]
    130140
    131141
  • trunk/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py

    r52969 r53120  
    5757        self.assert_execute_outputs(Post(), [42], expected_stderr=expected_stderr)
    5858
     59    def test_post(self):
     60        self.assert_execute_outputs(LandSafely(), [42])
     61
    5962    def test_prepare_diff_with_arg(self):
    6063        self.assert_execute_outputs(Prepare(), [42])
  • trunk/WebKitTools/Scripts/webkitpy/steps/__init__.py

    r52714 r53120  
    4747from webkitpy.steps.options import Options
    4848from webkitpy.steps.postdiff import PostDiff
     49from webkitpy.steps.postdiffforcommit import PostDiffForCommit
    4950from webkitpy.steps.preparechangelogforrevert import PrepareChangeLogForRevert
    5051from webkitpy.steps.preparechangelog import PrepareChangeLog
  • trunk/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py

    r52714 r53120  
    5353
    5454    def run(self, state):
    55         bug_id = state["patch"]["bug_id"]
     55        bug_id = state.get("bug_id") or state["patch"]["bug_id"]
    5656        reviewer = self._options.reviewer
    5757        if not reviewer:
Note: See TracChangeset for help on using the changeset viewer.