Index: tools/check_git_config.py |
diff --git a/tools/check_git_config.py b/tools/check_git_config.py |
index f343ff2359d91034c508a195b0a13e2d862b2287..912e2a1df14acd6d41e309932e7469813000b354 100755 |
--- a/tools/check_git_config.py |
+++ b/tools/check_git_config.py |
@@ -69,6 +69,7 @@ GOOD_GCLIENT_SOLUTION = { |
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', |
) |
@@ -356,10 +357,14 @@ def check_gclient_config(conf): |
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 th
Vadim Sh.
2014/08/20 21:10:34
I don't want to pop anything, since these dicts la
|
print '-' * 80 |
print 'Your gclient solution is not set to use supported git workflow!' |
@@ -367,10 +372,20 @@ def check_gclient_config(conf): |
print pprint.pformat(current, indent=2) |
print 'Correct \'src\' solution to use git:' |
- print pprint.pformat(GOOD_GCLIENT_SOLUTION, indent=2) |
+ print pprint.pformat(good, indent=2) |
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 th
Vadim Sh.
2014/08/20 21:10:34
https://groups.google.com/a/chromium.org/forum/#!t
|
+ 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( |