[Webkit-unassigned] [Bug 36394] Include git commits in the diff for webkit-patch upload/land.

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=36394





--- Comment #49 from Chris Jerdonek <cjerdonek at webkit.org>  2010-04-06 18:33:58 PST ---
(In reply to comment #46)
> (From update of attachment 52686 [details])
> Moves git_commit and squash to be arguments to the relevant functions instead
> of state stored in the Git class.
> 
> Also, adds --no-squash and lets --git-commit take a range (e.g. head~3..head).
> 
> Changes check-webkit-style to not treat --git-commit as --git-since and gets
> rid of --git-since. Treating the git-commit as a since is unnecessary (and
> otherwise limiting) since that can be replicated by just adding a ".." to the
> end of the commit ID.

Something weird is happening here:

https://bugs.webkit.org/show_bug.cgi?id=36938#c14

(Eric e-mailed me about this.)

I haven't looked at this patch to understand how it impacts check-webkit-style,
but I did notice this:

+        squash_help = ("All diffs from the remote branch are checked."
+                       "If excluded, prompts whether to squash when there are
multiple commits.")
+        parser.add_option("-s", "--squash", action="store_true",
dest="squash", help=squash_help)
+
+        squash_help = ("Only working copy diffs are checked."
+                       "If excluded, prompts whether to squash when there are
multiple commits.")
+        parser.add_option("--no-squash", action="store_false", dest="squash",
help=squash_help)
+
         verbose_help = "enable verbose logging."
         parser.add_option("-v", "--verbose", dest="is_verbose", default=False,
                           action="store_true", help=verbose_help)

Can "--squash" and "--no-squash" perhaps be combined into a single
argument-less flag?  They are writing to the same "squash" property.  The code
for the "--verbose" option above might help which uses a default parameter.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.