Switch gclient config to default to unmanaged mode.

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
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 206 matching lines @@
       custom_hooks, deps_file, should_process):
     GClientKeywords.__init__(self)
 
     # These are not mutable:
     self._parent = parent
     self._deps_file = deps_file
     self._url = url
     # 'managed' determines whether or not this dependency is synced/updated by
     # gclient after gclient checks it out initially.  The difference between
     # 'managed' and 'should_process' is that the user specifies 'managed' via
-    # the --unmanaged command-line flag or a .gclient config, where
+    # the --managed command-line flag or a .gclient config, where
     # 'should_process' is dynamically set by gclient if it goes over its
     # recursion limit and controls gclient's behavior so it does not misbehave.
     self._managed = managed
     self._should_process = should_process
     # This is a mutable value which has the list of 'target_os' OSes listed in
     # the current deps file.
     self.local_target_os = None
 
     # These are only set in .gclient and not in DEPS files.
     self._custom_vars = custom_vars or {}
@@ skipping 1007 matching lines @@
 
 The .gclient file contains:
 URL: %(expected_url)s (%(expected_scm)s)
 Cache mirror: %(mirror_string)s
 
 The local checkout in %(checkout_path)s reports:
 %(actual_url)s (%(actual_scm)s)
 
 You should ensure that the URL listed in .gclient is correct and either change
 it or fix the checkout. If you're managing your own git checkout in
-%(checkout_path)s but the URL in .gclient is for an svn repository, you probably
-want to set 'managed': False in .gclient.
+%(checkout_path)s but the URL in .gclient is for an svn repository, you should
+set 'managed': False in .gclient.
 '''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
         'expected_url': dep.url,
         'expected_scm': gclient_scm.GetScmName(dep.url),
         'mirror_string' : mirror_string,
         'actual_url': actual_url,
         'actual_scm': gclient_scm.GetScmName(actual_url)})
 
   def SetConfig(self, content):
     assert not self.dependencies
     config_dict = {}
@@ skipping 26 matching lines @@
                                 'not specified')
 
     deps_to_add = []
     for s in config_dict.get('solutions', []):
       if s.get('safesync_url'):
         raise gclient_utils.Error('safesync_url is not supported anymore. '
                                   'Please remove it from your .gclient file.')
       try:
         deps_to_add.append(Dependency(
             self, s['name'], s['url'],
-            s.get('managed', True),
+            s.get('managed', False),
             s.get('custom_deps', {}),
             s.get('custom_vars', {}),
             s.get('custom_hooks', []),
             s.get('deps_file', 'DEPS'),
             True))
       except KeyError:
         raise gclient_utils.Error('Invalid .gclient file. Solution is '
                                   'incomplete: %s' % s)
     self.add_dependencies_and_close(deps_to_add, config_dict.get('hooks', []))
     logging.info('SetConfig() done')
@@ skipping 105 matching lines @@
           ('You must specify the full solution name like --revision %s@%s\n'
            'when you have multiple solutions setup in your .gclient file.\n'
            'Other solutions present are: %s.') % (
               client.dependencies[0].name,
               options.revisions[0],
               ', '.join(s.name for s in client.dependencies[1:])),
           file=sys.stderr)
     return client
 
   def SetDefaultConfig(self, solution_name, deps_file, solution_url,
-                       managed=True, cache_dir=None):
+                       managed=False, cache_dir=None):
     self.SetConfig(self.DEFAULT_CLIENT_FILE_TEXT % {
       'solution_name': solution_name,
       'solution_url': solution_url,
       'deps_file': deps_file,
       'managed': managed,
       'cache_dir': cache_dir,
     })
 
   def _SaveEntries(self):
     """Creates a .gclient_entries file to record the list of unique checkouts.
@@ skipping 28 matching lines @@
       exec(gclient_utils.FileRead(filename), scope)
     except SyntaxError as e:
       gclient_utils.SyntaxErrorToError(filename, e)
     return scope['entries']
 
   def _EnforceRevisions(self):
     """Checks for revision overrides."""
     revision_overrides = {}
     if not self._options.revisions:
       for s in self.dependencies:
-        if not s.managed and not self._options.head:
+        if not s.managed and not self._options.__dict__.get('head', False):
           self._options.revisions.append('%s@unmanaged' % s.name)
     if not self._options.revisions:
       return revision_overrides
     solutions_names = [s.name for s in self.dependencies]
     for i, revision in enumerate(self._options.revisions):
       if not '@' in revision:
         # Support for --revision 123
         name, rev = solutions_names[i], revision
       else:
         name, rev = revision.split('@', 1)
@@ skipping 365 matching lines @@
   # options.output_config_file until after the (gclientfile xor spec) error
   # check.
   parser.remove_option('--gclientfile')
   parser.add_option('--gclientfile', dest='output_config_file',
                     help='Specify an alternate .gclient file')
   parser.add_option('--name',
                     help='overrides the default name for the solution')
   parser.add_option('--deps-file', default='DEPS',
                     help='overrides the default name for the DEPS file for the'
                          'main solutions and all sub-dependencies')
-  parser.add_option('--unmanaged', action='store_true', default=False,
+  parser.add_option('--managed', action='store_true', default=False,
                     help='overrides the default behavior to make it possible '
-                         'to have the main solution untouched by gclient '
-                         '(gclient will check out unmanaged dependencies but '
-                         'will never sync them)')
+                         'to have the main solution managed by gclient '
+                         '(gclient will always auto-sync managed solutions '
+                         ' rather than leaving them untouched)')
+  parser.add_option('--unmanaged', action='store_true', default=True,
+                    help='This flag is a no-op; unmanaged is now the default.')
   parser.add_option('--cache-dir',
                     help='(git only) Cache all git repos into this dir and do '
                          'shared clones from the cache, instead of cloning '
                          'directly from the remote. (experimental)')
   parser.set_defaults(config_filename=None)
   (options, args) = parser.parse_args(args)
   if options.output_config_file:
     setattr(options, 'config_filename', getattr(options, 'output_config_file'))
   if ((options.spec and args) or len(args) > 2 or
       (not options.spec and not args)):
@@ skipping 12 matching lines @@
       # specify an alternate relpath for the given URL.
       name = options.name
       if not os.path.abspath(os.path.join(os.getcwd(), name)).startswith(
           os.getcwd()):
         parser.error('Do not pass a relative path for --name.')
       if any(x in ('..', '.', '/', '\\') for x in name.split(os.sep)):
         parser.error('Do not include relative path components in --name.')
 
     deps_file = options.deps_file
     client.SetDefaultConfig(name, deps_file, base_url,
-                            managed=not options.unmanaged,
+                            managed=options.managed,
                             cache_dir=options.cache_dir)
   client.SaveConfig()
   return 0
 
 
 @subcommand.epilog("""Example:
   gclient pack > patch.txt
     generate simple patch for configured client and dependences
 """)
 def CMDpack(parser, args):
@@ skipping 403 matching lines @@
 
 
 if '__main__' == __name__:
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)
 
 # vim: ts=2:sw=2:tw=80:et: