Add --no-merges to roll_dep.py

Add --no-merges to roll_dep.py

Print only the most interesting commit messages.

R=maruel@chromium.org

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

[Johann, 2015-10-07 16:46:13]

Before:
https://codereview.chromium.org/1392983002
$ git log 7d28d12ef..ce3f4ade6 --date=short --format='%ad %ae %s'
2015-10-06 debargha Merge "SSSE3 optimisation for quantize in high bit depth"
2015-10-01 marpan Add first_spatial_layer_to_encode to SVC.
2015-10-06 juliamrobson SSSE3 optimisation for quantize in high bit depth
2015-10-06 slavarnway Merge "VPX: refactor vpx_idct32x32_1_add_sse2()"
2015-10-06 rsbultje Merge "vp10: extend range for delta Q values."
2015-09-30 rsbultje vp10: extend range for delta Q values.
2015-10-05 jackychen Add the check of resolution in VP9 dynamic resizing.
2015-10-02 juliamrobson SSE2 optimisation for quantize in high bit depth
2015-10-05 marpan Merge "Fix to denoiser with dynamic resize."
2015-10-05 marpan Merge "Stabilize the encoder buffer from going too negative."
2015-10-05 slavarnway VPX: refactor vpx_idct32x32_1_add_sse2()
2015-10-02 jackychen Turn on two-steps scaling in VP9 encoder dynamic resizing.
2015-10-01 marpan Fix to denoiser with dynamic resize.
2015-09-30 marpan Stabilize the encoder buffer from going too negative.
2015-09-30 rsbultje vp10: make render_width/height referenceable through ref
frames.
2015-10-02 rsbultje Merge "vp10: reimplement d45/4x4 to match vp8 instead of
vp9."
2015-10-02 debargha Merge "Accelerated transform in high bit depth"
2015-10-02 marpan Merge "Two-steps scaling in VP9 encoder dynamic resizing."
2015-10-01 jackychen Two-steps scaling in VP9 encoder dynamic resizing.
2015-10-01 huisu Small cleanup
(...)

after
$ git log 7d28d12ef..ce3f4ade6 --date=short --format='%ad %ae %s'
    2015-10-01 marpan Add first_spatial_layer_to_encode to SVC.
    2015-10-06 juliamrobson SSSE3 optimisation for quantize in high bit depth
    2015-09-30 rsbultje vp10: extend range for delta Q values.
    2015-10-05 jackychen Add the check of resolution in VP9 dynamic resizing.
    2015-10-02 juliamrobson SSE2 optimisation for quantize in high bit depth
    2015-10-05 slavarnway VPX: refactor vpx_idct32x32_1_add_sse2()
    2015-10-02 jackychen Turn on two-steps scaling in VP9 encoder dynamic
resizing.
    2015-10-01 marpan Fix to denoiser with dynamic resize.
    2015-09-30 marpan Stabilize the encoder buffer from going too negative.
    2015-09-30 rsbultje vp10: make render_width/height referenceable through ref
frames.
    2015-10-01 jackychen Two-steps scaling in VP9 encoder dynamic resizing.
    2015-10-01 huisu Small cleanup
    2015-09-30 rsbultje vp10: reimplement d45/4x4 to match vp8 instead of vp9.
    2015-10-01 rsbultje vp8: align left pixel array by 16 bytes.
    2015-09-30 rsbultje vp8: change build_intra4x4_predictors() to use vpx_dsp.
    2015-09-30 rsbultje vp8: change build_intra_predictors_mbuv_s to use
vpx_dsp.
    2015-09-30 rsbultje vp8: change build_intra_predictors_mby_s to use vpx_dsp.
    2015-09-29 slavarnway VP9: remove plane_type from macroblockd_plane
    2015-09-29 jzern vp9_loopfilter: remove unnecessary masks
    2015-09-29 jzern test/*.h: (windows) fix min/max conflict
    (...)

The second message prints 8 more useful messages than the first by omitting the
"Merge "<same exact commit message>"" entris.

[Johann, 2015-10-07 16:54:22]

On 2015/10/07 16:46:13, Johann wrote:
> Before:
> https://codereview.chromium.org/1392983002
> $ git log 7d28d12ef..ce3f4ade6 --date=short --format='%ad %ae %s'

 $ git log 7d28d12ef..ce3f4ade6 --date=short --format='%ad %ae %s' --no-merges

[nodir, 2015-10-07 17:08:07]

nodir@chromium.org changed reviewers:
+ maruel@chromium.org

[nodir, 2015-10-07 17:08:08]

+maruel seems to be a better person for reviewing this.

[M-A Ruel, 2015-10-07 17:13:03]

lgtm

https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py
File roll_dep.py (right):

https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py#newcode118
roll_dep.py:118: logs = check_output(
Let's do instead:
cmd = [
  'git', 'log', commit_range, '--date=short', '--format=%ad %ae %s',
'--no-merges',
]

then

log_section += '$ %s\n' % ' '.join(cmd)

[Johann, 2015-10-07 17:34:59]

On 2015/10/07 17:13:03, M-A Ruel wrote:
> lgtm
> 
> https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py
> File roll_dep.py (right):
> 
> https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py#newcode118
> roll_dep.py:118: logs = check_output(
> Let's do instead:
> cmd = [
>   'git', 'log', commit_range, '--date=short', '--format=%ad %ae %s',
> '--no-merges',
> ]
> 
> then
> 
> log_section += '$ %s\n' % ' '.join(cmd)

ahh, yeah once i uploaded the first patch and noticed i needed to do it in two
places i started thinking about using a single string, but i don't know python
that well

[Johann, 2015-10-07 17:36:12]

On 2015/10/07 17:34:59, Johann wrote:
> On 2015/10/07 17:13:03, M-A Ruel wrote:
> > lgtm
> > 
> > https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py
> > File roll_dep.py (right):
> > 
> > https://codereview.chromium.org/1390073005/diff/20001/roll_dep.py#newcode118
> > roll_dep.py:118: logs = check_output(
> > Let's do instead:
> > cmd = [
> >   'git', 'log', commit_range, '--date=short', '--format=%ad %ae %s',
> > '--no-merges',
> > ]
> > 
> > then
> > 
> > log_section += '$ %s\n' % ' '.join(cmd)
> 
> ahh, yeah once i uploaded the first patch and noticed i needed to do it in two
> places i started thinking about using a single string, but i don't know python
> that well

but i'm passing the format string wrong. stand by.

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

comments please

I can:
-go back to patch 2, with distinct strings
-use the current patch, sharing as much of the string as possible
-rework the regex to fix the output quoting

any favorites among those, or alternatives?

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py
File roll_dep.py (left):

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py#oldcode121
roll_dep.py:121: logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$',
r'\1\2', logs)
a potential fix is to rework the regex to remove the outside quotes in addition
to stripping the @ part of the email.

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py
File roll_dep.py (right):

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py#newcode122
roll_dep.py:122: cmd + ['--format=%ad %ae %s'], # Args with '=' are
automatically quoted.
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)

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py#newcode137
roll_dep.py:137: log_section += '--format=\'%ad %ae %s\'\n'
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.

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

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py
File roll_dep.py (right):

https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py#newcode122
roll_dep.py:122: cmd + ['--format=%ad %ae %s'], # Args with '=' are
automatically quoted.
On 2015/10/07 18:20:11, Johann wrote:
> 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 mailto: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)

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

[Johann, 2015-10-07 18:49:26]

On 2015/10/07 18:43:11, M-A Ruel wrote:
> https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py
> File roll_dep.py (right):
> 
> https://codereview.chromium.org/1390073005/diff/60001/roll_dep.py#newcode122
> roll_dep.py:122: cmd + ['--format=%ad %ae %s'], # Args with '=' are
> automatically quoted.
> On 2015/10/07 18:20:11, Johann wrote:
> > 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 mailto: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)
> 
> IIRC, it works with "" but not ''. Please confirm.

With:
-    'git', 'log', commit_range, '--date=short', '--no-merges',
+    'git', 'log', commit_range, '--date=short', '--format="%ad %ae %s"',
+    '--no-merges',
   ]
   logs = check_output(
-      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
+      cmd,
       cwd=full_dir)

I get output that is double quoted:

$ git log 7d28d12ef..ce3f4ade6 --date=short --format="%ad %ae %s" --no-merges
"2015-10-01 marpan@chromium.org Add first_spatial_layer_to_encode to SVC."

[Johann, 2015-10-07 18:51:20]

> > IIRC, it works with "" but not ''. Please confirm.
> 
> With:
> -    'git', 'log', commit_range, '--date=short', '--no-merges',
> +    'git', 'log', commit_range, '--date=short', '--format="%ad %ae %s"',

And the same quoted output if the " are escaped with \" here

> +    '--no-merges',
>    ]
>    logs = check_output(
> -      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically
quoted.
> +      cmd,
>        cwd=full_dir)
> 
> I get output that is double quoted:
> 
> $ git log 7d28d12ef..ce3f4ade6 --date=short --format="%ad %ae %s" --no-merges
> "2015-10-01 mailto:marpan@chromium.org Add first_spatial_layer_to_encode to
SVC."

[M-A Ruel, 2015-10-07 18:53:03]

Ok oh well, lgtm

[Johann, 2015-10-07 19:08:44]

The CQ bit was checked by johannkoenig@google.com

[commit-bot: I haz the power, 2015-10-07 19:08:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1390073005/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1390073005/60001

[commit-bot: I haz the power, 2015-10-07 19:11:19]

Committed patchset #4 (id:60001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=297050