Fix stats output to be always the same and coherent with what is committed.

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 117 matching lines @@
   # Parse specs like "trunk/src:refs/remotes/origin/trunk".
   if fetch_suburl:
     full_url = base_url + '/' + fetch_suburl
   else:
     full_url = base_url
   if full_url == url:
     return as_ref
   return None
 
 
+def print_stats(args):
+  """Prints statistics about the change to the user."""
+  # --no-ext-diff is broken in some versions of Git, so try to work around
+  # this by overriding the environment (but there is still a problem if the
+  # git config key "diff.external" is used).
+  env = os.environ.copy()
+  if 'GIT_EXTERNAL_DIFF' in env:
+    del env['GIT_EXTERNAL_DIFF']
+  return subprocess2.call(
+      ['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder'] + args,
+      env=env)
+
+
 class Settings(object):
   def __init__(self):
     self.default_server = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
     self.updated = False
@@ skipping 971 matching lines @@
   if not options.bypass_hooks:
     hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
                               may_prompt=not options.force,
                               verbose=options.verbose,
                               author=None)
     if not hook_results.should_continue():
       return 1
     if not options.reviewers and hook_results.reviewers:
       options.reviewers = hook_results.reviewers
 
-  # --no-ext-diff is broken in some versions of Git, so try to work around
-  # this by overriding the environment (but there is still a problem if the
-  # git config key "diff.external" is used).
-  env = os.environ.copy()
-  if 'GIT_EXTERNAL_DIFF' in env:
-    del env['GIT_EXTERNAL_DIFF']
-  subprocess2.call(
-      ['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder'] + args,
-      env=env)
-
+  print_stats(args)
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)
   return RietveldUpload(options, args, cl)
 
 
 def IsSubmoduleMergeCommit(ref):
   # When submodules are added to the repo, we expect there to be a single
   # non-git-svn merge commit at remote HEAD with a signature comment.
   pattern = '^SVN changes up to revision [0-9]*$'
   cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
@@ skipping 109 matching lines @@
 
   if cl.GetIssue():
     description += "\n\nReview URL: %s" % cl.GetIssueURL()
 
   if options.contributor:
     description += "\nPatch from %s." % options.contributor
   print 'Description:', repr(description)
 
   branches = [base_branch, cl.GetBranchRef()]
   if not options.force:
-    subprocess2.call(['git', 'diff', '--stat'] + branches)
+    print_stats(branches)
     ask_for_data('About to commit; enter to confirm.')
 
   # We want to squash all this branch's commits into one commit with the proper
   # description. We do this by doing a "reset --soft" to the base branch (which
   # keeps the working copy the same), then dcommitting that.  If origin/master
   # has a submodule merge commit, we'll also need to cherry-pick the squashed
   # commit onto a branch based on the git-svn head.
   MERGE_BRANCH = 'git-cl-commit'
   CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
   # Delete the branches if they exist.
@@ skipping 321 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:]))