Show additional warning about managed workflow.

tools/check_git_config.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Script that attempts to push to a special git repository to verify that git
 credentials are configured correctly. It also verifies that gclient solution is
 configured to use git checkout.
 
 It will be added as gclient hook shortly before Chromium switches to git and
@@ skipping 51 matching lines @@
   'name': 'src',
   'deps_file': '.DEPS.git',
   'managed': False,
   'url': 'https://chromium.googlesource.com/chromium/src.git',
 }
 
 # Possible chunks of git push response in case .netrc is misconfigured.
 BAD_ACL_ERRORS = (
   '(prohibited by Gerrit)',
   'does not match your user account',
+  'Git repository not found',
   'Invalid user name or password',
   'Please make sure you have the correct access rights',
 )
 
 
 def is_on_bot():
   """True when running under buildbot."""
   return os.environ.get('CHROME_HEADLESS') == '1'
 
 
@@ skipping 267 matching lines @@
       push_log='\n'.join(runner.log),
       push_duration_ms=int((time.time() - started) * 1000))
   return uploaded and not flake
 
 
 def check_gclient_config(conf):
   """Shows warning if gclient solution is not properly configured for git."""
   current = {
     'name': 'src',
     'deps_file': conf['gclient_deps'],
-    'managed': conf['gclient_managed'],
+    'managed': conf['gclient_managed'] or False,
     'url': conf['gclient_url'],
   }
-  if current != GOOD_GCLIENT_SOLUTION:
+  good = GOOD_GCLIENT_SOLUTION
+  if current == good:
+    return
+  # Show big warning if url or deps_file is wrong.
+  if current['url'] != good['url'] or current['deps_file'] != good['deps_file']:

[iannucci, 2014/08/20 20:26:28]

maybe just pop out managed from both and see if the remainder compares?

[Vadim Sh., 2014/08/20 21:10:34]

I don't want to pop anything, since these dicts later presented in 'print'.

     print '-' * 80
     print 'Your gclient solution is not set to use supported git workflow!'
     print
     print 'Your \'src\' solution (in %s):' % GCLIENT_CONFIG
     print pprint.pformat(current, indent=2)
     print
     print 'Correct \'src\' solution to use git:'
-    print pprint.pformat(GOOD_GCLIENT_SOLUTION, indent=2)
+    print pprint.pformat(good, indent=2)
     print
     print 'Please update your .gclient file ASAP.'
     print '-' * 80
+  # Show smaller (additional) warning about managed workflow.
+  if current['managed']:
+    print '-' * 80
+    print 'You are using deprecated managed gclient mode.'

[iannucci, 2014/08/20 20:26:28]

let's find the ML discussion where we announced that it was deprecated, and
include the date.

[Vadim Sh., 2014/08/20 21:10:34]

https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/n9N5N3JL2_U

8/22/13

+    print
+    print (
+        'It is strongly advised to switch to unmanaged mode. For more '
+        'information about managed mode and reasons for its deprecation see:')
+    print 'http://www.chromium.org/developers/how-tos/get-the-code#Managed_mode'
+    print '-' * 80
 
 
 def upload_report(
     conf, report_url, verbose, push_works, push_log, push_duration_ms):
   """Posts report to the server, returns True if server accepted it.
 
   Uploads the report only if script is running in Google corp network. Otherwise
   just prints the report.
   """
   report = conf.copy()
@@ skipping 95 matching lines @@
       write_last_configuration(config)
     else:
       logging.warning('Check failed and will be retried on the next run')
   except Exception:
     logging.exception('Unexpected exception when performing git access check')
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))