Fix regressions from HotfixBranch.hfrev=0 default

Two regressions introduced when HotfixBranch.version was changed to
include .0 suffix by default (hfrev=0 class attribute):

1. create_branch.py: archive-tag check fired for HotfixBranch because
   version='X.Y.Z.0' matched the GA release tag 'X.Y.Z.0'. Skip this
   check for hotfix branches since their archive tags use the format
   'X.Y.Z.hfrev.archived_hotfix_branch'. Also fix branch_from to use
   the 3-digit base form '%d.%d.%d.0' instead of version+'.0' which
   would produce 'X.Y.Z.0.0'.

2. branches.py: has_version_queued_prs() was only prefix-matching for
   hfrev==-1 (legacy sentinel), missing the case where branch_factory()
   creates a HotfixBranch with hfrev==0 but update_versions() already
   advanced the queue to hfrev==1 (post-GA). Extend the fallback prefix
   match to cover hfrev==0 as well, with an exact-match-first strategy
   to preserve correct pre-GA behaviour.

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

Author: charlesprost

bert_e/jobs/create_branch.py

@@ -62,7 +62,10 @@ def create_branch(job: CreateBranchJob):
 
     # do not allow recreating a previously existing identical branch
     # (unless archive tag is manually removed)
-    if new_branch.version in repo.cmd('git tag').split('\n')[:-1]:
+    # Hotfix archive tags use format 'X.Y.Z.hfrev.archived_hotfix_branch',
+    # not just 'X.Y.Z.hfrev', so skip this check for hotfix branches.
+    if not isinstance(new_branch, HotfixBranch) and \
+            new_branch.version in repo.cmd('git tag').split('\n')[:-1]:
         raise exceptions.JobFailure('Cannot create branch %r because there is '
                                     'already an archive tag %r in the '
                                     'repository.' %
@@ -81,8 +84,10 @@ def create_branch(job: CreateBranchJob):
     # ...or determine the branching point automatically
     else:
         if isinstance(new_branch, HotfixBranch):
-            # start from tag X.Y.Z.0
-            job.settings.branch_from = new_branch.version + '.0'
+            # start from tag X.Y.Z.0 (use 3-digit base to avoid double .0)
+            base_ver = '%d.%d.%d' % (new_branch.major,
+                                     new_branch.minor, new_branch.micro)
+            job.settings.branch_from = base_ver + '.0'
         else:
             job.settings.branch_from = dev_branches[0]
             for dev_branch in dev_branches:

bert_e/workflow/gitwaterflow/branches.py

@@ -829,12 +829,19 @@ def queued_prs(self):
         return pr_hf_ids + pr_non_hf_ids
 
     def has_version_queued_prs(self, version):
-        # delete_branch() may call this property with a four numbers version
-        # finished by -1, so we can not rely on this last number to match.
-        if len(version) == 4 and version[3] == -1:
+        # delete_branch() may call this with a version whose hfrev has not
+        # been resolved by update_versions (hfrev == -1 legacy, or hfrev == 0
+        # when branch_factory is called without a cascade).  In that case we
+        # must not rely on the last number to match.
+        if len(version) == 4 and version[3] in (-1, 0):
+            # Try exact match first (covers true pre-GA queues where hfrev=0)
+            exact = self._queues.get(version, {}).get(QueueIntegrationBranch)
+            if exact is not None:
+                return True
+            # Fallback: prefix match (covers post-GA where update_versions
+            # advanced hfrev but branch_factory still returned hfrev=0)
             for queue_version in self._queues.keys():
                 if len(queue_version) == 4 and \
-                   len(version) == 4 and \
                    queue_version[:3] == version[:3]:
                     queued_pr = self._queues.get(queue_version)
                     if queued_pr is not None and \