Summary: | webkit-patch: not possible to use build-and-test with local commits | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> | ||||
Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | abarth, ojan, webkit.review.bot | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | PC | ||||||
OS: | OS X 10.5 | ||||||
Bug Depends on: | |||||||
Bug Blocks: | 49798 | ||||||
Attachments: |
|
Description
Eric Seidel (no email)
2010-01-08 04:59:36 PST
Hum... I'm not sure how to do this without introducing a layering violation. Created attachment 76180 [details]
Patch
This should fix the commit-queue failing in "update" due to local commits. We still don't understand how it's ending up there with local commits however! Ahha! the commit-queue uses "webkit-patch apply-attachment" which uses: class ApplyAttachment(AbstractPatchApplyingCommand, ProcessAttachmentsMixin): class AbstractPatchApplyingCommand(AbstractPatchSequencingCommand): prepare_steps = [ steps.EnsureLocalCommitIfNeeded, steps.CleanWorkingDirectoryWithLocalCommits, steps.Update, ] main_steps = [ steps.ApplyPatchWithLocalCommit, ] long_help = """Updates the working copy. Downloads and applies the patches, creating local commits if necessary.""" Unclear why. We're not passing --local-commit, and --local-commit should default to false, so I don't understand: local_commit = make_option("--local-commit", action="store_true", dest="local_commit", default=False, help="Make a local commit for each applied patch") Comment on attachment 76180 [details]
Patch
Not sure I understand the larger problem, but this change certainly looks correct.
Comment on attachment 76180 [details] Patch Clearing flags on attachment: 76180 Committed r73733: <http://trac.webkit.org/changeset/73733> All reviewed patches have been landed. Closing bug. |