[bootstraps] Sync at gclient, suppress output (#2)

Have the "update_depot_tools" script also do a CIPD tool sync. This will
ensure that users and systems have access to tooling at sync-time rather
than just-in-time loading them at execution time.

Update the tool boostraps to suppress any sort of syncing logs, if it
does happen. This will ensure that users who execute the tools don't see
unexpected output.

BUG=chromium:748651
TEST=local
  - Tested on Mac and Windows.

Change-Id: I1aad897d885a07beeac40a372a658681720efd2a
Reviewed-on: https://chromium-review.googlesource.com/591229
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

.gitattributes

@@ -9,7 +9,7 @@
 /*.py  recipes
 /*.sh  recipes
 
-# Extensionless tools we want
+# Extensionless tools we want and support scripts.
 /apply_issue                  recipes
 /clang*                       recipes
 /depot-tools-auth             recipes

led

@@ -7,6 +7,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup
+cipd_bin_setup &> /dev/null
 
 exec "$MYPATH/.cipd_bin/led" "$@"

led.bat

@@ -3,5 +3,5 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-call "%~dp0\cipd_bin_setup.bat"
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\led.exe" %*

tests/gclient_smoketest.py

@@ -179,6 +179,10 @@ class GClientSmoke(GClientSmokeBase):
     self.check(res, self.gclient(['update']))
 
   def testConfig(self):
+    # Get any bootstrapping out of the way.
+    results = self.gclient(['version'])
+    self.assertEquals(results[2], 0)
+
     p = join(self.root_dir, '.gclient')
     def test(cmd, expected):
       if os.path.exists(p):

update_depot_tools

@@ -112,11 +112,17 @@ function update_git_repo {
 }
 
 # Update git checkouts.
-if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
-then
-  cd $base_dir
-  update_git_repo
-  cd - > /dev/null
+if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
+  if [ -e "$base_dir/.git" ]; then
+    cd $base_dir
+    update_git_repo
+    cd - > /dev/null
+  fi
+
+  # Sync CIPD and CIPD client tools.
+  source "$base_dir/cipd_bin_setup.sh"
+  cipd_bin_setup
+
+  find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
 fi
 
-find "$base_dir" -iname "*.pyc" -exec rm -f {} \;

update_depot_tools.bat

@@ -52,5 +52,10 @@ 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
+if errorlevel 1 (
+  echo Failed to update depot_tools.
+  goto :EOF
+)
+
+:: Sync CIPD and CIPD client tools.
+call "%~dp0\cipd_bin_setup.bat"

vpython

@@ -7,6 +7,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup
+cipd_bin_setup &> /dev/null
 
 exec "$MYPATH/.cipd_bin/vpython" "$@"

vpython.bat

@@ -3,5 +3,5 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-call "%~dp0\cipd_bin_setup.bat"
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
 "%~dp0\.cipd_bin\vpython.exe" %*