[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 #59 from Ojan Vafai <ojan at chromium.org>  2010-04-26 10:29:55 PST ---
(In reply to comment #58)
> (From update of attachment 53904 [details])
> WebKitTools/Scripts/webkitpy/common/checkout/scm.py:181
>  +      def changed_files(self, git_commit=None, squash=None):
> Should this be squash=False?

No, this is a bit messy. There are currently three squash states:
None: The behavior before this patch + some explicit failures for unexpected
cases (e.g. multiple local commits + working-copy changes)
False: Treat each local commit + working copy separately
True: Treat all commits + working copy as one commit.

My plan is to eventually make squash=True the default and get rid of the None
state entirely, but I'd like --squash to bake for a couple weeks first.

> WebKitTools/Scripts/webkitpy/common/checkout/api.py:131
>  +              raise ScriptError(message="Working directory must be clean to
> revert a revision.")
> Why did you add this error handling here?  This is the wrong layer to catch
> this error.  Notice that apply patch doesn't have a similar check even though
> it has logically the same issue.

It's documenting the existing behavior that locally modified ChangeLogs will
get reverted along with the reverse_diff's ChangeLogs. It's not a new behavior
with this patch though, so I'll just remove the new error.

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