gclient: fix bug where ssh urls with a username weren't parse 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 107 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))
 
-    components = self.url.split("@")
+    if self.url.startswith('ssh:'):
+      # Make sure ssh://test@example.com/test.git@stable works
+      regex = "(ssh://(?:[\w]+@)?[-\w:\.]+/[-\w\.]+)(?:@([\w/]+))?"

[M-A Ruel, 2009/11/07 19:29:40]

Doesn't the regex work with svn url? If so, no need for the condition.

[M-A Ruel, 2009/11/09 16:39:24]

You need to use r"" btw.

+      components = re.search(regex, self.url).groups()
+    else:
+      components = self.url.split("@")
     url = components[0]
     revision = None
     if options.revision:
       revision = options.revision
     elif len(components) == 2:
       revision = components[1]
 
     if options.verbose:
       rev_str = ""
       if revision:
@@ skipping 645 matching lines @@
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         # Col 4
         if wc_status[0].getAttribute('switched') == 'true':
           statuses[4] = 'S'
         # TODO(maruel): Col 5 and 6
         item = (''.join(statuses), file)
         results.append(item)
   return results