Do not check the safesync_url at all if one or more --revision flags are...

Do not check the safesync_url at all if one or more --revision flags are
specified.

BUG=49625
TEST=tests\gclient_smoketest.py runs successfully



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

[Jói, 2010-11-10 02:01:46]

Marc-Antoine, please note that I have only run the smoke tests on
Windows. Let me know if there are additional steps I should take.

Cheers,
Jói


On Tue, Nov 9, 2010 at 9:00 PM,  <joi@chromium.org> wrote:
> Reviewers: Marc-Antoine Ruel,
>
> Description:
> Do not check the safesync_url at all if one or more --revision flags are
> specified.
>
> BUG=49625
> TEST=tests\gclient_smoketest.py runs successfully
>
>
>
> Please review this at http://codereview.chromium.org/4698006/
>
> SVN Base: svn://chrome-svn/chrome/trunk/tools/depot_tools/
>
> Affected files:
>  M     gclient.py
>
>
> Index: gclient.py
> ===================================================================
> --- gclient.py  (revision 61647)
> +++ gclient.py  (working copy)
> @@ -677,17 +677,18 @@
>     revision_overrides = {}
>     if self._options.head:
>       return revision_overrides
> -    for s in self.dependencies:
> -      if not s.safesync_url:
> -        continue
> -      handle = urllib.urlopen(s.safesync_url)
> -      rev = handle.read().strip()
> -      handle.close()
> -      if len(rev):
> -        self._options.revisions.append('%s@%s' % (s.name, rev))
> +    # Do not check safesync_url if one or more --revision flag is
> specified.
>     if not self._options.revisions:
> +      for s in self.dependencies:
> +        if not s.safesync_url:
> +          continue
> +        handle = urllib.urlopen(s.safesync_url)
> +        rev = handle.read().strip()
> +        handle.close()
> +        if len(rev):
> +          self._options.revisions.append('%s@%s' % (s.name, rev))
> +    if not self._options.revisions:
>       return revision_overrides
> -    # --revision will take over safesync_url.
>     solutions_names = [s.name for s in self.dependencies]
>     index = 0
>     for revision in self._options.revisions:
> @@ -1022,7 +1023,8 @@
>                          'format src@rev. The src@ part is optional and can
> be '
>                          'skipped. -r can be used multiple times when
> .gclient '
>                          'has multiple solutions configured and will work
> even '
> -                         'if the src@ part is skipped.')
> +                         'if the src@ part is skipped. Note that specifying
> '
> +                         '--revision means your safesync_url gets
> ignored.')
>   parser.add_option('-H', '--head', action='store_true',
>                     help='skips any safesync_urls specified in '
>                          'configured solutions and sync to head instead')
>
>
>

[M-A Ruel, 2010-11-10 02:28:34]

I ran the presubmit checks on linux and they passed.

lgtm