fix(upgrade): preserve status of merged branches during infrahub upgrade

Skip terminal branches (MERGED, DELETING) when marking branches as
NEED_UPGRADE_REBASE. Previously infrahub upgrade reopened every merged
branch by overwriting its status, ignoring that MERGED branches are
meant to be read-only / deleted from a user perspective.

Closes #9103

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: fatih-acar

backend/infrahub/cli/db.py

@@ -439,7 +439,11 @@ async def migrate_database(
 
 
 async def mark_branches_needing_rebase(db: InfrahubDatabase) -> list[Branch]:
-    branches = [b for b in await Branch.get_list(db=db) if b.name not in [registry.default_branch, GLOBAL_BRANCH_NAME]]
+    branches = [
+        b
+        for b in await Branch.get_list(db=db)
+        if b.name not in [registry.default_branch, GLOBAL_BRANCH_NAME] and not b.is_terminal
+    ]
     if not branches:
         return []
 

backend/tests/component/cli/test_mark_branches_needing_rebase.py

@@ -0,0 +1,36 @@
+from infrahub.cli.db import mark_branches_needing_rebase
+from infrahub.core.branch import Branch
+from infrahub.core.branch.enums import BranchStatus
+from infrahub.core.graph import GRAPH_VERSION
+from infrahub.core.initialization import create_branch
+from infrahub.database import InfrahubDatabase
+
+
+async def test_mark_branches_needing_rebase_skips_terminal_branches(
+    db: InfrahubDatabase, default_branch: Branch
+) -> None:
+    open_branch = await create_branch(branch_name="open-branch", db=db)
+    open_branch.graph_version = GRAPH_VERSION - 1
+    await open_branch.save(db=db)
+
+    merged_branch = await create_branch(branch_name="merged-branch", db=db)
+    merged_branch.graph_version = GRAPH_VERSION - 1
+    merged_branch.status = BranchStatus.MERGED
+    await merged_branch.save(db=db)
+
+    deleting_branch = await create_branch(branch_name="deleting-branch", db=db)
+    deleting_branch.graph_version = GRAPH_VERSION - 1
+    deleting_branch.status = BranchStatus.DELETING
+    await deleting_branch.save(db=db)
+
+    flagged = await mark_branches_needing_rebase(db=db)
+
+    flagged_names = {b.name for b in flagged}
+    assert "open-branch" in flagged_names
+    assert "merged-branch" not in flagged_names
+    assert "deleting-branch" not in flagged_names
+
+    refreshed_merged = await Branch.get_by_name(name="merged-branch", db=db)
+    refreshed_deleting = await Branch.get_by_name(name="deleting-branch", db=db, ignore_deleting=False)
+    assert refreshed_merged.status == BranchStatus.MERGED
+    assert refreshed_deleting.status == BranchStatus.DELETING

changelog/9103.fixed.md

@@ -0,0 +1 @@
+Stop `infrahub upgrade` from overwriting the status of merged or deleting branches. Branches in a terminal state (`MERGED`, `DELETING`) are now skipped, so they no longer reappear as `NEED_UPGRADE_REBASE` after an upgrade.