Added extra error message to trychange for empty diffs

Added extra error message to trychange for empty diffs


BUG=


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

[hinoka, 2012-10-02 20:22:22]

I ran into this issue earlier today, trying to submit and empty try job and
couldn't figure out why it didn't go through.

[cmp, 2012-10-02 20:53:56]

lgtm

[commit-bot: I haz the power, 2012-10-02 21:03:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hinoka@chromium.org/11046004/1

[commit-bot: I haz the power, 2012-10-02 21:06:57]

Change committed as 159765

[M-A Ruel, 2012-10-02 21:07:29]

I thought empty diff worked?
Le 2 oct. 2012 16:22, <hinoka@chromium.org> a écrit :

> Reviewers: Marc-Antoine Ruel, Nicolas Sylvain,
>
> Message:
> I ran into this issue earlier today, trying to submit and empty try job and
> couldn't figure out why it didn't go through.
>
> Description:
> Added extra error message to trychange for empty diffs
>
>
> BUG=
>
>
> Please review this at
http://codereview.chromium.**org/11046004/<http://codereview.chromium.org/110...
>
> SVN Base: https://git.chromium.org/**chromium/tools/depot_tools.**
> git@master<https://git.chromium.org/chromium/tools/depot_tools.git@master>
>
> Affected files:
>   M trychange.py
>
>
> Index: trychange.py
> diff --git a/trychange.py b/trychange.py
> index 73c81ee543f482f0723bdb5662540e**9a0362d839..**
> a1403526e502d0d992b3f6fd9879cf**3c1b60979b 100755
> --- a/trychange.py
> +++ b/trychange.py
> @@ -777,6 +777,7 @@ def TryChange(argv,
>        for checkout in checkouts:
>          raw_diff = checkout.GenerateDiff()
>          if not raw_diff:
> +          logging.error('Empty or non-existant diff, exiting.')
>            return 1
>          diff = raw_diff.splitlines(True)
>          path_diff = gclient_utils.PathDifference(**root,
> checkout.checkout_root)
>
>
>

[Ryan Tseng, 2012-10-02 21:09:25]

It didn't seem to work for me, i ran "git try", and checkout.GenerateDiff()
returned what appeared to be an empty string.


On Tue, Oct 2, 2012 at 2:07 PM, Marc-Antoine Ruel <maruel@chromium.org>wrote:

> I thought empty diff worked?
> Le 2 oct. 2012 16:22, <hinoka@chromium.org> a écrit :
>
> Reviewers: Marc-Antoine Ruel, Nicolas Sylvain,
>>
>> Message:
>> I ran into this issue earlier today, trying to submit and empty try job
>> and
>> couldn't figure out why it didn't go through.
>>
>> Description:
>> Added extra error message to trychange for empty diffs
>>
>>
>> BUG=
>>
>>
>> Please review this at
http://codereview.chromium.**org/11046004/<http://codereview.chromium.org/110...
>>
>> SVN Base: https://git.chromium.org/**chromium/tools/depot_tools.**
>> git@master<https://git.chromium.org/chromium/tools/depot_tools.git@master>
>>
>> Affected files:
>>   M trychange.py
>>
>>
>> Index: trychange.py
>> diff --git a/trychange.py b/trychange.py
>> index 73c81ee543f482f0723bdb5662540e**9a0362d839..**
>> a1403526e502d0d992b3f6fd9879cf**3c1b60979b 100755
>> --- a/trychange.py
>> +++ b/trychange.py
>> @@ -777,6 +777,7 @@ def TryChange(argv,
>>        for checkout in checkouts:
>>          raw_diff = checkout.GenerateDiff()
>>          if not raw_diff:
>> +          logging.error('Empty or non-existant diff, exiting.')
>>            return 1
>>          diff = raw_diff.splitlines(True)
>>          path_diff = gclient_utils.PathDifference(**root,
>> checkout.checkout_root)
>>
>>
>>

[M-A Ruel, 2012-10-03 15:11:18]

On 2012/10/02 21:09:25, Ryan T. wrote:
> It didn't seem to work for me, i ran "git try", and checkout.GenerateDiff()
> returned what appeared to be an empty string.

I don't understand, what "didn't seem to work". Did you have a proper diff to
generate?

[Ryan Tseng, 2012-10-03 17:04:01]

In a fresh git checkout of the source tree, I ran "git try -b
linux_rel_alt", and that command exited with no error message (making it
kind of cryptic), but a return code of 1.  Checking the linux_rel_alt bot,
the try job didn't get sent to the master either.

I later realized that because it was a fresh checkout and I didn't make any
changes, running trychange.py produced an empty diff, which a part of the
code choked on and exited with an error.  This change just adds an error
message when it reaches that same condition before exiting.  I didn't know
if that was intentional or not.


On Wed, Oct 3, 2012 at 8:11 AM, <maruel@chromium.org> wrote:

> On 2012/10/02 21:09:25, Ryan T. wrote:
>
>> It didn't seem to work for me, i ran "git try", and
>> checkout.GenerateDiff()
>> returned what appeared to be an empty string.
>>
>
> I don't understand, what "didn't seem to work". Did you have a proper diff
> to
> generate?
>
>
http://codereview.chromium.**org/11046004/<http://codereview.chromium.org/110...
>