OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 """\ | 6 """\ |
7 Wrapper script around Rietveld's upload.py that simplifies working with groups | 7 Wrapper script around Rietveld's upload.py that simplifies working with groups |
8 of files. | 8 of files. |
9 """ | 9 """ |
10 | 10 |
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 import watchlists | 889 import watchlists |
890 watchlist = watchlists.Watchlists(change_info.GetLocalRoot()) | 890 watchlist = watchlists.Watchlists(change_info.GetLocalRoot()) |
891 watchers = watchlist.GetWatchersForPaths(change_info.GetFileNames()) | 891 watchers = watchlist.GetWatchersForPaths(change_info.GetFileNames()) |
892 | 892 |
893 # We check this before applying the "PRIVATE" parameter of codereview | 893 # We check this before applying the "PRIVATE" parameter of codereview |
894 # settings assuming that the author of the settings file has put | 894 # settings assuming that the author of the settings file has put |
895 # addresses which we can send private CLs to, and so we should ignore | 895 # addresses which we can send private CLs to, and so we should ignore |
896 # CC_LIST only when --private is specified explicitly on the command | 896 # CC_LIST only when --private is specified explicitly on the command |
897 # line. | 897 # line. |
898 if "--private" in upload_arg: | 898 if "--private" in upload_arg: |
899 Warn("WARNING: CC_LIST is ignored since private flag is specified. " | 899 Warn("WARNING: CC_LIST and WATCHLISTS are ignored when --private is " |
900 "You need to review and add them manually if necessary.") | 900 "specified. You need to review and add them manually if " |
| 901 "necessary.") |
901 cc_list = "" | 902 cc_list = "" |
| 903 no_watchlists = True |
902 else: | 904 else: |
903 cc_list = GetCodeReviewSetting("CC_LIST") | 905 cc_list = GetCodeReviewSetting("CC_LIST") |
904 if not no_watchlists and watchers: | 906 if not no_watchlists and watchers: |
905 # Filter out all empty elements and join by ',' | 907 # Filter out all empty elements and join by ',' |
906 cc_list = ','.join(filter(None, [cc_list] + watchers)) | 908 cc_list = ','.join(filter(None, [cc_list] + watchers)) |
907 if cc_list: | 909 if cc_list: |
908 upload_arg.append("--cc=" + cc_list) | 910 upload_arg.append("--cc=" + cc_list) |
909 upload_arg.append("--file=%s" % desc_file) | 911 upload_arg.append("--file=%s" % desc_file) |
910 | 912 |
911 if GetCodeReviewSetting("PRIVATE") == "True": | 913 if GetCodeReviewSetting("PRIVATE") == "True": |
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1496 raise | 1498 raise |
1497 print >> sys.stderr, ( | 1499 print >> sys.stderr, ( |
1498 'AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' | 1500 'AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' |
1499 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)) | 1501 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)) |
1500 return 1 | 1502 return 1 |
1501 | 1503 |
1502 | 1504 |
1503 if __name__ == "__main__": | 1505 if __name__ == "__main__": |
1504 fix_encoding.fix_encoding() | 1506 fix_encoding.fix_encoding() |
1505 sys.exit(main(sys.argv[1:])) | 1507 sys.exit(main(sys.argv[1:])) |
OLD | NEW |