Use a regex instead of shlex.split() to get remote url

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."""
 
 from __future__ import print_function
 
 import errno
 import logging
 import os
 import posixpath
 import re
-import shlex
 import sys
 import tempfile
 import traceback
 import urlparse
 
 import download_from_google_storage
 import gclient_utils
 import git_cache
 import scm
 import shutil
@@ skipping 129 matching lines @@
       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, options):
     """Attempt to determine the remote URL for this SCMWrapper."""
+    def _get_first_remote_url(checkout_path):
+      log = scm.GIT.Capture(
+          ['config', '--local', '--get-regexp', r'remote.*.url'],
+          cwd=checkout_path)
+      return re.search(r'^remote\..*\.url (.*)$', log).group(1)

[iannucci, 2014/08/22 16:59:00]

I think this could just be

log.splitlines()[0].split(' ', 1)[1]

(split lines, split first line on space once, take the right half)

+
     # Git
     if os.path.exists(os.path.join(self.checkout_path, '.git')):
-      actual_remote_url = shlex.split(scm.GIT.Capture(
-          ['config', '--local', '--get-regexp', r'remote.*.url'],
-          cwd=self.checkout_path))[1]
+      actual_remote_url = _get_first_remote_url(self.checkout_path)
 
       # If a cache_dir is used, obtain the actual remote URL from the cache.
       if getattr(self, 'cache_dir', None):
         url, _ = gclient_utils.SplitUrlRevision(self.url)
         mirror = git_cache.Mirror(url)
         if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
             actual_remote_url.replace('\\', '/')):
-          actual_remote_url = shlex.split(scm.GIT.Capture(
-              ['config', '--local', '--get-regexp', r'remote.*.url'],
-              cwd=mirror.mirror_path))[1]
+          actual_remote_url = _get_first_remote_url(mirror.mirror_path)
       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, options):
     """Determine whether the remote URL of this checkout is the expected URL."""
     if not os.path.exists(self.checkout_path):
@@ skipping 1383 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