Indicate when depot_tools can't be updated on Windows.

Indicate when depot_tools can't be updated on Windows.

When depot_tools fail to update right now all you get is
    Cannot rebase: You have unstaged changes.
    Please commit or stash them.
As that is typically in a call to gclient it's far from obvious what
could not be updated so add a line saying
    Failed to update depot_tools.
to that. Linux and Mac already have a similar error message in their
script file.

BUG=
R=szager@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226002

[Daniel Bratell, 2013-09-16 15:02:45]

This should be a simple oneliner that ought to save some support (I've seen
people ask about this error message).

[Daniel Bratell, 2013-09-16 15:03:40]

On 2013/09/16 15:02:45, Daniel Bratell wrote:
> This should be a simple oneliner that ought to save some support (I've seen
> people ask about this error message).

Btw, git cl said:

Missing OWNER reviewers for these files:
    update_depot_tools.bat

Suggested OWNERS:
    szager@chromium.org

which is why I set szager1 as reviewer here.

[szager1, 2013-09-16 15:57:25]

lgtm, thanks for taking care of this.

[commit-bot: I haz the power, 2013-09-16 16:32:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bratell@opera.com/23619058/1

[commit-bot: I haz the power, 2013-09-16 16:32:28]

Failed to apply patch for depot_tools/update_depot_tools.bat:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file depot_tools/update_depot_tools.bat
  Hunk #1 FAILED at 60.
  1 out of 1 hunk FAILED -- saving rejects to file
depot_tools/update_depot_tools.bat.rej

Patch:       depot_tools/update_depot_tools.bat
Index: update_depot_tools.bat
diff --git depot_tools/update_depot_tools.bat depot_tools/update_depot_tools.bat
index
20ac0d7cd45bf214220a1eca40708e7f4cc9358a..58d3d849738edef1d9c4280add83ab79c7a872f0
100644
--- a/depot_tools/update_depot_tools.bat
+++ b/depot_tools/update_depot_tools.bat
@@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO (
 )
 call git fetch -q origin > NUL
 call git rebase -q origin/master > NUL
+if errorlevel 1 echo Failed to update depot_tools.
+
 goto :EOF
 
 :GIT_SVN_UPDATE

[commit-bot: I haz the power, 2013-09-16 16:45:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bratell@opera.com/23619058/7001

[commit-bot: I haz the power, 2013-09-16 16:45:24]

Failed to apply patch for depot_tools/update_depot_tools.bat:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file depot_tools/update_depot_tools.bat
  Hunk #1 FAILED at 60.
  1 out of 1 hunk FAILED -- saving rejects to file
depot_tools/update_depot_tools.bat.rej

Patch:       depot_tools/update_depot_tools.bat
Index: update_depot_tools.bat
diff --git depot_tools/update_depot_tools.bat depot_tools/update_depot_tools.bat
index
20ac0d7cd45bf214220a1eca40708e7f4cc9358a..58d3d849738edef1d9c4280add83ab79c7a872f0
100644
--- a/depot_tools/update_depot_tools.bat
+++ b/depot_tools/update_depot_tools.bat
@@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO (
 )
 call git fetch -q origin > NUL
 call git rebase -q origin/master > NUL
+if errorlevel 1 echo Failed to update depot_tools.
+
 goto :EOF
 
 :GIT_SVN_UPDATE

[szager1, 2013-09-16 16:58:20]

On 2013/09/16 16:45:24, I haz the power (commit-bot) wrote:
> Failed to apply patch for depot_tools/update_depot_tools.bat:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file depot_tools/update_depot_tools.bat
>   Hunk #1 FAILED at 60.
>   1 out of 1 hunk FAILED -- saving rejects to file
> depot_tools/update_depot_tools.bat.rej

This is most likely a CRLF issue.  Feel free to dcommit this.

Stefan

[Daniel Bratell, 2013-09-16 17:01:22]

On 2013/09/16 16:58:20, szager1 wrote:
> On 2013/09/16 16:45:24, I haz the power (commit-bot) wrote:
> > Failed to apply patch for depot_tools/update_depot_tools.bat:
> > While running patch -p1 --forward --force --no-backup-if-mismatch;
> >   patching file depot_tools/update_depot_tools.bat
> >   Hunk #1 FAILED at 60.
> >   1 out of 1 hunk FAILED -- saving rejects to file
> > depot_tools/update_depot_tools.bat.rej
> 
> This is most likely a CRLF issue.  Feel free to dcommit this.

My account is still read-only so I'm not able to (and I've been ok with using cq
anyway).

Can you help me with the commit?

/Daniel

[Daniel Bratell, 2013-09-18 18:22:36]

> On 2013/09/16 16:58:20, szager1 wrote:
> > This is most likely a CRLF issue.  Feel free to dcommit this.

szager1, as I only have read-only access, can you please help me with the
commit?

/Daniel

[commit-bot: I haz the power, 2013-09-30 17:28:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bratell@opera.com/23619058/7001

[commit-bot: I haz the power, 2013-09-30 17:28:21]

Failed to apply patch for depot_tools/update_depot_tools.bat:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file depot_tools/update_depot_tools.bat
  Hunk #1 FAILED at 60.
  1 out of 1 hunk FAILED -- saving rejects to file
depot_tools/update_depot_tools.bat.rej

Patch:       depot_tools/update_depot_tools.bat
Index: update_depot_tools.bat
diff --git depot_tools/update_depot_tools.bat depot_tools/update_depot_tools.bat
index
20ac0d7cd45bf214220a1eca40708e7f4cc9358a..58d3d849738edef1d9c4280add83ab79c7a872f0
100644
--- a/depot_tools/update_depot_tools.bat
+++ b/depot_tools/update_depot_tools.bat
@@ -60,6 +60,8 @@ for /F %%x in ('git config --get remote.origin.url') DO (
 )
 call git fetch -q origin > NUL
 call git rebase -q origin/master > NUL
+if errorlevel 1 echo Failed to update depot_tools.
+
 goto :EOF
 
 :GIT_SVN_UPDATE

[szager1, 2013-09-30 17:32:54]

Committed patchset #2 manually as r226002.

[Daniel Bratell, 2013-09-30 19:00:44]

On 2013/09/30 17:32:54, szager1 wrote:
> Committed patchset #2 manually as r226002.

Thanks!

Did you see anything that might explain why CQ failed?

[szager, 2013-09-30 19:41:05]

On Mon, Sep 30, 2013 at 12:00 PM, <bratell@opera.com> wrote:

> On 2013/09/30 17:32:54, szager1 wrote:
>
>> Committed patchset #2 manually as r226002.
>>
>
> Thanks!
>
> Did you see anything that might explain why CQ failed?
>

Patching always seems to fail for dos-style files, due to CRLF issues.

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.