fix(gerrit): defer change creation to createPr()

lib/modules/platform/gerrit/client.spec.ts

@@ -715,15 +715,54 @@ describe('modules/platform/gerrit/client', () => {
     });
   });
 
-  describe('deleteHashtag()', () => {
-    it('deleteHashtag', async () => {
+  describe('setHashtags()', () => {
+    it('add hashtags', async () => {
+      httpMock
+        .scope(gerritEndpointUrl)
+        .post('/a/changes/123456/hashtags', {
+          add: ['hashtag1', 'hashtag2'],
+        })
+        .reply(200, gerritRestResponse([]), jsonResultHeader);
+      await expect(
+        client.setHashtags(123456, { add: ['hashtag1', 'hashtag2'] }),
+      ).toResolve();
+    });
+
+    it('remove hashtags', async () => {
       httpMock
         .scope(gerritEndpointUrl)
         .post('/a/changes/123456/hashtags', {
           remove: ['hashtag1'],
         })
         .reply(200, gerritRestResponse([]), jsonResultHeader);
-      await expect(client.deleteHashtag(123456, 'hashtag1')).toResolve();
+      await expect(
+        client.setHashtags(123456, { remove: ['hashtag1'] }),
+      ).toResolve();
+    });
+
+    it('add and remove hashtags in single call', async () => {
+      httpMock
+        .scope(gerritEndpointUrl)
+        .post('/a/changes/123456/hashtags', {
+          add: ['hashtag2', 'hashtag3'],
+          remove: ['hashtag1'],
+        })
+        .reply(200, gerritRestResponse([]), jsonResultHeader);
+      await expect(
+        client.setHashtags(123456, {
+          add: ['hashtag2', 'hashtag3'],
+          remove: ['hashtag1'],
+        }),
+      ).toResolve();
+    });
+
+    it('does nothing when no hashtags provided', async () => {
+      await expect(client.setHashtags(123456, {})).toResolve();
+      await expect(client.setHashtags(123456, { add: [] })).toResolve();
+      await expect(client.setHashtags(123456, { remove: [] })).toResolve();
+      await expect(
+        client.setHashtags(123456, { add: [], remove: [] }),
+      ).toResolve();
     });
   });
 

lib/modules/platform/gerrit/client.ts

@@ -1,3 +1,4 @@
+import { isNonEmptyArray } from '@sindresorhus/is';
 import semver from 'semver';
 import { z } from 'zod/v3';
 import { REPOSITORY_ARCHIVED } from '../../../constants/error-messages.ts';
@@ -11,6 +12,7 @@ import type {
   GerritChange,
   GerritChangeMessageInfo,
   GerritFindPRConfig,
+  GerritHashtagsInput,
   GerritMergeableInfo,
   GerritProjectInfo,
   GerritRequestDetail,
@@ -242,10 +244,16 @@ class GerritClient {
     );
   }
 
-  async deleteHashtag(changeNumber: number, hashtag: string): Promise<void> {
-    await this.gerritHttp.postJson(`a/changes/${changeNumber}/hashtags`, {
-      body: { remove: [hashtag] },
-    });
+  async setHashtags(
+    changeNumber: number,
+    hashtagsInput: GerritHashtagsInput,
+  ): Promise<void> {
+    const { add, remove } = hashtagsInput;
+    if (isNonEmptyArray(add) || isNonEmptyArray(remove)) {
+      await this.gerritHttp.postJson(`a/changes/${changeNumber}/hashtags`, {
+        body: { add, remove },
+      });
+    }
   }
 
   async addReviewers(changeNumber: number, reviewers: string[]): Promise<void> {
@@ -262,7 +270,7 @@ class GerritClient {
 
   async addAssignee(changeNumber: number, assignee: string): Promise<void> {
     await this.gerritHttp.putJson<GerritAccountInfo>(
-      // TODO: refactor this as this API removed in Gerrit 3.8
+      // TODO: use CCs instead as Gerrit 3.8+ no longer supports assignees
       `a/changes/${changeNumber}/assignee`,
       {
         body: { assignee },

lib/modules/platform/gerrit/index.spec.ts

@@ -1,5 +1,4 @@
 import { codeBlock } from 'common-tags';
-import { DateTime } from 'luxon';
 import { git, hostRules, partial } from '~test/util.ts';
 import { REPOSITORY_ARCHIVED } from '../../../constants/error-messages.ts';
 import type { BranchStatus } from '../../../types/index.ts';
@@ -39,15 +38,6 @@ vi.mock('./client.ts');
 const clientMock = vi.mocked(_client);
 
 describe('modules/platform/gerrit/index', () => {
-  const t0 = DateTime.fromISO(
-    '2025-04-14T16:33:37.000000000',
-  ).toUTC() as DateTime<true>;
-
-  beforeAll(() => {
-    vi.useFakeTimers();
-    vi.setSystemTime(t0.toMillis());
-  });
-
   beforeEach(async () => {
     hostRules.find.mockReturnValue({
       username: 'user',
@@ -299,6 +289,47 @@ describe('modules/platform/gerrit/index', () => {
         TAG_PULL_REQUEST_BODY,
       );
     });
+
+    it('updatePr() - with addLabels => add hashtags', async () => {
+      const change = partial<GerritChange>({});
+      clientMock.getChange.mockResolvedValueOnce(change);
+      await gerrit.updatePr({
+        number: 123456,
+        prTitle: change.subject,
+        addLabels: ['label1', 'label2'],
+      });
+      expect(clientMock.setHashtags).toHaveBeenCalledExactlyOnceWith(123456, {
+        add: ['label1', 'label2'],
+      });
+    });
+
+    it('updatePr() - with removeLabels => remove hashtags', async () => {
+      const change = partial<GerritChange>({});
+      clientMock.getChange.mockResolvedValueOnce(change);
+      await gerrit.updatePr({
+        number: 123456,
+        prTitle: change.subject,
+        removeLabels: ['old-label'],
+      });
+      expect(clientMock.setHashtags).toHaveBeenCalledExactlyOnceWith(123456, {
+        remove: ['old-label'],
+      });
+    });
+
+    it('updatePr() - with addLabels and removeLabels => update hashtags in single call', async () => {
+      const change = partial<GerritChange>({});
+      clientMock.getChange.mockResolvedValueOnce(change);
+      await gerrit.updatePr({
+        number: 123456,
+        prTitle: change.subject,
+        addLabels: ['new-label'],
+        removeLabels: ['old-label'],
+      });
+      expect(clientMock.setHashtags).toHaveBeenCalledExactlyOnceWith(123456, {
+        add: ['new-label'],
+        remove: ['old-label'],
+      });
+    });
   });
 
   it('updatePr() - targetBranch set => move the change', async () => {
@@ -319,71 +350,142 @@ describe('modules/platform/gerrit/index', () => {
   });
 
   describe('createPr()', () => {
-    it('createPr() - no existing found => rejects', async () => {
-      clientMock.findChanges.mockResolvedValueOnce([]);
-      await expect(
-        gerrit.createPr({
-          sourceBranch: 'source',
-          targetBranch: 'target',
-          prTitle: 'title',
-          prBody: 'body',
-        }),
-      ).rejects.toThrow(
-        `the change should be created automatically from previous push to refs/for/source`,
+    it('createPr() - creates change by pushing to refs/for/', async () => {
+      git.pushCommit.mockResolvedValueOnce(true);
+      const change = partial<GerritChange>({
+        _number: 123456,
+        current_revision: 'some-revision',
+        revisions: {
+          'some-revision': partial<GerritRevisionInfo>({
+            commit_with_footers: 'Renovate-Branch: source',
+          }),
+        },
+        created: '2025-04-14 16:33:37.000000000',
+      });
+      clientMock.findChanges.mockResolvedValueOnce([change]);
+      const pr = await gerrit.createPr({
+        sourceBranch: 'source',
+        targetBranch: 'target',
+        prTitle: 'title',
+        prBody: 'body',
+      });
+      expect(pr).toHaveProperty('number', 123456);
+      expect(git.pushCommit).toHaveBeenCalledExactlyOnceWith({
+        sourceRef: 'source',
+        targetRef: 'refs/for/target',
+        files: [],
+        pushOptions: ['notify=NONE', 'ready'],
+      });
+      expect(clientMock.addMessage).toHaveBeenCalledExactlyOnceWith(
+        123456,
+        'body',
+        TAG_PULL_REQUEST_BODY,
       );
     });
 
-    it('createPr() - found existing but not created in the last 5 minutes => rejects', async () => {
+    it('createPr() - with autoApprove', async () => {
+      git.pushCommit.mockResolvedValueOnce(true);
       const change = partial<GerritChange>({
         _number: 123456,
-        created: t0.minus({ minutes: 6 }).toISO().replace('T', ' '),
         current_revision: 'some-revision',
         revisions: {
           'some-revision': partial<GerritRevisionInfo>({
             commit_with_footers: 'Renovate-Branch: source',
           }),
         },
+        created: '2025-04-14 16:33:37.000000000',
       });
       clientMock.findChanges.mockResolvedValueOnce([change]);
-      await expect(
-        gerrit.createPr({
-          sourceBranch: 'source',
-          targetBranch: 'target',
-          prTitle: 'title',
-          prBody: 'body',
-        }),
-      ).rejects.toThrow(/it was not created in the last 5 minutes/);
+      const pr = await gerrit.createPr({
+        sourceBranch: 'source',
+        targetBranch: 'target',
+        prTitle: 'title',
+        prBody: 'body',
+        platformPrOptions: {
+          autoApprove: true,
+        },
+      });
+      expect(pr).toHaveProperty('number', 123456);
+      expect(git.pushCommit).toHaveBeenCalledExactlyOnceWith({
+        sourceRef: 'source',
+        targetRef: 'refs/for/target',
+        files: [],
+        pushOptions: ['notify=NONE', 'ready', 'label=Code-Review+2'],
+      });
+      expect(clientMock.addMessage).toHaveBeenCalledExactlyOnceWith(
+        123456,
+        'body',
+        TAG_PULL_REQUEST_BODY,
+      );
     });
 
-    it('createPr() - add body as message', async () => {
+    it('createPr() - with labels', async () => {
+      git.pushCommit.mockResolvedValueOnce(true);
       const change = partial<GerritChange>({
         _number: 123456,
         current_revision: 'some-revision',
-        created: t0.minus({ seconds: 30 }).toISO().replace('T', ' '),
         revisions: {
           'some-revision': partial<GerritRevisionInfo>({
             commit_with_footers: 'Renovate-Branch: source',
           }),
         },
-        messages: [],
+        created: '2025-04-14 16:33:37.000000000',
       });
       clientMock.findChanges.mockResolvedValueOnce([change]);
       const pr = await gerrit.createPr({
         sourceBranch: 'source',
         targetBranch: 'target',
         prTitle: 'title',
         prBody: 'body',
-        platformPrOptions: {
-          autoApprove: false,
-        },
+        labels: ['label1', 'label2'],
       });
       expect(pr).toHaveProperty('number', 123456);
+      expect(git.pushCommit).toHaveBeenCalledExactlyOnceWith({
+        sourceRef: 'source',
+        targetRef: 'refs/for/target',
+        files: [],
+        pushOptions: [
+          'notify=NONE',
+          'ready',
+          'hashtag=label1',
+          'hashtag=label2',
+        ],
+      });
       expect(clientMock.addMessage).toHaveBeenCalledExactlyOnceWith(
         123456,
         'body',
         TAG_PULL_REQUEST_BODY,
       );
     });
+
+    it('createPr() - no change found after push => rejects', async () => {
+      git.pushCommit.mockResolvedValueOnce(true);
+      clientMock.findChanges.mockResolvedValueOnce([]);
+      await expect(
+        gerrit.createPr({
+          sourceBranch: 'source',
+          targetBranch: 'target',
+          prTitle: 'title',
+          prBody: 'body',
+        }),
+      ).rejects.toThrow(
+        `Could not find the Gerrit change after pushing to refs/for/target`,
+      );
+    });
+
+    it('createPr() - push fails => rejects', async () => {
+      git.pushCommit.mockResolvedValueOnce(false);
+      await expect(
+        gerrit.createPr({
+          sourceBranch: 'source',
+          targetBranch: 'target',
+          prTitle: 'title',
+          prBody: 'body',
+        }),
+      ).rejects.toThrow(
+        `Failed to push commit to refs/for/target to create Gerrit change`,
+      );
+    });
   });
 
   describe('getBranchPr()', () => {
@@ -411,7 +513,7 @@ describe('modules/platform/gerrit/index', () => {
             commit_with_footers: 'Renovate-Branch: renovate/dependency-1.x',
           }),
         },
-        created: '2025-04-14T16:33:37.000000000',
+        created: '2025-04-14 16:33:37.000000000',
       });
       clientMock.getBranchChange.mockResolvedValueOnce(change);
       await expect(
@@ -789,11 +891,9 @@ describe('modules/platform/gerrit/index', () => {
     it('deleteLabel() - deletes a label', async () => {
       const pro = gerrit.deleteLabel(123456, 'hashtag1');
       await expect(pro).resolves.toBeUndefined();
-      expect(clientMock.deleteHashtag).toHaveBeenCalledTimes(1);
-      expect(clientMock.deleteHashtag).toHaveBeenCalledExactlyOnceWith(
-        123456,
-        'hashtag1',
-      );
+      expect(clientMock.setHashtags).toHaveBeenCalledExactlyOnceWith(123456, {
+        remove: ['hashtag1'],
+      });
     });
   });