Skip updating remotes if we already have the upstream revision.

gclient_scm.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 335 matching lines @@
       upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
       if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
         current_type = "hash"
         logging.debug("Current branch is not tracking an upstream (remote)"
                       " branch.")
       elif upstream_branch.startswith('refs/remotes'):
         current_type = "branch"
       else:
         raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
 
-    # Update the remotes first so we have all the refs.
-    backoff_time = 5
-    for _ in range(10):
-      try:
-        remote_output = scm.GIT.Capture(
-            ['remote'] + verbose + ['update'],
-            cwd=self.checkout_path)
-        break
-      except subprocess2.CalledProcessError, e:
-        # Hackish but at that point, git is known to work so just checking for
-        # 502 in stderr should be fine.
-        if '502' in e.stderr:
-          print(str(e))
-          print('Sleeping %.1f seconds and retrying...' % backoff_time)
-          time.sleep(backoff_time)
-          backoff_time *= 1.3
-          continue
-        raise
+    if not scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=revision):
+      # Update the remotes first so we have all the refs.
+      backoff_time = 5
+      for _ in range(10):
+        try:
+          remote_output = scm.GIT.Capture(
+              ['remote'] + verbose + ['update'],
+              cwd=self.checkout_path)
+          break
+        except subprocess2.CalledProcessError, e:
+          # Hackish but at that point, git is known to work so just checking for
+          # 502 in stderr should be fine.
+          if '502' in e.stderr:
+            print(str(e))
+            print('Sleeping %.1f seconds and retrying...' % backoff_time)
+            time.sleep(backoff_time)
+            backoff_time *= 1.3
+            continue
+          raise
 
-    if verbose:
-      print(remote_output.strip())
+      if verbose:
+        print(remote_output.strip())
 
     # This is a big hammer, debatable if it should even be here...
     if options.force or options.reset:
       self._Run(['reset', '--hard', 'HEAD'], options)
 
     if current_type == 'detached':
       # case 0
       self._CheckClean(rev_str)
       self._CheckDetachedHead(rev_str, options)
       self._Capture(['checkout', '--quiet', '%s' % revision])
@@ skipping 806 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command