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

gclient_utils.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,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 import errno
 import os
+import re
 import stat
 import subprocess
 import sys
 import time
 import xml.dom.minidom
 import xml.parsers.expat
 
 ## Generic utils
 
 
+def SplitUrlRevision(url):
+  """Splits url and returns a two-tuple: url, rev"""
+  if url.startswith('ssh:'):
+    # Make sure ssh://test@example.com/test.git@stable works
+    regex = r"(ssh://(?:[\w]+@)?[-\w:\.]+/[-\w\.]+)(?:@([\w/]+))?"
+    components = re.search(regex, url).groups()
+  else:
+    components = url.split("@")
+    if len(components) == 1:
+      components += [None]
+  return tuple(components)
+
+
 def ParseXML(output):
   try:
     return xml.dom.minidom.parseString(output)
   except xml.parsers.expat.ExpatError:
     return None
 
 
 def GetNamedNodeText(node, node_name):
   child_nodes = node.getElementsByTagName(node_name)
   if not child_nodes:
@@ skipping 207 matching lines @@
     raise Error(msg)
 
 
 def IsUsingGit(root, paths):
   """Returns True if we're using git to manage any of our checkouts.
   |entries| is a list of paths to check."""
   for path in paths:
     if os.path.exists(os.path.join(root, path, '.git')):
       return True
   return False