| Index: gclient_utils.py
 | 
| diff --git a/gclient_utils.py b/gclient_utils.py
 | 
| index c394862f76645aaef15b9352f68a3585be422998..d082fb7e706c7e808e7de9d0a519a8c5df9a58d7 100644
 | 
| --- a/gclient_utils.py
 | 
| +++ b/gclient_utils.py
 | 
| @@ -75,7 +75,10 @@ def SplitUrlRevision(url):
 | 
|      regex = r'(ssh://(?:[-.\w]+@)?[-\w:\.]+/[-~\w\./]+)(?:@(.+))?'
 | 
|      components = re.search(regex, url).groups()
 | 
|    else:
 | 
| -    components = url.split('@', 1)
 | 
| +    components = url.rsplit('@', 1)
 | 
| +    if re.match(r'^\w+\@', url) and '@' not in components[0]:
 | 
| +      components = [url]
 | 
| +
 | 
|      if len(components) == 1:
 | 
|        components += [None]
 | 
|    return tuple(components)
 | 
| 
 |