If the destination directory doesn't contain the desired repo, delete it

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 collections
 import logging
 import os
 import posixpath
 import re
+import shlex
 import sys
 import tempfile
 import threading
 import time
 
 import gclient_utils
 import scm
 import subprocess2
 
 
@@ skipping 186 matching lines @@
       result, version = scm.GIT.AssertVersion('1.7')
       if not result:
         raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
       return result
     except OSError:
       return False
 
   def GetCheckoutRoot(self):
     return scm.GIT.GetCheckoutRoot(self.checkout_path)
 
+  def GetRemoteURL(self, options):
+    try:
+      remote_info = self._Capture(['remote', '-v'])
+    except (OSError, subprocess2.CalledProcessError):
+      return None
+    for line in remote_info.splitlines():
+      if line.startswith('origin'):
+        return shlex.split(line)[1]
+    return None

[iannucci, 2013/11/15 18:25:25]

Maybe just `git config remote.origin.url` ? Also I think there's a utility
method for getting config entries.

Sorry I didn't mention this earlier :(

[borenet, 2013/11/25 13:55:42]

I didn't see such a utility method, but I did see other uses of "git config
remote.origin.url".  Changed GetRemoteURL to use that and changed the other
instances to call GetRemoteURL.

+
   def GetRevisionDate(self, _revision):
     """Returns the given revision's date in ISO-8601 format (which contains the
     time zone)."""
     # TODO(floitsch): get the time-stamp of the given revision and not just the
     # time-stamp of the currently checked out revision.
     return self._Capture(['log', '-n', '1', '--format=%ai'])
 
   @staticmethod
   def cleanup(options, args, file_list):
     """'Cleanup' the repo.
@@ skipping 842 matching lines @@
       result, version = scm.SVN.AssertVersion('1.4')
       if not result:
         raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
       return result
     except OSError:
       return False
 
   def GetCheckoutRoot(self):
     return scm.SVN.GetCheckoutRoot(self.checkout_path)
 
+  def GetRemoteURL(self, options):
+    try:
+      if self.relpath:
+        cwd = os.path.join(self._root_dir, self.relpath)
+      else:
+        cwd = self._root_dir
+      svn_info = scm.SVN.Capture(['info', os.curdir], cwd)
+    except (OSError, subprocess2.CalledProcessError):
+      return None
+    url_prefix = 'URL: '
+    for line in svn_info.splitlines():
+      if line.startswith(url_prefix):
+        return line[len(url_prefix):].rstrip()
+    return None

[iannucci, 2013/11/15 18:25:25]

I think we should probably rely on the XML version of info. I think there's a
method which does that already (CaptureLocalInfo)

[borenet, 2013/11/25 13:55:42]

Done.

+
   def GetRevisionDate(self, revision):
     """Returns the given revision's date in ISO-8601 format (which contains the
     time zone)."""
     date = scm.SVN.Capture(
         ['propget', '--revprop', 'svn:date', '-r', revision],
         os.path.join(self.checkout_path, '.'))
     return date.strip()
 
   def cleanup(self, options, args, _file_list):
     """Cleanup working copy."""
@@ skipping 360 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