(Risk 1) Fix already_in_queue to detect pre-GA queue branches after GA tag

After a GA tag is pushed (e.g. 10.0.0.0), HotfixBranch.hfrev advances from
0 to 1. The next PR handle call would compute queue name q/w/{id}/10.0.0.1/...
which does not exist, causing already_in_queue to return False and re-queue
the PR — creating an orphaned q/10.0.0.1 branch alongside the valid one.

Fix: after the exact-match lookup, fall back to a git branch -r --list prefix
scan (origin/q/w/{id}/major.minor.micro.*) so the existing pre-GA queue branch
is found regardless of which hfrev was in effect when the PR was first queued.

Add test_pr_hotfix_no_requeue_after_ga: queues pre-GA, pushes 10.0.0.0 tag,
then re-handles the PR — asserts NothingToDo (not Queued) and verifies no
orphaned 10.0.0.1 branch is created.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: charlesprost

bert_e/tests/test_bert_e.py

@@ -6033,6 +6033,42 @@ def test_pr_hotfix_pre_ga(self):
             self.handle(sha1, options=self.bypass_all, backtrace=True)
         self.assertEqual(self.prs_in_queue(), set())
 
+    def test_pr_hotfix_no_requeue_after_ga(self):
+        """PR queued pre-GA must not be re-queued after the GA tag is pushed.
+
+        Without the already_in_queue prefix-scan fix, pushing 10.0.0.0 causes
+        already_in_queue to look for q/w/{id}/10.0.0.1/... (hfrev now 1) which
+        does not exist, so the PR is incorrectly re-queued and a new orphaned
+        q/10.0.0.1 branch is created.
+        """
+        # Step 1 — queue PR before GA tag exists.
+        pr = self.create_pr('bugfix/TEST-00000', 'hotfix/10.0.0')
+        with self.assertRaises(exns.Queued):
+            self.handle(pr.id, options=self.bypass_all, backtrace=True)
+        self.assertEqual(self.prs_in_queue(), {pr.id})
+
+        # Step 2 — push the GA tag, advancing hfrev from 0 to 1.
+        self.gitrepo.cmd('git tag 10.0.0.0')
+        self.gitrepo.cmd('git push --tags')
+
+        # Step 3 — re-handle the PR; must be NothingToDo, not Queued again.
+        with self.assertRaises(exns.NothingToDo):
+            self.handle(pr.id, options=self.bypass_all, backtrace=True)
+
+        # No second q/w branch should have been created (would appear if
+        # the PR was incorrectly re-queued with 10.0.0.1).
+        qbranches = self.get_qint_branches()
+        self.assertFalse(
+            any('10.0.0.1' in b for b in qbranches),
+            'orphaned 10.0.0.1 queue branch found: %s' % qbranches)
+
+        # Step 4 — original pre-GA queue branch still builds and merges fine.
+        sha1 = self.set_build_status_on_branch_tip(
+            'q/w/%d/10.0.0.0/bugfix/TEST-00000' % pr.id, 'SUCCESSFUL')
+        with self.assertRaises(exns.Merged):
+            self.handle(sha1, options=self.bypass_all, backtrace=True)
+        self.assertEqual(self.prs_in_queue(), set())
+
     def test_pr_hotfix_alone(self):
         self.gitrepo.cmd('git tag 10.0.0.0')
         self.gitrepo.cmd('git push --tags')

bert_e/workflow/gitwaterflow/queueing.py

@@ -126,9 +126,22 @@ def already_in_queue(job, wbranches):
 
     """
     pr_id = job.pull_request.id
-    return any(
-        get_queue_integration_branch(job, pr_id, w).exists() for w in wbranches
-    )
+    if any(get_queue_integration_branch(job, pr_id, w).exists()
+           for w in wbranches):
+        return True
+    # Fallback for hotfix branches: the hfrev embedded in the queue branch
+    # name may have changed since the PR was queued (pre-GA → post-GA
+    # transition).  Scan by major.minor.micro prefix to detect the existing
+    # queue branch regardless of which hfrev was in effect when first queued.
+    if (len(job.git.cascade.dst_branches) == 1 and
+            isinstance(job.git.cascade.dst_branches[0], HotfixBranch)):
+        dst = job.git.cascade.dst_branches[0]
+        prefix = 'origin/q/w/%d/%d.%d.%d.' % (
+            pr_id, dst.major, dst.minor, dst.micro)
+        if job.git.repo.cmd(
+                'git branch -r --list %s*' % prefix).strip():
+            return True
+    return False
 
 
 def add_to_queue(job, wbranches):