Add reviewers to optional outputs for changes

my_activity.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Get stats about your activity.
 
 Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
@@ skipping 328 matching lines @@
         issues)
     issues = sorted(issues, key=lambda i: i['modified'], reverse=True)
 
     return issues
 
   def process_rietveld_issue(self, instance, issue):
     ret = {}
     ret['owner'] = issue['owner_email']
     ret['author'] = ret['owner']
 
-    ret['reviewers'] = set(username(r) for r in issue['reviewers'])
+    ret['reviewers'] = set(issue['reviewers'])
 
     shorturl = instance['url']
     if 'shorturl' in instance:
       shorturl = instance['shorturl']
 
     ret['review_url'] = 'http://%s/%d' % (shorturl, issue['issue'])
-    ret['header'] = issue['description'].split('\n')[0]
+
+    # Rietveld sometimes has '\r\n' instead of '\n'.
+    ret['header'] = issue['description'].replace('\r', '').split('\n')[0]
 
     ret['modified'] = datetime_from_rietveld(issue['modified'])
     ret['created'] = datetime_from_rietveld(issue['created'])
     ret['replies'] = self.process_rietveld_replies(issue['messages'])
 
     return ret
 
   @staticmethod
   def process_rietveld_replies(replies):
     ret = []
@@ skipping 36 matching lines @@
     ret['review_url'] = issue['url']
     ret['header'] = issue['subject']
     ret['owner'] = issue['owner']['email']
     ret['author'] = ret['owner']
     ret['created'] = datetime.fromtimestamp(issue['createdOn'])
     ret['modified'] = datetime.fromtimestamp(issue['lastUpdated'])
     if 'comments' in issue:
       ret['replies'] = self.process_gerrit_issue_replies(issue['comments'])
     else:
       ret['replies'] = []
+    ret['reviewers'] = set()
+    for reply in ret['replies']:
+      if reply['author'] != ret['author']:
+        ret['reviewers'].add(reply['author'])
     return ret
 
   @staticmethod
   def process_gerrit_issue_replies(replies):
     ret = []
     replies = filter(lambda r: 'email' in r['reviewer'], replies)
     for reply in replies:
       r = {}
       r['author'] = reply['reviewer']['email']
       r['created'] = datetime.fromtimestamp(reply['timestamp'])
@@ skipping 168 matching lines @@
         reviewers.append(match.group(1))
       if instance['review_re']:
         match = re.match(instance['review_re'], line)
         if match:
           reviews.append(int(match.group(1)))
       if instance['change_re']:
         match = re.match(instance['change_re'], line)
         if match:
           changes.append(int(match.group(1)))
 
-    # TODO(enne): should convert full names to usernames via CommitterList.
-    ret['reviewers'] = set(reviewers)
+    committer_list = webkitpy.common.config.committers.CommitterList()
+    ret['reviewers'] = set(
+        (committer_list.contributor_by_name(r).emails[0] for r in reviewers))
 
     # Reviews more useful than change link itself, but tricky if multiple
     # Reviews == bugs for WebKit changes
     if len(reviews) == 1:
       url = 'http://%s/%d' % (instance['review_url'], reviews[0])
       if instance['review_prop']:
         ret[instance['review_prop']] = reviews[0]
     else:
       url = 'http://%s/%d' % (instance['change_url'], changes[0])
     ret['review_url'] = url
@@ skipping 90 matching lines @@
       print "Failed to import WebKit committer list, skipping WebKit checks."
       self.webkit_repo = None
       return
 
     if not webkit_account(self.user):
       email = self.user + "@chromium.org"
       print "No %s in committers.py, skipping WebKit checks." % email
       self.webkit_repo = None
 
   def print_change(self, change):
+    optional_values = {
+        'reviewers': ', '.join(change['reviewers'])
+    }
     self.print_generic(self.options.output_format,
                        self.options.output_format_changes,
                        change['header'],
                        change['review_url'],
-                       change['author'])
+                       change['author'],
+                       optional_values)
 
   def print_issue(self, issue):
     optional_values = {
         'owner': issue['owner'],
     }
     self.print_generic(self.options.output_format,
                        self.options.output_format_issues,
                        issue['header'],
                        issue['url'],
                        issue['author'],
@@ skipping 193 matching lines @@
                               'all activity types are url, title and author. '
                               'Format options for specific activity types will '
                               'override the generic format.')
   output_format_group.add_option(
       '-f', '--output-format', metavar='<format>',
       default=u'{url} {title}',
       help='Specifies the format to use when printing all your activity.')
   output_format_group.add_option(
       '--output-format-changes', metavar='<format>',
       default=None,
-      help='Specifies the format to use when printing changes.')
+      help='Specifies the format to use when printing changes. Supports the '
+      'additional variable {reviewers}')
   output_format_group.add_option(
       '--output-format-issues', metavar='<format>',
       default=None,
-      help='Specifies the format to use when printing issues. Has support '
-           'for the additional variable owner.')
+      help='Specifies the format to use when printing issues. Supports the '
+           'additional variable {owner}.')
   output_format_group.add_option(
       '--output-format-reviews', metavar='<format>',
       default=None,
       help='Specifies the format to use when printing reviews.')
   parser.add_option_group(output_format_group)
 
   # Remove description formatting
   parser.format_description = (
       lambda _: parser.description)  # pylint: disable=E1101
 
@@ skipping 56 matching lines @@
   print '\n\n\n'
 
   my_activity.print_changes()
   my_activity.print_reviews()
   my_activity.print_issues()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())