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 # Copyright (C) 2008 Evan Martin <martine@danga.com> | 6 # Copyright (C) 2008 Evan Martin <martine@danga.com> |
7 | 7 |
8 """A git-command for integrating reviews on Rietveld and Gerrit.""" | 8 """A git-command for integrating reviews on Rietveld and Gerrit.""" |
9 | 9 |
10 from __future__ import print_function | 10 from __future__ import print_function |
(...skipping 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2611 # reverse on its side. | 2611 # reverse on its side. |
2612 refspec_opts.append('m=' + options.title.replace(' ', '_')) | 2612 refspec_opts.append('m=' + options.title.replace(' ', '_')) |
2613 | 2613 |
2614 if options.send_mail: | 2614 if options.send_mail: |
2615 if not change_desc.get_reviewers(): | 2615 if not change_desc.get_reviewers(): |
2616 DieWithError('Must specify reviewers to send email.') | 2616 DieWithError('Must specify reviewers to send email.') |
2617 refspec_opts.append('notify=ALL') | 2617 refspec_opts.append('notify=ALL') |
2618 else: | 2618 else: |
2619 refspec_opts.append('notify=NONE') | 2619 refspec_opts.append('notify=NONE') |
2620 | 2620 |
2621 cc = self.GetCCList().split(',') | |
2622 if options.cc: | |
2623 cc.extend(options.cc) | |
2624 cc = filter(None, cc) | |
2625 if cc: | |
2626 refspec_opts.extend('cc=' + email.strip() for email in cc) | |
2627 | |
2628 reviewers = change_desc.get_reviewers() | 2621 reviewers = change_desc.get_reviewers() |
2629 if reviewers: | 2622 if reviewers: |
2630 refspec_opts.extend('r=' + email.strip() for email in reviewers) | 2623 refspec_opts.extend('r=' + email.strip() for email in reviewers) |
2631 | 2624 |
2632 if options.private: | 2625 if options.private: |
2633 refspec_opts.append('draft') | 2626 refspec_opts.append('draft') |
2634 | 2627 |
2635 if options.topic: | 2628 if options.topic: |
2636 # Documentation on Gerrit topics is here: | 2629 # Documentation on Gerrit topics is here: |
2637 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#to pic | 2630 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#to pic |
(...skipping 17 matching lines...) Expand all Loading... | |
2655 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*') | 2648 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*') |
2656 change_numbers = [m.group(1) | 2649 change_numbers = [m.group(1) |
2657 for m in map(regex.match, push_stdout.splitlines()) | 2650 for m in map(regex.match, push_stdout.splitlines()) |
2658 if m] | 2651 if m] |
2659 if len(change_numbers) != 1: | 2652 if len(change_numbers) != 1: |
2660 DieWithError( | 2653 DieWithError( |
2661 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' | 2654 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' |
2662 'Change-Id: %s') % (len(change_numbers), change_id)) | 2655 'Change-Id: %s') % (len(change_numbers), change_id)) |
2663 self.SetIssue(change_numbers[0]) | 2656 self.SetIssue(change_numbers[0]) |
2664 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push) | 2657 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push) |
2658 | |
2659 # Add cc's from the CC_LIST and --cc flag (if any). | |
2660 cc = self.GetCCList().split(',') | |
2661 if options.cc: | |
2662 cc.extend(options.cc) | |
2663 cc = filter(None, [email.strip() for email in cc]) | |
tandrii(chromium)
2016/09/29 11:27:24
email.strip() is the fix.
| |
2664 if cc: | |
2665 gerrit_util.AddReviewers( | |
2666 self._GetGerritHost(), self.GetIssue(), cc, is_reviewer=False) | |
2667 | |
2665 return 0 | 2668 return 0 |
2666 | 2669 |
2667 def _AddChangeIdToCommitMessage(self, options, args): | 2670 def _AddChangeIdToCommitMessage(self, options, args): |
2668 """Re-commits using the current message, assumes the commit hook is in | 2671 """Re-commits using the current message, assumes the commit hook is in |
2669 place. | 2672 place. |
2670 """ | 2673 """ |
2671 log_desc = options.message or CreateDescriptionFromLog(args) | 2674 log_desc = options.message or CreateDescriptionFromLog(args) |
2672 git_command = ['commit', '--amend', '-m', log_desc] | 2675 git_command = ['commit', '--amend', '-m', log_desc] |
2673 RunGit(git_command) | 2676 RunGit(git_command) |
2674 new_log_desc = CreateDescriptionFromLog(args) | 2677 new_log_desc = CreateDescriptionFromLog(args) |
(...skipping 2621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5296 if __name__ == '__main__': | 5299 if __name__ == '__main__': |
5297 # These affect sys.stdout so do it outside of main() to simplify mocks in | 5300 # These affect sys.stdout so do it outside of main() to simplify mocks in |
5298 # unit testing. | 5301 # unit testing. |
5299 fix_encoding.fix_encoding() | 5302 fix_encoding.fix_encoding() |
5300 setup_color.init() | 5303 setup_color.init() |
5301 try: | 5304 try: |
5302 sys.exit(main(sys.argv[1:])) | 5305 sys.exit(main(sys.argv[1:])) |
5303 except KeyboardInterrupt: | 5306 except KeyboardInterrupt: |
5304 sys.stderr.write('interrupted\n') | 5307 sys.stderr.write('interrupted\n') |
5305 sys.exit(1) | 5308 sys.exit(1) |
OLD | NEW |