gclient: Fix cache_dir functionality

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 122 matching lines @@
 
     if not command in commands:
       raise gclient_utils.Error('Unknown command %s' % command)
 
     if not command in dir(self):
       raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
           command, self.__class__.__name__))
 
     return getattr(self, command)(options, args, file_list)
 
-  def GetActualRemoteURL(self):
+  def GetActualRemoteURL(self, options):
     """Attempt to determine the remote URL for this SCMWrapper."""
+    # Git
     if os.path.exists(os.path.join(self.checkout_path, '.git')):
-      return shlex.split(scm.GIT.Capture(
+      actual_remote_url = shlex.split(scm.GIT.Capture(
           ['config', '--local', '--get-regexp', r'remote.*.url'],
           self.checkout_path))[1]
+
+      # If a cache_dir is used, obtain the actual remote URL from the cache.
+      if hasattr(self, 'cache_dir') and self.cache_dir:

[iannucci, 2014/04/08 17:29:36]

if getattr(self, 'cache_dir', None):

[borenet, 2014/04/08 18:42:13]

Done.

+        try:
+          full_cache_dir = self._Run(['cache', 'exists', '--cache-dir',

[iannucci, 2014/04/08 17:29:36]

Note that there seems to be flakiness when invoking git subcommands this way on
windows. We're looking into it.

+                                      self.cache_dir, self.url],
+                                     options, cwd=self._root_dir).strip()
+        except subprocess2.CalledProcessError:
+          full_cache_dir = None
+        if full_cache_dir == actual_remote_url:

[iannucci, 2014/04/08 17:29:36]

I'm not sure if this will work well on windows.

[borenet, 2014/04/08 19:23:42]

Used .replace('\\', '/')

+          actual_remote_url = shlex.split(scm.GIT.Capture(
+              ['config', '--local', '--get-regexp', r'remote.*.url'],
+              os.path.join(self._root_dir, full_cache_dir)))[1]
+      return actual_remote_url
+
+    # Svn
     if os.path.exists(os.path.join(self.checkout_path, '.svn')):
       return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
     return None
 
-  def DoesRemoteURLMatch(self):
+  def DoesRemoteURLMatch(self, options):
     """Determine whether the remote URL of this checkout is the expected URL."""
     if not os.path.exists(self.checkout_path):
       # A checkout which doesn't exist can't be broken.
       return True
 
-    actual_remote_url = self.GetActualRemoteURL()
+    actual_remote_url = self.GetActualRemoteURL(options)
     if actual_remote_url:
       return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
               == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
     else:
       # This may occur if the self.checkout_path exists but does not contain a
       # valid git or svn checkout.
       return False
 
 
 class GitWrapper(SCMWrapper):
@@ skipping 1256 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