Always add watchlists on upload

Always add watchlists on upload

Move watchlist generation out of RunHooks so that bypass-hooks
does not skip watchlists.

BUG=163406
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=185979

[Isaac (away), 2013-02-17 21:27:56]

Chase, since you added the bypass-hooks a while ago I think you are the prime
candidate to review a fix :-)

[anagy4698, 2013-02-17 21:42:36]

*kibocsátás 12295004)*RunHook:base_**branch, None?BUG=163406..:! -1371,10
+1372,9 @@,,,,,.hooks a while ago I think you are the prime!..


2013/2/17 <ilevy@chromium.org>

> Reviewers: cmp,
>
> Message:
> Chase, since you added the bypass-hooks a while ago I think you are the
> prime
> candidate to review a fix :-)
>
> Description:
> Always add watchlists on upload
>
> Move watchlist generation out of RunHooks so that bypass-hooks
> does not skip watchlists.
>
> BUG=163406
>
>
> Please review this at
https://chromiumcodereview.**appspot.com/12295004/<https://chromiumcodereview...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/tools/depot_tools<http://svn.chromium.org/chrome/trunk/tools/depot_tools>
>
> Affected files:
>   M git_cl.py
>
>
> Index: git_cl.py
> diff --git a/git_cl.py b/git_cl.py
> index e515f89b00eaed6cd09da7ee90990e**2db48b0d90..**
> fc556eaca8adcd5c28f15d38102594**f41a32be56 100755
> --- a/git_cl.py
> +++ b/git_cl.py
> @@ -695,15 +695,8 @@ or verify this branch is set up to track another (via
> the --track argument to
>          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,
> @@ -1070,9 +1063,11 @@ def CMDpresubmit(parser, args):
>      # 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
>
>
> @@ -1274,11 +1269,17 @@ def CMDupload(parser, args):
>      base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(),
> 'HEAD']).strip()
>      args = [base_branch]
>
> +  # 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:
> @@ -1371,10 +1372,9 @@ def SendUpstream(parser, args, cmd):
>        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
>
>
>
>


-- 
anagy4698@gmail.com.

[Isaac (away), 2013-02-27 05:57:21]

+maruel
cmp to cc

[M-A Ruel, 2013-02-28 18:02:01]

lgtm, it'd be nice if it were tested.

[commit-bot: I haz the power, 2013-03-04 21:54:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ilevy@chromium.org/12295004/6001

[Isaac (away), 2013-03-04 21:55:40]

Agreed tests would be nice but there's no precedent for coverage here, so I'm
going to defer for now.

[commit-bot: I haz the power, 2013-03-04 21:57:35]

Change committed as 185979