half-orm-dev 1.0.0a7__tar.gz → 1.0.0a8__tar.gz

{half_orm_dev-1.0.0a7/half_orm_dev.egg-info → half_orm_dev-1.0.0a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a7
+Version: 1.0.0a8
 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.0a7 → half_orm_dev-1.0.0a8}/half_orm_dev/migration_manager.py

@@ -313,6 +313,9 @@ class MigrationManager:
                 f"Continuing with migration attempt."
             )
 
+        # Ensure all active branches are in sync with origin before touching anything
+        self._ensure_active_branches_synced()
+
         # Get pending migrations
         pending = self.get_pending_migrations(current_version, target_version)
 
@@ -452,6 +455,72 @@ class MigrationManager:
         except Exception:
             pass  # remote tag may already be gone
 
+    def _ensure_active_branches_synced(self) -> None:
+        """Verify all active branches are in sync with origin before migration.
+
+        Branches that are behind are fast-forwarded automatically (no local commits
+        at risk).  Branches that are ahead or diverged block the migration — the
+        developer must push or resolve before proceeding.
+
+        Raises:
+            MigrationManagerError: if any active branch is ahead or diverged.
+        """
+        repo = self._repo
+        git_repo = repo.hgit._HGit__git_repo
+        current_branch = git_repo.active_branch.name
+
+        try:
+            branches_status = repo.hgit.get_active_branches_status()
+        except Exception:
+            return  # can't determine status, proceed cautiously
+
+        patch_branches = [b['name'] for b in branches_status.get('patch_branches', [])]
+        release_branches = [b['name'] for b in branches_status.get('release_branches', [])]
+        staged_branches = [b['name'] for b in branches_status.get('staged_branches', [])]
+        active_branches = release_branches + patch_branches + staged_branches
+
+        blocked = []
+        for branch in active_branches:
+            try:
+                synced, status = repo.hgit.is_branch_synced(branch)
+                if synced:
+                    continue
+                if status == 'behind':
+                    # Fast-forward: no local commits at risk
+                    repo.hgit.checkout(branch)
+                    git_repo.git.merge('--ff-only', f'origin/{branch}')
+                elif status in ('ahead', 'diverged'):
+                    blocked.append((branch, status))
+            except Exception:
+                pass  # branch may not exist locally, skip
+
+        # Return to original branch
+        try:
+            repo.hgit.checkout(current_branch)
+        except Exception:
+            pass
+
+        if blocked:
+            ahead = [(b, s) for b, s in blocked if s == 'ahead']
+            diverged = [(b, s) for b, s in blocked if s == 'diverged']
+            parts = []
+            if ahead:
+                branch_list = ', '.join(b for b, _ in ahead)
+                parts.append(
+                    f"  Branches ahead of origin (unpushed commits) — push first:\n"
+                    + '\n'.join(f"    git push origin {b}" for b, _ in ahead)
+                )
+            if diverged:
+                parts.append(
+                    f"  Branches diverged from origin (local and remote have diverged) "
+                    f"— rebase or merge to resolve:\n"
+                    + '\n'.join(f"    {b}" for b, _ in diverged)
+                )
+            raise MigrationManagerError(
+                f"Migration blocked: active branches are not in sync with origin.\n"
+                + '\n'.join(parts)
+            )
+
     def _regenerate_modules_after_migration(
         self, from_version: str, to_version: str
     ) -> None:
@@ -468,50 +537,41 @@ class MigrationManager:
         package_name = repo.name
         package_dir = str(Path(repo.base_dir) / package_name)
 
-        # Regenerate all modules (idempotent thanks to global reset in generate())
-        _modules.generate(repo)
-
-        # Stage the entire package directory
-        repo.hgit.add(package_dir)
-
-        # Nothing changed — nothing to do
-        staged = git_repo.git.diff('--cached', '--name-only')
-        if not staged.strip():
-            return
-
-        # Commit on ho-prod
         commit_msg = (
             f"[HOP] Regenerate modules (migration {from_version} → {to_version})"
         )
-        repo.hgit.commit('-m', commit_msg)
-        repo.hgit.push_branch('ho-prod')
 
-        # Sync to all active branches
+        # Collect active branches before moving around
         try:
             branches_status = repo.hgit.get_active_branches_status()
         except Exception:
-            return
+            branches_status = {}
 
         patch_branches = [b['name'] for b in branches_status.get('patch_branches', [])]
         release_branches = [b['name'] for b in branches_status.get('release_branches', [])]
         staged_branches = [b['name'] for b in branches_status.get('staged_branches', [])]
-        target_branches = release_branches + patch_branches + staged_branches
+        # ho-prod first, then active branches
+        all_branches = ['ho-prod'] + release_branches + patch_branches + staged_branches
 
-        sync_msg = (
-            f"[HOP] Sync modules from ho-prod (migration {from_version} → {to_version})"
-        )
-        for branch in target_branches:
+        for branch in all_branches:
             try:
                 repo.hgit.checkout(branch)
-                git_repo.git.checkout('ho-prod', '--', package_name)
+                # generate() reads existing files and preserves developer code sections
+                _modules.generate(repo)
                 repo.hgit.add(package_dir)
-                if not git_repo.git.status('--porcelain').strip():
+                if not git_repo.git.diff('--cached', '--name-only').strip():
                     continue
-                repo.hgit.commit('-m', sync_msg)
-                repo.hgit.push_branch(branch)
+                repo.hgit.commit('-m', commit_msg)
+                try:
+                    repo.hgit.push_branch(branch)
+                except Exception as push_err:
+                    sys.stderr.write(
+                        f"Warning: could not push {branch} after module regeneration "
+                        f"(diverged branch?): {push_err}\n"
+                    )
             except Exception as e:
                 sys.stderr.write(
-                    f"Warning: could not sync modules to {branch}: {e}\n"
+                    f"Warning: could not regenerate modules on {branch}: {e}\n"
                 )
 
         repo.hgit.checkout('ho-prod')

{half_orm_dev-1.0.0a7 → half_orm_dev-1.0.0a8}/half_orm_dev/repo.py

@@ -690,18 +690,10 @@ class Repo:
                 remote_ref = f"origin/{branch}"
                 try:
                     synced, status = self.hgit.is_branch_synced(branch)
-                    if not synced and status == "diverged":
-                        print(
-                            f"Warning: branch {branch} has diverged from origin. "
-                            f"Resetting to origin (source of truth).",
-                            file=sys.stderr
-                        )
-                    # Only reset when the remote is ahead of local ("behind") or
-                    # branches have diverged.  Never reset an "ahead" branch —
-                    # that would orphan local commits that have not been pushed
-                    # yet (e.g. the "Create patch directory" commit from
-                    # `hop patch create` before the first push).
-                    if not synced and status in ("behind", "diverged"):
+                    # Only fast-forward when origin is strictly ahead (no local commits
+                    # at risk). Never reset on diverged branches — that would destroy
+                    # unmerged local work.
+                    if not synced and status == "behind":
                         self.hgit._HGit__git_repo.git.reset('--hard', remote_ref)
                 except GitCommandError:
                     # Remote branch may not exist yet, continue without reset

half_orm_dev-1.0.0a8/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a8

{half_orm_dev-1.0.0a7 → half_orm_dev-1.0.0a8/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a7
+Version: 1.0.0a8
 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.0a7/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a7