Revert of roll_dep: Avoid large commit messages by providing the log as a link

roll_dep.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Rolls DEPS controlled dependency.
 
 Works only with git checkout and git dependencies.  Currently this
 script will always roll to the tip of to origin/master.
 """
 
 import argparse
 import os
 import re
 import subprocess
 import sys
 
 NEED_SHELL = sys.platform.startswith('win')
 
-GITILES_REGEX = r'https?://[^/]*\.googlesource\.com/'
-
 
 class Error(Exception):
   pass
 
 
 def check_output(*args, **kwargs):
   """subprocess.check_output() passing shell=True on Windows for git."""
   kwargs.setdefault('shell', NEED_SHELL)
   return subprocess.check_output(*args, **kwargs)
 
@@ skipping 49 matching lines @@
 
   check_call(['git', 'fetch', 'origin'], cwd=full_dir)
   master = check_output(
       ['git', 'rev-parse', 'origin/master'], cwd=full_dir).strip()
   print('Found new revision %s' % master)
 
   if master == head:
     raise Error('No revision to roll!')
 
   commit_range = '%s..%s' % (head[:9], master[:9])
-  upstream_url = check_output(
-      ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
 
-  log_url = None
-  if re.match(GITILES_REGEX, upstream_url):
-    log_url = '%s/+log/%s..%s' % (upstream_url, head, master)
-
-  msg_args = {
-      'deps_dir': deps_dir,
-      'commit_range': commit_range,
-      'log': '%s\n\n' % log_url if log_url else '',
-      'reviewer': 'R=%s\n' % ','.join(reviewers) if reviewers else '',
-      'bug': 'BUG=%s\n' % bug if bug else '',
-  }
+  logs = check_output(
+      ['git', 'log', commit_range, '--date=short', '--format=%ad %ae %s'],
+      cwd=full_dir).strip()
+  logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
+  cmd = 'git log %s --date=short --format=\'%%ad %%ae %%s\'' % commit_range
+  reviewer = 'R=%s\n' % ','.join(reviewers) if reviewers else ''
+  bug = 'BUG=%s\n' % bug if bug else ''
   msg = (
-      'Roll %(deps_dir)s %(commit_range)s\n'
+      'Roll %s/ to %s.\n'
       '\n'
-      '%(log)s'
-      '%(reviewer)s'
-      '%(bug)s' % msg_args)
+      '$ %s\n'
+      '%s\n\n'
+      '%s'
+      '%s') % (
+          deps_dir,
+          master,
+          cmd,
+          logs,
+          reviewer,
+          bug)
 
   print('Commit message:')
   print('\n'.join('    ' + i for i in msg.splitlines()))
   deps_content = deps_content.replace(head, master)
   with open(deps, 'wb') as f:
     f.write(deps_content)
   check_call(['git', 'add', 'DEPS'], cwd=root)
   check_call(['git', 'commit', '-m', msg], cwd=root)
   print('')
   if not reviewers:
@@ skipping 32 matching lines @@
 
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())