Add prompt for updating remote URL to git-on-borg.

Add prompt for updating remote URL to git-on-borg.

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

[M-A Ruel, 2013-01-07 19:18:11]

lgtm with nits to make it slightly shorter.

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat
File update_depot_tools.bat (right):

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat#new...
update_depot_tools.bat:41: IF "%%x" == "%GIT_URL%" (
IF not "%%x" == "%GIT_URL%" (

would work.

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat#new...
update_depot_tools.bat:46: IF errorlevel 2 (
IF not errorlevel 2 (

[szager1, 2013-01-07 19:24:57]

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat
File update_depot_tools.bat (right):

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat#new...
update_depot_tools.bat:41: IF "%%x" == "%GIT_URL%" (
On 2013/01/07 19:18:11, Marc-Antoine Ruel wrote:
> IF not "%%x" == "%GIT_URL%" (
> 
> would work.

Done.

https://codereview.chromium.org/11778024/diff/5001/update_depot_tools.bat#new...
update_depot_tools.bat:46: IF errorlevel 2 (
On 2013/01/07 19:18:11, Marc-Antoine Ruel wrote:
> IF not errorlevel 2 (

Done.

[commit-bot: I haz the power, 2013-01-07 19:26:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/szager@chromium.org/11778024/3

[commit-bot: I haz the power, 2013-01-07 19:26:04]

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 7.
  Hunk #2 FAILED at 35.
  2 out of 2 hunks 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
10b35fb909d19d07d5ed799d8393289a715a9217..f880d9b895a384c616915c6d1f4ce5bc7c063319
100644
--- a/depot_tools/update_depot_tools.bat
+++ b/depot_tools/update_depot_tools.bat
@@ -7,6 +7,8 @@
 
 setlocal
 
+set GIT_URL=https://chromium.googlesource.com/chromium/tools/depot_tools.git
+
 :: Will download svn and python.
 :: If you don't want to install the depot_tools version of these tools, remove
 :: the 'force' option on the next command. The tools will be installed only if
@@ -35,6 +37,15 @@ goto :EOF
 cd /d "%~dp0."
 call git config remote.origin.fetch > NUL
 if errorlevel 1 goto :GIT_SVN_UPDATE
+for /F %%x in ('git config --get remote.origin.url') DO (
+  IF not "%%x" == "%GIT_URL%" (
+    echo Your depot_tools checkout is configured to fetch from an obsolete URL
+    choice /N /T 60 /D N /M "Would you like to update it? [y/N]: "
+    IF not errorlevel 2 (
+      call git config remote.origin.url "%GIT_URL%"
+    )
+  )
+)
 call git fetch -q origin > NUL
 call git rebase -q origin/master > NUL
 goto :EOF

[M-A Ruel, 2013-01-07 19:29:20]

On 2013/01/07 19:26:04, 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 7.
>   Hunk #2 FAILED at 35.
>   2 out of 2 hunks FAILED -- saving rejects to file
> depot_tools/update_depot_tools.bat.rej

"patch" is craptastic. Just commit manually.