Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-07-09 Thread Ojan Vafai
This has landed. Squashing is now the default behavior. --git-commit/-g operates on the commit(s) listed as a single commit. --git-commit=HEAD.. operates on the working copy. Ojan On Mon, May 24, 2010 at 5:10 PM, Ojan Vafai o...@chromium.org wrote: I posted a patch to

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-17 Thread Ojan Vafai
On Sun, May 16, 2010 at 10:38 AM, Chris Jerdonek cjerdo...@webkit.orgwrote: On Sun, May 16, 2010 at 8:26 AM, Ojan Vafai o...@chromium.org wrote: On Sat, May 15, 2010 at 2:17 PM, Chris Jerdonek cjerdo...@webkit.org wrote: In particular, --git-commit=HEAD.. should be just the uncommitted

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-16 Thread Ojan Vafai
On Fri, May 14, 2010 at 9:20 PM, David Kilzer ddkil...@webkit.org wrote: Personally, I don't see why both models (single patches and multiple patches) couldn't be supported based on the arguments passed to webkit-patch. git itself seems to be able to figure out if the user is referring to a

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-16 Thread Chris Jerdonek
Thanks, Ojan. On Sun, May 16, 2010 at 8:26 AM, Ojan Vafai o...@chromium.org wrote: On Sat, May 15, 2010 at 2:17 PM, Chris Jerdonek cjerdo...@webkit.org wrote:  In particular, --git-commit=HEAD.. should be just the uncommitted changes (staged and unstaged). This one I'm a bit iffy on. Should

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-15 Thread Chris Jerdonek
Thanks for your responses, Ojan. On Fri, May 14, 2010 at 6:29 PM, Ojan Vafai o...@chromium.org wrote: Maybe it already does this, but would it be possible to make the default behavior be to throw an error if there is more than one possibility for what should be committed? That's what it

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-14 Thread Ojan Vafai
tonikitoo, aroben, ddkilzner: You are the three who I remember voicing yourselves about wanting webkit-patch to support committing/uploading multiple patches from the same branch. Would Chris's suggestion below (last couple paragraphs) be acceptable to you? I prefer it as it makes webkit-patch

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-14 Thread David Kilzer
On Fri, May 14, 2010 at 6:29:05 PM, Ojan Vafai wrote: tonikitoo, aroben, ddkilzer: You are the three who I remember voicing yourselves about wanting webkit-patch to support committing/uploading multiple patches from the same branch. Would Chris's suggestion below (last couple paragraphs) be

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-13 Thread Ojan Vafai
I finally updated this page http://trac.webkit.org/wiki/UsingGitWithWebKit#webkit-patchcheck-webkit-styleandgit . As is clear from that, my earlier description of --no-squash was totally inaccurate. Sorry, I was being rushed. --no-squash and --git-commit still need significant work before they

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-05-13 Thread Chris Jerdonek
On Thu, May 13, 2010 at 11:13 AM, Ojan Vafai o...@chromium.org wrote: I finally updated this page http://trac.webkit.org/wiki/UsingGitWithWebKit#webkit-patchcheck-webkit-styleandgit. As is clear from that, my earlier description of --no-squash was totally inaccurate. Sorry, I was being rushed.

[webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Ojan Vafai
The behavior of git and webkit-patch changed with http://trac.webkit.org/changeset/58261. Many webkit-patch commands (e.g. upload and land) and check-webkit-style now take --squash and --git-commit arguments. --git-commit: upload, commit, check-style, etc on the given git commit(s). Commits can

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Kenneth Christiansen
Nice work Ojan, Will you make webkit-patch apply-attachment understand patches doing renames/mv created with git format-patch? That would be really useful. Cheers, Kenneth On Mon, Apr 26, 2010 at 2:55 PM, Ojan Vafai o...@chromium.org wrote: The behavior of git and webkit-patch changed with

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Tony Gentilcore
I'm just in the process of converting to git, but this looks amazing! It would be really helpful for me if http://trac.webkit.org/wiki/UsingGitWithWebKit had a section that explains the flow for using webkit-patch with git. On Mon, Apr 26, 2010 at 1:20 PM, Kenneth Christiansen

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Ojan Vafai
On Mon, Apr 26, 2010 at 1:26 PM, Tony Gentilcore to...@google.com wrote: It would be really helpful for me if http://trac.webkit.org/wiki/UsingGitWithWebKit had a section that explains the flow for using webkit-patch with git. Oh right. I meant to update that page. I'll do so later today.

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Timothy Hatcher
webkit-patch sounds useful now… On Apr 26, 2010, at 10:55 AM, Ojan Vafai wrote: Eventually, I'd like to make --squash the default, but I want this to bake and get some usage before flipping that switch. But I don't think this makes sense as a default to me. But maybe I use git differently

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread Ojan Vafai
On Mon, Apr 26, 2010 at 4:48 PM, Timothy Hatcher timo...@apple.com wrote: On Apr 26, 2010, at 10:55 AM, Ojan Vafai wrote: Eventually, I'd like to make --squash the default, but I want this to bake and get some usage before flipping that switch. But I don't think this makes sense as a

Re: [webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

2010-04-26 Thread tonikitoo (Antonio Gomes)
Hi, Eventually, I'd like to make --squash the default, but I want this to bake and get some usage before flipping that switch. But I don't think this makes sense as a default to me. But maybe I use git differently than everyone else… I don't do the whole branch-per-bug business. I