gclient: fix another bug where ssh urls weren't parsed correctly

gclient_scm.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 111 matching lines @@
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
 
     if args:
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
 
-    if self.url.startswith('ssh:'):
-      # Make sure ssh://test@example.com/test.git@stable works
-      regex = r"(ssh://(?:[\w]+@)?[-\w:\.]+/[-\w\.]+)(?:@([\w/]+))?"
-      components = re.search(regex, self.url).groups()
-    else:
-      components = self.url.split("@")
-    url = components[0]
-    revision = None
+    url, revision = gclient_utils.SplitUrlRevision(self.url)
+    rev_str = ""
     if options.revision:
-      revision = options.revision
-    elif len(components) == 2:
-      revision = components[1]
+      # Override the revision number.
+      revision = str(options.revision)
+    if revision:
+      url = '%s@%s' % (url, revision)
+      rev_str = ' at %s' % revision
 
     if options.verbose:
-      rev_str = ""
-      if revision:
-        rev_str = ' at %s' % revision
       print("\n_____ %s%s" % (self.relpath, rev_str))
 
     if not os.path.exists(self.checkout_path):
       self._RunGit(['clone', url, self.checkout_path],
                    cwd=self._root_dir, redirect_stdout=False)
       if revision:
         self._RunGit(['reset', '--hard', revision], redirect_stdout=False)
       files =  self._RunGit(['ls-files']).split()
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
       return
@@ skipping 103 matching lines @@
     # Only update if git is not controlling the directory.
     checkout_path = os.path.join(self._root_dir, self.relpath)
     git_path = os.path.join(self._root_dir, self.relpath, '.git')
     if os.path.exists(git_path):
       print("________ found .git directory; skipping %s" % self.relpath)
       return
 
     if args:
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
 
-    url = self.url
-    components = url.split("@")
-    revision = None
+    url, revision = gclient_utils.SplitUrlRevision(self.url)
+    base_url = url
     forced_revision = False
+    rev_str = ""
     if options.revision:
       # Override the revision number.
-      url = '%s@%s' % (components[0], str(options.revision))
-      revision = options.revision
+      revision = str(options.revision)
+    if revision:
       forced_revision = True
-    elif len(components) == 2:
-      revision = components[1]
-      forced_revision = True
-
-    rev_str = ""
-    if revision:
+      url = '%s@%s' % (url, revision)
       rev_str = ' at %s' % revision
 
     if not os.path.exists(checkout_path):
       # We need to checkout.
       command = ['checkout', url, checkout_path]
       if revision:
         command.extend(['--revision', str(revision)])
       RunSVNAndGetFileList(options, command, self._root_dir, file_list)
       return
 
     # Get the existing scm url and the revision number of the current checkout.
     from_info = CaptureSVNInfo(os.path.join(checkout_path, '.'), '.')
     if not from_info:
       raise gclient_utils.Error("Can't update/checkout %r if an unversioned "
                                 "directory is present. Delete the directory "
                                 "and try again." %
                                 checkout_path)
 
     if options.manually_grab_svn_rev:
       # Retrieve the current HEAD version because svn is slow at null updates.
       if not revision:
         from_info_live = CaptureSVNInfo(from_info['URL'], '.')
         revision = str(from_info_live['Revision'])
         rev_str = ' at %s' % revision
 
-    if from_info['URL'] != components[0]:
+    if from_info['URL'] != base_url:
       to_info = CaptureSVNInfo(url, '.')
       if not to_info.get('Repository Root') or not to_info.get('UUID'):
         # The url is invalid or the server is not accessible, it's safer to bail
         # out right now.
         raise gclient_utils.Error('This url is unreachable: %s' % url)
       can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
                     and (from_info['UUID'] == to_info['UUID']))
       if can_switch:
         print("\n_____ relocating %s to a new checkout" % self.relpath)
         # We have different roots, so check if we can switch --relocate.
@@ skipping 158 matching lines @@
           self.ReplaceAndPrint(line)
         else:
           if (line.startswith(self.original_prefix) or
               line.startswith(self.working_prefix)):
             self.ReplaceAndPrint(line)
           else:
             print line
 
     filterer = DiffFilterer(self.relpath)
     RunSVNAndFilterOutput(command, path, False, False, filterer.Filter)