Use reset --soft to squash before dcomitting.

Use reset --soft to squash before dcomitting.

Using reset --soft doesn't require touching the working copy, so it should be faster and not require rebuilds.

BUG=none
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=77267

[Bernhard Bauer, 2011-02-24 13:36:46]

please review.

[evanm, 2011-02-25 18:13:15]

This is clever! I am not sure why I didn't do it this way originally.

Do the tests pass?

http://codereview.chromium.org/6575031/diff/1/git_cl/git_cl.py
File git_cl/git_cl.py (right):

http://codereview.chromium.org/6575031/diff/1/git_cl/git_cl.py#newcode961
git_cl/git_cl.py:961: # dcommitting that.
This comment needs to be updated.

[Bernhard Bauer, 2011-02-27 15:03:16]

On 2011/02/25 18:13:15, evanm wrote:
> This is clever! I am not sure why I didn't do it this way originally.
> 
> Do the tests pass?

I couldn't get the tests to run on my Mac even with a clean trunk :-(

http://codereview.chromium.org/6575031/diff/1/git_cl/git_cl.py
File git_cl/git_cl.py (right):

http://codereview.chromium.org/6575031/diff/1/git_cl/git_cl.py#newcode961
git_cl/git_cl.py:961: # dcommitting that.
On 2011/02/25 18:13:15, evanm wrote:
> This comment needs to be updated.

Done.

[evanm, 2011-02-28 22:16:39]

On 2011/02/27 15:03:16, Bernhard Bauer wrote:
> On 2011/02/25 18:13:15, evanm wrote:
> > This is clever! I am not sure why I didn't do it this way originally.
> > 
> > Do the tests pass?
> 
> I couldn't get the tests to run on my Mac even with a clean trunk :-(

They probably only work on Linux for now.  You can "ssh bunny.sfo" for testing
purposes.  I would also take patches to make them more portable.  :)

(I am really scared about this breaking something.)

[Bernhard Bauer, 2011-02-28 22:23:27]

On Mon, Feb 28, 2011 at 23:16,  <evanm@google.com> wrote:
> On 2011/02/27 15:03:16, Bernhard Bauer wrote:
>>
>> On 2011/02/25 18:13:15, evanm wrote:
>> > This is clever! I am not sure why I didn't do it this way originally.
>> >
>> > Do the tests pass?
>
>> I couldn't get the tests to run on my Mac even with a clean trunk :-(
>
> They probably only work on Linux for now.  You can "ssh bunny.sfo" for
> testing
> purposes.  I would also take patches to make them more portable.  :)

http://codereview.chromium.org/6594038/ fixes some of the issues, but
it's not enough to make a whitespace change in git_cl.py pass yet on
my Mac.

> (I am really scared about this breaking something.)
>
> http://codereview.chromium.org/6575031/
>

[Bernhard Bauer, 2011-03-07 17:59:08]

It worked! At first AppEngine was asking on stdout whether to check
for updates, and by default the AppEngine output is silenced, so it
would just wait forever.

$ git cl presubmit -v
INFO:root:Popen: git update-index --refresh -q
INFO:root:Popen: git diff-index HEAD
INFO:root:Popen: git rev-parse --show-cdup
INFO:root:Popen: git config rietveld.server codereview.chromium.org
INFO:root:Popen: git config rietveld.cc chromium-reviews@chromium.org
INFO:root:Popen: git config --unset-all rietveld.tree-status-url
INFO:root:Popen: git config rietveld.viewvc-url
http://src.chromium.org/viewvc/chrome?view=rev&revision=
INFO:root:Popen: git config rietveld.server
INFO:root:Popen: git symbolic-ref HEAD
INFO:root:Popen: git config branch.reset_dcommit.merge
INFO:root:Popen: git config rietveld.upstream-branch
INFO:root:Popen: git config --get-regexp ^svn-remote\.
INFO:root:Popen: git branch -r
*** Presubmit checks for DCOMMIT would report: ***
INFO:root:Popen: git rev-parse --show-cdup
INFO:root:Popen:
/usr/local/google/home/bauerb/depot_tools/.git/hooks/pre-cl-dcommit
refs/remotes/origin/master
Running presubmit hooks...
Running tbr.sh
Running abandon.sh
Running basic.sh
Running upload-local-tracking-branch.sh
Running upload-stale.sh
Running save-description-on-failure.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running push-basic.sh
Running submit-from-new-dir.sh
Presubmit checks took 1529.4s to calculate.


On Mon, Feb 28, 2011 at 23:23, Bernhard Bauer <bauerb@chromium.org> wrote:
> On Mon, Feb 28, 2011 at 23:16,  <evanm@google.com> wrote:
>> On 2011/02/27 15:03:16, Bernhard Bauer wrote:
>>>
>>> On 2011/02/25 18:13:15, evanm wrote:
>>> > This is clever! I am not sure why I didn't do it this way originally.
>>> >
>>> > Do the tests pass?
>>
>>> I couldn't get the tests to run on my Mac even with a clean trunk :-(
>>
>> They probably only work on Linux for now.  You can "ssh bunny.sfo" for
>> testing
>> purposes.  I would also take patches to make them more portable.  :)
>
> http://codereview.chromium.org/6594038/ fixes some of the issues, but
> it's not enough to make a whitespace change in git_cl.py pass yet on
> my Mac.
>
>> (I am really scared about this breaking something.)
>>
>> http://codereview.chromium.org/6575031/
>>
>

[Evan Martin, 2011-03-07 18:05:54]

Are you saying the tests pass?  If so, LGTM

[M-A Ruel, 2011-03-08 13:46:58]

Ah crap that probably explains my failures too.

On 2011/03/07 17:59:08, Bernhard Bauer wrote:
> It worked! At first AppEngine was asking on stdout whether to check
> for updates, and by default the AppEngine output is silenced, so it
> would just wait forever.