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

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 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
 #
@@ skipping 791 matching lines @@
     solutions = self.GetVar("solutions")
     if not solutions:
       raise gclient_utils.Error("No solution specified")
 
     entries = {}
     entries_deps_content = {}
 
     # Inner helper to generate base url and rev tuple (including honoring
     # |revision_overrides|)
     def GetURLAndRev(name, original_url):
-      if original_url.find("@") < 0:
+      revision, url = gclient_utils.SplitUrlRevision(original_url)
+      if not revision:
         if revision_overrides.has_key(name):
-          return (original_url, revision_overrides[name])
+          return (url, revision_overrides[name])
         else:
           scm = gclient_scm.CreateSCM(solution["url"], self._root_dir, name)
-          return (original_url, scm.revinfo(self._options, [], None))
+          return (url, scm.revinfo(self._options, [], None))
       else:
-        url_components = original_url.split("@")
         if revision_overrides.has_key(name):
-          return (url_components[0], revision_overrides[name])
+          return (url, revision_overrides[name])
         else:
-          return (url_components[0], url_components[1])
+          return (url, revision)
 
     # Run on the base solutions first.
     for solution in solutions:
       name = solution["name"]
       if name in entries:
         raise gclient_utils.Error("solution %s specified more than once" % name)
       (url, rev) = GetURLAndRev(name, solution["url"])
       entries[name] = "%s@%s" % (url, rev)
       # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset)
       entries_deps_content[name] = gclient_scm.CaptureSVN(
@@ skipping 346 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: