diagnose_bloat.py: fix broken --subrepo.

tools/binary_size/diagnose_bloat.py

 #!/usr/bin/env python
 # Copyright 2017 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.
 
 """Tool for finding the cause of binary size bloat.
 
 See //tools/binary_size/README.md for example usage.
 
 Note: this tool will perform gclient sync/git checkout on your local repo if
@@ skipping 501 matching lines @@
       rebased_tool_prefix = os.path.join(_SRC_ROOT, tool_prefix)
       if os.path.exists(rebased_tool_prefix + 'readelf'):
         return rebased_tool_prefix
       tool_prefix = tool_prefix[tool_prefix.find(os.path.sep) + 1:]
   return ''
 
 
 def _SyncAndBuild(archive, build, subrepo):
   """Sync, build and return non 0 if any commands failed."""
   # Simply do a checkout if subrepo is used.
+  retcode = 0
   if subrepo != _SRC_ROOT:
     _GitCmd(['checkout',  archive.rev], subrepo)
-    return 0
   else:
     # Move to a detached state since gclient sync doesn't work with local
     # commits on a branch.
     _GitCmd(['checkout', '--detach'], subrepo)
     logging.info('Syncing to %s', archive.rev)
-    return _GclientSyncCmd(archive.rev, subrepo) or build.Run()
+    retcode = _GclientSyncCmd(archive.rev, subrepo)
+  return retcode or build.Run()
 
 
 def _GenerateRevList(rev, reference_rev, all_in_range, subrepo):
   """Normalize and optionally generate a list of commits in the given range.
 
   Returns:
     A list of revisions ordered from oldest to newest.
   """
   rev_seq = '%s^..%s' % (reference_rev, rev)
   stdout = _GitCmd(['rev-list', rev_seq], subrepo)
   all_revs = stdout.splitlines()[::-1]
   if all_in_range:
     revs = all_revs
   else:
     revs = [all_revs[0], all_revs[-1]]
   if len(revs) >= _COMMIT_COUNT_WARN_THRESHOLD:
     _VerifyUserAccepts(
-        'You\'ve provided a commit range that contains %d commits' % len(revs))
+        'You\'ve provided a commit range that contains %d commits.' % len(revs))
   return revs
 
 
 def _ValidateRevs(rev, reference_rev, subrepo):
   def git_fatal(args, message):
     devnull = open(os.devnull, 'wb')
     retcode = subprocess.call(
         ['git', '-C', subrepo] + args, stdout=devnull, stderr=subprocess.STDOUT)
     if retcode:
       _Die(message)
 
   if rev == reference_rev:
     _Die('rev and reference-rev cannot be equal')
   no_obj_message = ('%s either doesn\'t exist or your local repo is out of '
                     'date, try "git fetch origin master"')
   git_fatal(['cat-file', '-e', rev], no_obj_message % rev)
   git_fatal(['cat-file', '-e', reference_rev], no_obj_message % reference_rev)
   git_fatal(['merge-base', '--is-ancestor', reference_rev, rev],
             'reference-rev is newer than rev')
   return rev, reference_rev
 
 
 def _VerifyUserAccepts(message):
-  print message + 'Do you want to proceed? [y/n]'
+  print message + ' Do you want to proceed? [y/n]'
   if raw_input('> ').lower() != 'y':
     sys.exit()
 
 
 def _EnsureDirectoryClean(subrepo):
   logging.info('Checking source directory')
   stdout = _GitCmd(['status', '--porcelain'], subrepo)
   # Ignore untracked files.
   if stdout and stdout[:2] != '??':
     logging.error('Failure: please ensure working directory is clean.')
@@ skipping 171 matching lines @@
   logging.basicConfig(level=log_level,
                       format='%(levelname).1s %(relativeCreated)6d %(message)s')
   build = _BuildHelper(args)
   if build.IsCloud() and args.subrepo:
       parser.error('--subrepo doesn\'t work with --cloud')
 
   subrepo = args.subrepo or _SRC_ROOT
   _EnsureDirectoryClean(subrepo)
   _SetRestoreFunc(subrepo)
   if build.IsLinux():
-    _VerifyUserAccepts('Linux diffs have known deficiencies (crbug/717550). ')
+    _VerifyUserAccepts('Linux diffs have known deficiencies (crbug/717550).')
 
   rev, reference_rev = _ValidateRevs(
       args.rev, args.reference_rev or args.rev + '^', subrepo)
   revs = _GenerateRevList(rev, reference_rev, args.all, subrepo)
   with _TmpCopyBinarySizeDir() as supersize_path:
     diffs = [NativeDiff(build.size_name, supersize_path)]
     if build.IsAndroid():
       diffs +=  [
           ResourceSizesDiff(
               build.apk_name, slow_options=args.include_slow_options)
@@ skipping 26 matching lines @@
 
       if i != 0:
         diff_mngr.MaybeDiff(i - 1, i)
 
     diff_mngr.Summarize()
 
 
 if __name__ == '__main__':
   sys.exit(main())