From d06cc78ec8cc4d9b55fe3232b92d9066f5d776d7 Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu, 23 Aug 2018 17:24:19 +0000
Subject: [PATCH] git cl: use project~number on Gerrit in more RPCs.

R=ehmaldonado, hinoka

Bug: 876910
Change-Id: Ie8a2dbf4c135f9f84c00c4d04d7ef1c2e9480e45
Reviewed-on: https://chromium-review.googlesource.com/1186157
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
---
 git_cl.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/git_cl.py b/git_cl.py
index 7ca2eb4e0..f5ae5a88b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2414,6 +2414,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       project = project[:-len('.git')]
     return project
 
+  def _GerritChangeIdentifier(self):
+    """Handy method for gerrit_util.ChangeIdentifier for a given CL.
+
+    Not to be confused by value of "Change-Id:" footer.
+    """
+    return gerrit_util.ChangeIdentifier(
+        self._GetGerritProject(), self.GetIssue())
+
   @classmethod
   def IssueConfigKey(cls):
     return 'gerritissue'
@@ -3135,8 +3143,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       # TODO(agable): non-squash uploads in git cl should be removed.
       gerrit_util.AddReviewers(
           self._GetGerritHost(),
-          gerrit_util.ChangeIdentifier(
-              self._GetGerritProject(), self.GetIssue()),
+          self._GerritChangeIdentifier(),
           reviewers, cc,
           notify=bool(options.send_mail))
 
@@ -3148,8 +3155,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
       gerrit_util.SetReview(
           self._GetGerritHost(),
-          gerrit_util.ChangeIdentifier(
-              self._GetGerritProject(), self.GetIssue()),
+          self._GerritChangeIdentifier(),
           msg='Self-approving for TBR',
           labels={'Code-Review': score})
 
@@ -3241,8 +3247,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       labels['Commit-Queue'] = 1
       notify = False
     if labels:
-      gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
-                            labels=labels, notify=notify)
+      gerrit_util.SetReview(
+          self._GetGerritHost(),
+          self._GerritChangeIdentifier(),
+          labels=labels, notify=notify)
 
   def SetCQState(self, new_state):
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""