Remove a check that would break with pinned revision using ssh protocol with a user name in the url

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 104 matching lines @@
     def GetPath(self):
       return os.path.split(self.file_location)[0]
 
     def GetFilename(self):
       rev_tokens = self.file_location.split('@')
       return os.path.split(rev_tokens[0])[1]
 
     def GetRevision(self):
       rev_tokens = self.file_location.split('@')
       if len(rev_tokens) > 1:
         return rev_tokens[1]

[Peter Mayo, 2012/02/23 20:32:56]

Is this check correct if we remove the restrictions on the urls?

The url library should handle if file location comes from the right section of
it, but I don't see that right away.

[M-A Ruel, 2012/02/23 20:50:07]

In theory, yes, in practice, it's not a problem because this can only fetch from
svn repositories. And I don't care about adding svn over ssh support.

       return None
 
   class VarImpl(object):
     def __init__(self, custom_vars, local_scope):
       self._custom_vars = custom_vars
       self._local_scope = local_scope
 
     def Lookup(self, var_name):
       """Implements the Var syntax."""
       if var_name in self._custom_vars:
@@ skipping 25 matching lines @@
     self._should_process = should_process
 
     # These are only set in .gclient and not in DEPS files.
     self._custom_vars = custom_vars or {}
     self._custom_deps = custom_deps or {}
 
     # Post process the url to remove trailing slashes.
     if isinstance(self._url, basestring):
       # urls are sometime incorrectly written as proto://host/path/@rev. Replace
       # it to proto://host/path@rev.
-      if self._url.count('@') > 1:
-        raise gclient_utils.Error('Invalid url "%s"' % self._url)
       self._url = self._url.replace('/@', '@')

[Peter Mayo, 2012/02/23 20:32:56]

I think the RFC precludes using slashes in the user name in a URL, so this is
OK, but it has been too long since I last read it.

[Peter Mayo, 2012/02/23 20:49:57]

1738 section 3.1 requires encoding of the @ and / within the user.  I don't see
it precluding an empty user tho.

ssh://@foo.com:2104/funky/@dean  now get mangled, but allowed.

[M-A Ruel, 2012/02/23 20:50:07]

As long as we make sure it doesn't work, it's fine. :)

[M-A Ruel, 2012/02/23 20:51:04]

The important part is that it'll fail to sync. Which is fine with me. "Silent
corruption" would annoy me but plain failure is fine.

     elif not isinstance(self._url,
         (self.FromImpl, self.FileImpl, None.__class__)):
       raise gclient_utils.Error(
           ('dependency url must be either a string, None, '
            'File() or From() instead of %s') % self._url.__class__.__name__)
     if '/' in self._deps_file or '\\' in self._deps_file:
       raise gclient_utils.Error('deps_file name must not be a path, just a '
                                 'filename. %s' % self._deps_file)
 
   @property
@@ skipping 1356 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: