roll_dep: support multiple -r/--reviewer arguments

Currently multiple reviewers can only be provided with a comma-separated
list, for example: -r foo,bar,baz

This CL adds support for multiple -r arguments such as:

-r foo -r bar -r baz

Or even:

-r foo,bar -r baz

This makes it consistent (and thus less confusing) with `git cl upload` which does accept multiple -r arguments.

Bug: none
Change-Id: I27d03601b488c0c5b27568d86dcb4ed66df6b76f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3863675
Commit-Queue: Thiago Perrotta <[email protected]>
Reviewed-by: Aravind Vasudevan <[email protected]>
Auto-Submit: Thiago Perrotta <[email protected]>

Author: Thiago Perrotta

roll_dep.py

@@ -12,6 +12,7 @@
 from __future__ import print_function
 
 import argparse
+import itertools
 import os
 import re
 import subprocess2
@@ -200,9 +201,13 @@ def main():
       '--ignore-dirty-tree', action='store_true',
       help='Roll anyways, even if there is a diff.')
   parser.add_argument(
-      '-r', '--reviewer',
-      help='To specify multiple reviewers, use comma separated list, e.g. '
-           '-r joe,jane,john. Defaults to @chromium.org')
+      '-r',
+      '--reviewer',
+      action='append',
+      help=
+      'To specify multiple reviewers, either use a comma separated list, e.g. '
+      '-r joe,jane,john or provide the flag multiple times, e.g. '
+      '-r joe -r jane. Defaults to @chromium.org')
   parser.add_argument('-b', '--bug', help='Associate a bug number to the roll')
   # It is important that --no-log continues to work, as it is used by
   # internal -> external rollers. Please do not remove or break it.
@@ -230,7 +235,7 @@ def main():
           'Can\'t use multiple paths to roll simultaneously and --key')
   reviewers = None
   if args.reviewer:
-    reviewers = args.reviewer.split(',')
+    reviewers = list(itertools.chain(*[r.split(',') for r in args.reviewer]))
     for i, r in enumerate(reviewers):
       if not '@' in r:
         reviewers[i] = r + '@chromium.org'

tests/roll_dep_test.py

@@ -114,6 +114,22 @@ def testRollsDep(self):
     self.assertIn(expected_message, stdout)
     self.assertIn(expected_message, commit_message)
 
+  def testRollsDepReviewers(self):
+    if not self.enabled:
+      return
+
+    stdout, stderr, returncode = self.call([
+        ROLL_DEP, 'src/foo', '-r', '[email protected]', '-r',
+        '[email protected],[email protected]'
+    ])
+
+    self.assertEqual(stderr, '')
+    self.assertEqual(returncode, 0)
+
+    expected_message = '[email protected],[email protected],[email protected]'
+
+    self.assertIn(expected_message, stdout)
+
   def testRollsDepToSpecificRevision(self):
     if not self.enabled:
       return