Changeset 51085 in webkit


Ignore:
Timestamp:
Nov 17, 2009 12:11:33 PM (14 years ago)
Author:
eric@webkit.org
Message:

2009-11-17 Eric Seidel <eric@webkit.org>

Reviewed by Darin Adler.

commit-queue is failing to set reviewer in ChangeLogs
https://bugs.webkit.org/show_bug.cgi?id=31592

  • Scripts/bugzilla-tool: Clarify the "applying" log message.
  • Scripts/modules/bugzilla.py:
    • Add a new _validate_committer_and_reviewer function as a temporary solution until we can make a real Attachment object which knows how to fill in its committer/reviewer fields automatically.
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r51084 r51085  
     12009-11-17  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        commit-queue is failing to set reviewer in ChangeLogs
     6        https://bugs.webkit.org/show_bug.cgi?id=31592
     7
     8        * Scripts/bugzilla-tool: Clarify the "applying" log message.
     9        * Scripts/modules/bugzilla.py:
     10         - Add a new _validate_committer_and_reviewer function as a
     11           temporary solution until we can make a real Attachment object
     12           which knows how to fill in its committer/reviewer fields automatically.
     13
    1142009-11-17  Kenneth Rohde Christiansen  <kenneth@webkit.org>
    215
  • trunk/WebKitTools/Scripts/bugzilla-tool

    r51036 r51085  
    331331    def _land_patch(cls, patch, options, tool):
    332332        tool.scm().update_webkit() # Update before every patch in case the tree has changed
    333         log("Applying %s from bug %s." % (patch['id'], patch['bug_id']))
     333        log("Applying patch %s from bug %s." % (patch['id'], patch['bug_id']))
    334334        tool.scm().apply_patch(patch, force=options.non_interactive)
    335335
  • trunk/WebKitTools/Scripts/modules/bugzilla.py

    r51020 r51085  
    219219        for attachment in attachments:
    220220            if attachment['id'] == attachment_id:
     221                self._validate_committer_and_reviewer(attachment)
    221222                return attachment
    222223        return None # This should never be hit.
     
    262263    def _validate_committer(self, patch, reject_invalid_patches):
    263264        return self._validate_setter_email(patch, 'committer', self.committers.committer_by_email, self.reject_patch_from_commit_queue, reject_invalid_patches)
     265
     266    # FIXME: This is a hack until we have a real Attachment object.
     267    # _validate_committer and _validate_reviewer fill in the 'reviewer' and 'committer'
     268    # keys which other parts of the code expect to be filled in.
     269    def _validate_committer_and_reviewer(self, patch):
     270        self._validate_reviewer(patch, reject_invalid_patches=False)
     271        self._validate_committer(patch, reject_invalid_patches=False)
    264272
    265273    def fetch_unreviewed_patches_from_bug(self, bug_id):
Note: See TracChangeset for help on using the changeset viewer.