| 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 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 re.DOTALL).match(output).group(1) | 1068 re.DOTALL).match(output).group(1) |
| 1069 viewvc_url = GetCodeReviewSetting('VIEW_VC') | 1069 viewvc_url = GetCodeReviewSetting('VIEW_VC') |
| 1070 if viewvc_url and revision: | 1070 if viewvc_url and revision: |
| 1071 change_info.append_footer('Committed: ' + viewvc_url + revision) | 1071 change_info.append_footer('Committed: ' + viewvc_url + revision) |
| 1072 elif revision: | 1072 elif revision: |
| 1073 change_info.append_footer('Committed: ' + revision) | 1073 change_info.append_footer('Committed: ' + revision) |
| 1074 change_info.CloseIssue() | 1074 change_info.CloseIssue() |
| 1075 props = change_info.RpcServer().get_issue_properties( | 1075 props = change_info.RpcServer().get_issue_properties( |
| 1076 change_info.issue, False) | 1076 change_info.issue, False) |
| 1077 patch_num = len(props['patchsets']) | 1077 patch_num = len(props['patchsets']) |
| 1078 comment = "Committed patchset #%d manually as r%s" % (patch_num, revision) | 1078 comment = "Committed patchset #%d (id:%d) manually as r%s" % ( |
| 1079 patch_num, props['patchsets'][-1], revision) |
| 1079 if bypassed: | 1080 if bypassed: |
| 1080 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.' | 1081 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.' |
| 1081 else: | 1082 else: |
| 1082 comment += ' (presubmit successful).' | 1083 comment += ' (presubmit successful).' |
| 1083 change_info.AddComment(comment) | 1084 change_info.AddComment(comment) |
| 1084 return 0 | 1085 return 0 |
| 1085 | 1086 |
| 1086 | 1087 |
| 1087 def CMDchange(args): | 1088 def CMDchange(args): |
| 1088 """Creates or edits a changelist. | 1089 """Creates or edits a changelist. |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1504 raise | 1505 raise |
| 1505 print >> sys.stderr, ( | 1506 print >> sys.stderr, ( |
| 1506 'AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' | 1507 'AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' |
| 1507 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)) | 1508 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)) |
| 1508 return 1 | 1509 return 1 |
| 1509 | 1510 |
| 1510 | 1511 |
| 1511 if __name__ == "__main__": | 1512 if __name__ == "__main__": |
| 1512 fix_encoding.fix_encoding() | 1513 fix_encoding.fix_encoding() |
| 1513 sys.exit(main(sys.argv[1:])) | 1514 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |