Bug 33378

Summary: webkit-patch: not possible to use build-and-test with local commits
Product: WebKit Reporter: Eric Seidel (no email) <eric>
Component: Tools / TestsAssignee: 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 Flags
Patch none

Eric Seidel (no email)
Reported 2010-01-08 04:59:36 PST
not possible to use build-and-test with local commits even if you pass --no-update and --no-clean it still errors out about local commits.
Attachments
Patch (4.77 KB, patch)
2010-12-10 03:47 PST, Eric Seidel (no email) 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Adam Barth
Comment 1 2010-01-08 10:03:04 PST
Hum... I'm not sure how to do this without introducing a layering violation.
Eric Seidel (no email)
Comment 2 2010-12-10 03:47:40 PST
Created attachment 76180 [details] Patch
Eric Seidel (no email)
Comment 3 2010-12-10 03:48:24 PST
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!
Eric Seidel (no email)
Comment 4 2010-12-10 03:50:14 PST
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.
Eric Seidel (no email)
Comment 5 2010-12-10 03:53:07 PST
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")
Ojan Vafai
Comment 6 2010-12-10 08:29:39 PST
Comment on attachment 76180 [details] Patch Not sure I understand the larger problem, but this change certainly looks correct.
WebKit Review Bot
Comment 7 2010-12-10 09:00:29 PST
Comment on attachment 76180 [details] Patch Clearing flags on attachment: 76180 Committed r73733: <http://trac.webkit.org/changeset/73733>
WebKit Review Bot
Comment 8 2010-12-10 09:00:35 PST
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.