Automatically CC folks listed in CC= lines.

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 2107 matching lines @@
       # rietveld.cc only addresses which we can send private CLs to are listed
       # if rietveld.private is set, and so we should ignore rietveld.cc only
       # when --private is specified explicitly on the command line.
       if options.private:
         logging.warn('rietveld.cc is ignored since private flag is specified.  '
                      'You need to review and add them manually if necessary.')
         cc = self.GetCCListWithoutDefault()
       else:
         cc = self.GetCCList()
       cc = ','.join(filter(None, (cc, ','.join(options.cc))))
+      if change_desc.get_cced():
+        cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
       if cc:
         upload_args.extend(['--cc', cc])
 
     if options.private or settings.GetDefaultPrivateFlag() == "True":
       upload_args.append('--private')
 
     upload_args.extend(['--git_similarity', str(options.similarity)])
     if not options.find_copies:
       upload_args.extend(['--git_no_find_copies'])
 
@@ skipping 627 matching lines @@
           ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
            'Change-Id: %s') % (len(change_numbers), change_id))
       self.SetIssue(change_numbers[0])
       self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
 
     # Add cc's from the CC_LIST and --cc flag (if any).
     cc = self.GetCCList().split(',')
     if options.cc:
       cc.extend(options.cc)
     cc = filter(None, [email.strip() for email in cc])
+    if change_desc.get_cced():
+      cc.extend(change_desc.get_cced())
     if cc:
       gerrit_util.AddReviewers(
           self._GetGerritHost(), self.GetIssue(), cc, is_reviewer=False)
 
     return 0
 
   def _AddChangeIdToCommitMessage(self, options, args):
     """Re-commits using the current message, assumes the commit hook is in
     place.
     """
@@ skipping 106 matching lines @@
     else:
       yield default_bugs
   for other in sorted(others):
     # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
     yield other
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
   R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
+  CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
   BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
 
   def __init__(self, description):
     self._description_lines = (description or '').strip().splitlines()
 
   @property               # www.logilab.org/ticket/89786
   def description(self):  # pylint: disable=E0202
     return '\n'.join(self._description_lines)
 
   def set_description(self, desc):
@@ skipping 127 matching lines @@
     self._description_lines = top_lines + separator + gerrit_footers
 
   def get_reviewers(self, tbr_only=False):
     """Retrieves the list of reviewers."""
     matches = [re.match(self.R_LINE, line) for line in self._description_lines]
     reviewers = [match.group(2).strip()
                  for match in matches
                  if match and (not tbr_only or match.group(1).upper() == 'TBR')]
     return cleanup_list(reviewers)
 
+  def get_cced(self):
+    """Retrieves the list of reviewers."""
+    matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
+    cced = [match.group(2).strip() for match in matches if match]
+    return cleanup_list(cced)
+
 
 def get_approving_reviewers(props):
   """Retrieves the reviewers that approved a CL from the issue properties with
   messages.
 
   Note that the list may contain reviewers that are not committer, thus are not
   considered by the CQ.
   """
   return sorted(
       set(
@@ skipping 2356 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)