Bug 33378 - webkit-patch: not possible to use build-and-test with local commits
Summary: webkit-patch: not possible to use build-and-test with local commits
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 49798
  Show dependency treegraph
 
Reported: 2010-01-08 04:59 PST by Eric Seidel (no email)
Modified: 2010-12-10 09:00 PST (History)
3 users (show)

See Also:


Attachments
Patch (4.77 KB, patch)
2010-12-10 03:47 PST, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 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.
Comment 1 Adam Barth 2010-01-08 10:03:04 PST
Hum...  I'm not sure how to do this without introducing a layering violation.
Comment 2 Eric Seidel (no email) 2010-12-10 03:47:40 PST
Created attachment 76180 [details]
Patch
Comment 3 Eric Seidel (no email) 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!
Comment 4 Eric Seidel (no email) 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.
Comment 5 Eric Seidel (no email) 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")
Comment 6 Ojan Vafai 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.
Comment 7 WebKit Review Bot 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>
Comment 8 WebKit Review Bot 2010-12-10 09:00:35 PST
All reviewed patches have been landed.  Closing bug.