Don't store rietveld.extracc in git config.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 import errno
@@ skipping 177 matching lines @@
                                                    error_ok=True))
       if error_ok:
         return self.default_server
       if not self.default_server:
         error_message = ('Could not find settings file. You must configure '
                          'your review setup by running "git cl config".')
         self.default_server = FixUrl(self._GetConfig(
             'rietveld.server', error_message=error_message))
     return self.default_server
 
-  def GetCCList(self):
-    """Return the users cc'd on this CL.
-
-    Return is a string suitable for passing to gcl with the --cc flag.
-    """
-    if self.cc is None:
-      base_cc = self._GetConfig('rietveld.cc', error_ok=True)
-      more_cc = self._GetConfig('rietveld.extracc', error_ok=True)
-      self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
-    return self.cc
-
   def GetRoot(self):
     if not self.root:
       self.root = os.path.abspath(RunGit(['rev-parse', '--show-cdup']).strip())
     return self.root
 
   def GetIsGitSvn(self):
     """Return true if this repo looks like it's using git-svn."""
     if self.is_git_svn is None:
       # If you have any "svn-remote.*" config keys, we think you're using svn.
       self.is_git_svn = RunGitWithCode(
@@ skipping 69 matching lines @@
       self.tree_status_url = self._GetConfig('rietveld.tree-status-url',
                                              error_ok=error_ok,
                                              error_message=error_message)
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
       self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
+  def GetDefaultCCList(self):
+    return self._GetConfig('rietveld.cc', error_ok=True)
+
   def _GetConfig(self, param, **kwargs):
     self.LazyUpdateIfNeeded()
     return RunGit(['config', param], **kwargs).strip()
 
 
 settings = Settings()
 
 
 did_migrate_check = False
 def CheckForMigration():
@@ skipping 39 matching lines @@
       self.branch = None
     self.rietveld_server = None
     self.upstream_branch = None
     self.has_issue = False
     self.issue = None
     self.has_description = False
     self.description = None
     self.has_patchset = False
     self.patchset = None
     self._rpc_server = None
+    self.cc = None
+    self.watchers = ()
+
+  def GetCCList(self):
+    """Return the users cc'd on this CL.
+
+    Return is a string suitable for passing to gcl with the --cc flag.
+    """
+    if self.cc is None:
+      base_cc = settings  .GetDefaultCCList()
+      more_cc = ','.join(self.watchers)
+      self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
+    return self.cc
+
+  def SetWatchers(self, watchers):
+    """Set the list of email addresses that should be cc'd based on the changed
+       files in this CL.
+    """
+    self.watchers = watchers
 
   def GetBranch(self):
     """Returns the short branch name, e.g. 'master'."""
     if not self.branch:
       self.branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
       self.branch = ShortBranchName(self.branchref)
     return self.branch
 
   def GetBranchRef(self):
     """Returns the full branch name, e.g. 'refs/heads/master'."""
@@ skipping 182 matching lines @@
   def SetProperty(initial, caption, name):
     prompt = caption
     if initial:
       prompt += ' ("x" to clear) [%s]' % initial
     new_val = ask_for_data(prompt + ':')
     if new_val == 'x':
       RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
     elif new_val and new_val != initial:
       RunGit(['config', 'rietveld.' + name, new_val])
 
-  SetProperty(settings.GetCCList(), 'CC list', 'cc')
+  SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc')
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url')
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url')
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
@@ skipping 253 matching lines @@
     # with these log messages.
     description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
                               '%s...' % (upstream_branch)]).strip()
   change = presubmit_support.GitChange(name, description, absroot, files,
                                        issue, patchset)
 
   # Apply watchlists on upload.
   if not committing:
     watchlist = watchlists.Watchlists(change.RepositoryRoot())
     files = [f.LocalPath() for f in change.AffectedFiles()]
-    watchers = watchlist.GetWatchersForPaths(files)
-    RunCommand(['git', 'config', '--replace-all',
-                'rietveld.extracc', ','.join(watchers)])
+    cl.SetWatchers(watchlist.GetWatchersForPaths(files))
 
   output = presubmit_support.DoPresubmitChecks(change, committing,
       verbose=False, output_stream=sys.stdout, input_stream=sys.stdin,
       default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
       host_url=cl.GetRietveldServer())
 
   # TODO(dpranke): We should propagate the error out instead of calling exit().
   if not output.should_continue():
     sys.exit(1)
 
@@ skipping 108 matching lines @@
       change_desc.Update()
 
     if change_desc.IsEmpty():
       print "Description is empty; aborting."
       return 1
 
     upload_args.extend(['--message', change_desc.subject])
     upload_args.extend(['--description', change_desc.description])
     if change_desc.reviewers:
       upload_args.extend(['--reviewers', change_desc.reviewers])
-    cc = ','.join(filter(None, (settings.GetCCList(), options.cc)))
+    cc = ','.join(filter(None, (cl.GetCCList(), options.cc)))
     if cc:
       upload_args.extend(['--cc', cc])
 
   # Include the upstream repo's URL in the change -- this is useful for
   # projects that have their source spread across multiple repos.
   remote_url = None
   if settings.GetIsGitSvn():
     # URL is dependent on the current directory.
     data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
     if data:
@@ skipping 449 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))