Add watchlists to 'gcl upload'...

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 597 matching lines @@
 version """ + __version__ + """
 
 Basic commands:
 -----------------------------------------
    gcl change change_name
       Add/remove files to a changelist. Only scans the current directory and
       subdirectories.
 
    gcl upload change_name [-r reviewer1@gmail.com,reviewer2@gmail.com,...]
                           [--send_mail] [--no_try] [--no_presubmit]
+                          [--no_watchlists]
       Uploads the changelist to the server for review.
 
    gcl commit change_name [--no_presubmit]
       Commits the changelist to the repository.
 
    gcl lint change_name
       Check all the files in the changelist for possible style violations.
 
 Advanced commands:
 -----------------------------------------
@@ skipping 103 matching lines @@
   return DoPresubmitChecks(change_info, committing, True)
 
 
 def UploadCL(change_info, args):
   if not change_info.FileList():
     print "Nothing to upload, changelist is empty."
     return
   if not OptionallyDoPresubmitChecks(change_info, False, args):
     return
   no_try = FilterFlag(args, "--no_try") or FilterFlag(args, "--no-try")
+  no_watchlists = FilterFlag(args, "--no_watchlists") or \
+                  FilterFlag(args, "--no-watchlists")
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
   # Supports --clobber for the try server.
   clobber = FilterFlag(args, "--clobber")
 
   # Disable try when the server is overridden.
   server_1 = re.compile(r"^-s\b.*")
@@ skipping 17 matching lines @@
 
     if not found_message:
       upload_arg.append("--message=''")
 
     upload_arg.append("--issue=%d" % change_info.issue)
   else: # First time we upload.
     handle, desc_file = tempfile.mkstemp(text=True)
     os.write(handle, change_info.description)
     os.close(handle)
 
+    # Watchlist processing -- CC people interested in this changeset
+    # http://dev.chromium.org/developers/contributing-code/watchlists
+    if not no_watchlists:
+      import watchlists
+      watchlist = watchlists.Watchlists(GetRepositoryRoot())
+      watchers = watchlist.GetWatchersForPaths(change_info.FileList())
+
     cc_list = GetCodeReviewSetting("CC_LIST")
+    if not no_watchlists and watchers:
+        # Filter out all empty elements and join by ','
+        cc_list = ','.join(filter(None, [cc_list] + watchers))
     if cc_list:
       upload_arg.append("--cc=" + cc_list)
     upload_arg.append("--description_file=" + desc_file + "")
     if change_info.description:
       subject = change_info.description[:77]
       if subject.find("\r\n") != -1:
         subject = subject[:subject.find("\r\n")]
       if subject.find("\n") != -1:
         subject = subject[:subject.find("\n")]
       if len(change_info.description) > 77:
@@ skipping 368 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())