half-orm-dev 1.0.0a15__tar.gz → 1.0.0a16__tar.gz

{half_orm_dev-1.0.0a15/half_orm_dev.egg-info → half_orm_dev-1.0.0a16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a15
+Version: 1.0.0a16
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

{half_orm_dev-1.0.0a15 → half_orm_dev-1.0.0a16}/half_orm_dev/hgit.py

@@ -931,6 +931,28 @@ class HGit:
             print(f"⚠️  Warning: Failed to delete local lock tag {lock_tag}: {e}")
 
 
+    def is_branch_locked(self, branch_name: str, timeout_minutes: int = 30) -> bool:
+        """Return True if a valid (non-stale) lock tag for branch_name exists on origin."""
+        self.fetch_tags()
+        safe_branch_name = branch_name.replace('/', '-')
+        lock_pattern = f"lock-{safe_branch_name}-*"
+        existing_locks = self.list_tags(pattern=lock_pattern)
+        if not existing_locks:
+            return False
+        lock_name = existing_locks[0]
+        remote_ref = self.__git_repo.git.ls_remote(
+            '--tags', 'origin', f'refs/tags/{lock_name}'
+        ).strip()
+        if not remote_ref:
+            return False
+        match = re.search(r'-(\d+)$', lock_name)
+        if not match:
+            return True
+        lock_timestamp_ms = int(match.group(1))
+        lock_time = datetime.fromtimestamp(lock_timestamp_ms / 1000.0, tz=timezone.utc)
+        age_minutes = (datetime.now(timezone.utc) - lock_time).total_seconds() / 60
+        return age_minutes <= timeout_minutes
+
     def list_tags(self, pattern: Optional[str] = None) -> List[str]:
         """
         List tags matching glob pattern.

{half_orm_dev-1.0.0a15 → half_orm_dev-1.0.0a16}/half_orm_dev/migration_manager.py

@@ -25,7 +25,9 @@ import re
 import subprocess
 import sys
 import importlib.util
+from configparser import ConfigParser
 from packaging import version
+import click
 from pathlib import Path
 from typing import List, Dict, Optional, Tuple
 from half_orm import utils
@@ -283,14 +285,44 @@ class MigrationManager:
                 )
                 ahead, behind = map(int, result_check.stdout.strip().split())
                 if behind > 0:
+                    # Check whether the migration was already applied on origin/ho-prod.
+                    already_done = False
+                    try:
+                        remote_config_text = self._repo.hgit._HGit__git_repo.git.show(
+                            'origin/ho-prod:.hop/config'
+                        )
+                        _cp = ConfigParser()
+                        _cp.read_string(remote_config_text)
+                        remote_version = _cp['halfORM'].get('hop_version', '')
+                        if remote_version == target_version:
+                            already_done = True
+                    except Exception:
+                        pass
+
+                    if already_done:
+                        # Another developer already ran the migration.
+                        # Pull and sync all active branches, then return.
+                        click.echo(
+                            f"  ℹ Migration to {target_version} already applied by another developer.\n"
+                            f"  Pulling and syncing all active branches..."
+                        )
+                        self._repo.hgit._HGit__git_repo.remotes.origin.pull('ho-prod')
+                        self._repo.hgit.sync_active_branches(pattern="ho-*")
+                        # Reload config so the rest of the tool sees the new version
+                        self._repo._Repo__config.read()
+                        result['already_synced'] = True
+                        return result
+
                     raise MigrationManagerError(
                         f"ho-prod is {behind} commits behind origin/ho-prod. "
                         f"Please pull changes first: git pull origin ho-prod"
                     )
                 if ahead > 0:
                     result['errors'].append(f"Warning: ho-prod is {ahead} commits ahead of origin/ho-prod")
-            except subprocess.CalledProcessError as e:
-                # Could not compare - maybe origin/ho-prod doesn't exist yet
+            except (MigrationManagerError, subprocess.CalledProcessError):
+                raise
+            except Exception:
+                # Could not compare — maybe origin/ho-prod doesn't exist yet
                 pass
 
         # Get current version from .hop/config

{half_orm_dev-1.0.0a15 → half_orm_dev-1.0.0a16}/half_orm_dev/release_manager.py

@@ -1430,6 +1430,31 @@ class ReleaseManager:
                 f"Cannot read current production version from database: {e}"
             )
 
+        # Migration: production servers that still track ho-prod instead of
+        # ho-current. Create ho-current from the current version's immutable tag
+        # and switch to it — local-only, no push to origin.
+        if (
+            self._repo.production
+            and self._repo.hgit.branch == 'ho-prod'
+            and not self._repo.hgit.branch_exists('ho-current')
+        ):
+            current_tag = f'v{current_version}'
+            tag_exists = any(
+                t.name == current_tag
+                for t in self._repo.hgit._HGit__git_repo.tags
+            )
+            if not tag_exists:
+                raise ReleaseManagerError(
+                    f"Cannot migrate to ho-current: tag {current_tag} not found locally.\n"
+                    f"Run 'hop update' again after ensuring tags are fetched."
+                )
+            self._repo.hgit.create_branch_from_tag('ho-current', current_tag)
+            self._repo.hgit._HGit__git_repo.heads['ho-current'].checkout()
+            click.echo(
+                f"  ℹ Migrated to ho-current (created from {current_tag}, local only).\n"
+                f"    Production servers should now use ho-current instead of ho-prod."
+            )
+
         # 3. Build list of available releases with details
         available_releases = []
 
@@ -1855,25 +1880,31 @@ class ReleaseManager:
                 'final_version': upgrade_path[-1] if upgrade_path else current_version
             }
 
-        # === 5. Acquire lock, pull ho-prod, apply releases ===
-        # The lock ensures the pull does not fetch a partial state left by a
-        # push in progress on ho-prod (e.g. patch merge or release promote
-        # pushing files in several steps).
+        # === 5. Get release files and apply releases ===
+        # ho-prod:     acquire lock + pull (rolling branch, needs lock against partial pushes)
+        # ho-current:  fetch + reset --hard vX.Y.Z per version (immutable tags, no lock needed)
         lock_tag = None
         patches_applied = {}
+        on_ho_current = self._repo.hgit.branch == "ho-current"
         try:
-            lock_tag = self._repo.hgit.acquire_branch_lock('ho-prod')
-
-            # Pull ho-prod to get release files
-            # update_production only fetches tags, we need the actual release files
-            try:
-                self._repo.hgit.pull('origin', 'ho-prod')
-            except Exception as e:
-                raise ReleaseManagerError(f"Failed to pull ho-prod branch: {e}")
+            if on_ho_current:
+                try:
+                    self._repo.hgit.fetch_tags()
+                    self._repo.hgit._HGit__git_repo.remotes.origin.fetch()
+                except Exception as e:
+                    raise ReleaseManagerError(f"Failed to fetch from origin: {e}")
+            else:
+                lock_tag = self._repo.hgit.acquire_branch_lock('ho-prod')
+                try:
+                    self._repo.hgit.pull('origin', 'ho-prod')
+                except Exception as e:
+                    raise ReleaseManagerError(f"Failed to pull ho-prod branch: {e}")
 
             # Apply releases sequentially
             try:
                 for version in upgrade_path:
+                    if on_ho_current:
+                        self._repo.hgit._HGit__git_repo.git.reset('--hard', f'v{version}')
                     applied_patches = self._apply_release_to_production(version)
                     patches_applied[version] = applied_patches
             except Exception as e:
@@ -2033,12 +2064,21 @@ class ReleaseManager:
             # → Raises: "Repository has uncommitted changes"
         """
         # Check branch
-        if self._repo.hgit.branch != "ho-prod":
+        current_branch = self._repo.hgit.branch
+        if current_branch not in ("ho-prod", "ho-current"):
             raise ReleaseManagerError(
-                f"Must be on ho-prod branch for production upgrade. "
-                f"Current branch: {self._repo.hgit.branch}"
+                f"Must be on ho-prod or ho-current branch for production upgrade. "
+                f"Current branch: {current_branch}"
             )
 
+        # For ho-current: reject if a lock is held on ho-prod (dev operation in progress)
+        if current_branch == "ho-current":
+            if self._repo.hgit.is_branch_locked("ho-prod"):
+                raise ReleaseManagerError(
+                    "Cannot upgrade: ho-prod is currently locked by a development operation.\n"
+                    "Wait for the operation to complete and retry."
+                )
+
         # Check repo is clean
         if not self._repo.hgit.repos_is_clean():
             raise ReleaseManagerError(

{half_orm_dev-1.0.0a15 → half_orm_dev-1.0.0a16}/half_orm_dev/repo.py

@@ -541,23 +541,31 @@ class Repo:
                     create_commit=True
                 )
 
-                result['migration_run'] = True
                 result['errors'] = migration_result.get('errors', [])
 
-                # Clean up orphaned ho-staged/* branches (patch IDs in .txt = already in production)
-                if hasattr(self, 'release_manager'):
-                    try:
-                        deleted = self.release_manager.cleanup_orphaned_staged_branches()
-                        result['orphaned_staged_deleted'] = deleted
-                    except Exception:
-                        result['orphaned_staged_deleted'] = []
+                if migration_result.get('already_synced'):
+                    # Migration was already done by another developer; branches are now synced.
+                    result['migration_run'] = False
+                    result['already_synced'] = True
+                    if not silent:
+                        print(f"✓ Branches synced to migration {current_version} (applied by another developer)")
+                else:
+                    result['migration_run'] = True
 
-                # Log success if not silent
-                if not silent:
-                    if migration_result.get('migrations_applied'):
-                        print(f"✓ Applied {len(migration_result['migrations_applied'])} migration(s)")
-                    else:
-                        print(f"✓ Updated repository version to {current_version}")
+                    # Clean up orphaned ho-staged/* branches (patch IDs in .txt = already in production)
+                    if hasattr(self, 'release_manager'):
+                        try:
+                            deleted = self.release_manager.cleanup_orphaned_staged_branches()
+                            result['orphaned_staged_deleted'] = deleted
+                        except Exception:
+                            result['orphaned_staged_deleted'] = []
+
+                    # Log success if not silent
+                    if not silent:
+                        if migration_result.get('migrations_applied'):
+                            print(f"✓ Applied {len(migration_result['migrations_applied'])} migration(s)")
+                        else:
+                            print(f"✓ Updated repository version to {current_version}")
 
             finally:
                 # Always try to return to original branch if we switched
@@ -1600,6 +1608,19 @@ class Repo:
 
         result['branch_sync'] = sync_result
 
+        # 0c. Reload config and validate version after pull/sync.
+        # Another developer may have run the migration and pushed a new hop_version.
+        # The pull + sync above may have updated .hop/config on the current branch;
+        # we must detect that before any further operation.
+        if self.hgit:
+            try:
+                self.__config = Config(self.__base_dir)
+                self._validate_version()
+            except OutdatedHalfORMDevError:
+                raise
+            except Exception:
+                pass  # offline or version parsing error — don't block
+
         # 1. Check and update Git hooks
         if not dry_run:
             result['hooks'] = self.install_git_hooks()

half_orm_dev-1.0.0a16/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a16

{half_orm_dev-1.0.0a15 → half_orm_dev-1.0.0a16/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a15
+Version: 1.0.0a16
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

half_orm_dev-1.0.0a15/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a15