commit 0ec9d15571fb274b817e3f0336a78bfd35b75e50
author Andrii Shyshkalov <tandrii@chromium.org> Thu Aug 23 00:22:58 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Aug 23 00:22:58 2018 +0000
tree 034e3127df481df479f584a8603b679076019e2b
parent cc5f17eedcde98b1cde5bba3e3c00942bfee2aeb

git cl: use project~number on Gerrit for better routing when setting reviewers

R=ehmaldonado@chromium.org

Testing
  patched my own depot_tools in $PATH and uploaded
  https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1186072
  which set reviewers and ccs as expected.

Bug: 876910
Change-Id: I43c0f2284941cf703133bb51132226d4a0472d8e
Reviewed-on: https://chromium-review.googlesource.com/1186068
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 3bc4495..524ec14 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1311,25 +1311,25 @@
            'https://chromium.googlesource.com/yyy/zzz'),
       ]
 
-    calls += [
-        ((['git', 'push',
-           'https://chromium.googlesource.com/yyy/zzz',
-           ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
-         ('remote:\n'
-         'remote: Processing changes: (\)\n'
-         'remote: Processing changes: (|)\n'
-         'remote: Processing changes: (/)\n'
-         'remote: Processing changes: (-)\n'
-         'remote: Processing changes: new: 1 (/)\n'
-         'remote: Processing changes: new: 1, done\n'
-         'remote:\n'
-         'remote: New Changes:\n'
-         'remote:   https://chromium-review.googlesource.com/#/c/foo/+/123456 '
-             'XXX\n'
-         'remote:\n'
-         'To https://chromium.googlesource.com/yyy/zzz\n'
-         ' * [new branch]      hhhh -> refs/for/refs/heads/master\n')),
-        ]
+    calls.append((
+      (['git', 'push',
+        'https://chromium.googlesource.com/yyy/zzz',
+        ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
+      ('remote:\n'
+       'remote: Processing changes: (\)\n'
+       'remote: Processing changes: (|)\n'
+       'remote: Processing changes: (/)\n'
+       'remote: Processing changes: (-)\n'
+       'remote: Processing changes: new: 1 (/)\n'
+       'remote: Processing changes: new: 1, done\n'
+       'remote:\n'
+       'remote: New Changes:\n'
+       'remote:   https://chromium-review.googlesource.com/#/c/yyy/zzz/+/123456'
+           ' XXX\n'
+       'remote:\n'
+       'To https://chromium.googlesource.com/yyy/zzz\n'
+       ' * [new branch]      hhhh -> refs/for/refs/heads/master\n')
+    ))
     if squash:
       calls += [
           ((['git', 'config', 'branch.master.gerritissue', '123456'],),
@@ -1341,11 +1341,15 @@
       ]
     calls += [
         ((['git', 'config', 'rietveld.cc'],), ''),
-        (('AddReviewers', 'chromium-review.googlesource.com', 123456
-          if squash else None, sorted(reviewers),
-          ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
-          cc, notify), ''),
     ]
+    if squash:
+      calls += [
+          (('AddReviewers',
+            'chromium-review.googlesource.com', 'yyy%2Fzzz~123456',
+            sorted(reviewers),
+            ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
+            cc, notify), ''),
+      ]
     if tbr:
       calls += [
         (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
@@ -1363,8 +1367,10 @@
                  }
               }
           }),
-        (('SetReview', 'chromium-review.googlesource.com',
-          123456 if squash else None, 'Self-approving for TBR',
+        (('SetReview',
+          'chromium-review.googlesource.com',
+          'yyy%2Fzzz~123456',
+          'Self-approving for TBR',
           {'Code-Review': 2}, None), ''),
       ]
     calls += cls._git_post_upload_calls()