From 6365bc444603bb8e890a0b913757379c9c074f6c Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Thu, 23 Aug 2018 22:14:49 +0000 Subject: [PATCH] git cl: temporary stop using project~number on Gerrit. Broke release process. R=ehmaldonado, mmoss Bug: 876964, 876910 Change-Id: I02ea424632f5c5522af0010adce1c993e2610b48 Reviewed-on: https://chromium-review.googlesource.com/1187548 Reviewed-by: Michael Moss Commit-Queue: Andrii Shyshkalov --- git_cl.py | 6 ++++-- tests/git_cl_test.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/git_cl.py b/git_cl.py index f5ae5a88b..7a46c1fad 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2419,8 +2419,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase): Not to be confused by value of "Change-Id:" footer. """ - return gerrit_util.ChangeIdentifier( - self._GetGerritProject(), self.GetIssue()) + # TODO(tandrii): undo this once a fix is in place for crbug/876964. + # return gerrit_util.ChangeIdentifier( + # self._GetGerritProject(), self.GetIssue()) + return str(self.GetIssue()) @classmethod def IssueConfigKey(cls): diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index b279db84f..6edbe3559 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -1327,7 +1327,7 @@ class TestGitCl(TestCase): if squash: calls += [ (('AddReviewers', - 'chromium-review.googlesource.com', 'my%2Frepo~123456', + 'chromium-review.googlesource.com', '123456', sorted(reviewers), ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] + cc, notify), ''), @@ -1351,7 +1351,7 @@ class TestGitCl(TestCase): }), (('SetReview', 'chromium-review.googlesource.com', - 'my%2Frepo~123456', + '123456', 'Self-approving for TBR', {'Code-Review': 2}, None), ''), ]