Add --no-merges to roll_dep.py

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.
 """
@@ skipping 97 matching lines @@
   print('Found new revision %s' % roll_to)
 
   if roll_to == head:
     raise Error('No revision to roll!')
 
   commit_range = '%s..%s' % (head[:9], roll_to[:9])
 
   upstream_url = check_output(
       ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
   log_url = get_log_url(upstream_url, head, roll_to)
+  cmd = [
+    'git', 'log', commit_range, '--date=short', '--no-merges',
+  ]
   logs = check_output(
-      ['git', 'log', commit_range, '--date=short', '--format=%ad %ae %s'],
+      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.

[Johann, 2015/10/07 18:20:11]

so this is kind of messy because for --arg=<string> check_output automatically
quotes <string>. if it's quoted in the cmd definition above, then the output
looks like this:
'2015-10-01 marpan@chromium.org Add first_spatial_layer_to_encode to SVC.'

with the extra '' around the entire string (and breaking the regex below to
strip the @ part of the email)

[M-A Ruel, 2015/10/07 18:43:11]

IIRC, it works with "" but not ''. Please confirm.

       cwd=full_dir)
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)

[Johann, 2015/10/07 18:20:11]

a potential fix is to rework the regex to remove the outside quotes in addition
to stripping the @ part of the email.

   nb_commits = logs.count('\n')
 
   header = 'Roll %s/ %s (%d commit%s).\n\n' % (
       deps_dir,
       commit_range,
       nb_commits,
       's' if nb_commits > 1 else '')
 
   log_section = ''
   if log_url:
     log_section = log_url + '\n\n'
-  log_section += '$ git log %s --date=short --format=\'%%ad %%ae %%s\'\n' % (
-      commit_range)
+  log_section += '$ %s ' % ' '.join(cmd)
+  log_section += '--format=\'%ad %ae %s\'\n'

[Johann, 2015/10/07 18:20:11]

without the quotes above, the command printed is $ git log 7d28d12ef..ce3f4ade6
--date=short --no-merges --format=%ad %ae %s

and copy-pasting it breaks before the --format= string is not quoted.

   if not no_log and should_show_log(upstream_url):
     if logs.count('\n') > log_limit:
       # Keep the first N log entries.
       logs = ''.join(logs.splitlines(True)[:log_limit]) + '(...)\n'
     log_section += logs
   log_section += '\n'
 
   reviewer = 'R=%s\n' % ','.join(reviewers) if reviewers else ''
   bug = 'BUG=%s\n' % bug if bug else ''
   msg = header + log_section + reviewer + bug
@@ skipping 60 matching lines @@
 
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())