Always add watchlists on upload

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."""
 
 import json
@@ skipping 677 matching lines @@
       author = RunGit(['config', 'user.email']).strip() or None
     return presubmit_support.GitChange(
         name,
         description,
         absroot,
         files,
         issue,
         patchset,
         author)
 
-  def RunHook(self, committing, upstream_branch, may_prompt, verbose, author):
+  def RunHook(self, committing, may_prompt, verbose, change):
     """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
-    change = self.GetChange(upstream_branch, author)
-
-    # Apply watchlists on upload.
-    if not committing:
-      watchlist = watchlists.Watchlists(change.RepositoryRoot())
-      files = [f.LocalPath() for f in change.AffectedFiles()]
-      self.SetWatchers(watchlist.GetWatchersForPaths(files))
 
     try:
       return presubmit_support.DoPresubmitChecks(change, committing,
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self.RpcServer())
     except presubmit_support.PresubmitFailure, e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
@@ skipping 346 matching lines @@
     print 'use --force to check even if tree is dirty.'
     return 1
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the common ancestor of the upstream branch.
     base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
 
-  cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
-             may_prompt=False, verbose=options.verbose,
-             author=None)
+  cl.RunHook(
+      committing=not options.upload,
+      may_prompt=False,
+      verbose=options.verbose,
+      change=cl.GetChange(base_branch, None))
   return 0
 
 
 def AddChangeIdToCommitMessage(options, args):
   """Re-commits using the current message, assumes the commit hook is in
   place.
   """
   log_desc = options.message or CreateDescriptionFromLog(args)
   git_command = ['commit', '--amend', '-m', log_desc]
   RunGit(git_command)
@@ skipping 181 matching lines @@
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
   else:
     # Default to diffing against common ancestor of upstream branch
     base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
     args = [base_branch, 'HEAD']
 
+  # Apply watchlists on upload.
+  change = cl.GetChange(base_branch, None)
+  watchlist = watchlists.Watchlists(change.RepositoryRoot())
+  files = [f.LocalPath() for f in change.AffectedFiles()]
+  cl.SetWatchers(watchlist.GetWatchersForPaths(files))
+
   if not options.bypass_hooks:
-    hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
+    hook_results = cl.RunHook(committing=False,
                               may_prompt=not options.force,
                               verbose=options.verbose,
-                              author=None)
+                              change=change)
     if not hook_results.should_continue():
       return 1
     if not options.reviewers and hook_results.reviewers:
       options.reviewers = hook_results.reviewers
 
   print_stats(options.similarity, options.find_copies, args)
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)
   return RietveldUpload(options, args, cl)
 
@@ skipping 72 matching lines @@
              'before attempting to %s.' % (base_branch, cmd))
       return 1
 
   base_branch = RunGit(['merge-base', base_branch, 'HEAD']).strip()
   if not options.bypass_hooks:
     author = None
     if options.contributor:
       author = re.search(r'\<(.*)\>', options.contributor).group(1)
     hook_results = cl.RunHook(
         committing=True,
-        upstream_branch=base_branch,
         may_prompt=not options.force,
         verbose=options.verbose,
-        author=author)
+        change=cl.GetChange(base_branch, author))
     if not hook_results.should_continue():
       return 1
 
     if cmd == 'dcommit':
       # Check the tree status if the tree status URL is set.
       status = GetTreeStatus()
       if 'closed' == status:
         print('The tree is closed.  Please wait for it to reopen. Use '
               '"git cl dcommit --bypass-hooks" to commit on a closed tree.')
         return 1
@@ skipping 495 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:]))