odoo-devops-tools 1.25.2__tar.gz → 1.25.4__tar.gz

{odoo_devops_tools-1.25.2 → odoo_devops_tools-1.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.25.2
+Version: 1.25.4
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -145,8 +145,8 @@ Add-Content -Path $PROFILE -Value 'odoo-compose-venv completion powershell | Out
 ```
 
 Restart your shell or reload its configuration to activate completion. For example,
-`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync-odoo`,
-`--sync-addons`, and `--sync-all`.
+`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync`,
+`--sync-odoo`, `--sync-addons`, and `--sync-all`.
 
 ---
 
@@ -216,7 +216,7 @@ branch = ${odoo:version}
 Sync the addon repositories and regenerate the Docker environment:
 
 ```bash
-odoo-compose setup --sync-addons
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -255,7 +255,7 @@ odoo_source = workspace
 Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
-odoo-compose setup --sync-all
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -329,13 +329,13 @@ Use `--create-docker-deploy` to generate a self-contained Docker build context f
 Addon modules are staged into the build context so the resulting image does not depend on bind-mounted workspace sources:
 
 ```bash
-odoo-compose setup --sync-addons --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 When `[docker].odoo_source = workspace`, sync the Odoo source as well:
 
 ```bash
-odoo-compose setup --sync-all --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 This additionally creates:
@@ -364,7 +364,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv \
+odoo-compose-venv setup ./odoo19 --sync --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -423,7 +423,7 @@ branch = ${odoo:version}
 Sync the addon repositories and recreate the Python environment to include their dependencies:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 The repositories are cloned into `ROOT/odoo-addons/` and automatically added to the generated `addons_path`. Python dependencies from their `requirements.txt` files are included in the virtual environment.
@@ -467,7 +467,7 @@ python_version = 3.11
 After changing the project file, run `odoo-compose` again from the workspace root:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 This recreates the virtual environment at `ROOT/venv` using the system Python.
@@ -557,7 +557,7 @@ Those machine-specific outputs are recreated on the target machine.
 On an internet-connected build machine, sync the sources, build the wheelhouse, and create the bundle in one command:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle
 ```
 
 When no output path is supplied, the bundle is written to:
@@ -569,7 +569,7 @@ ROOT/dist/ROOT-NAME.odt.zip
 You can also select an explicit output file:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
+odoo-compose-venv setup --sync --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
 ```
 
 #### 4.1.1. Including uncommitted changes
@@ -579,7 +579,7 @@ By default, bundle creation stops when a bundled Git repository has uncommitted
 To intentionally include those changes in the bundle, use:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle --allow-dirty-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle --allow-dirty-bundle
 ```
 
 ### 4.2. Create the workspace on the target machine
@@ -776,6 +776,9 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 **Repository synchronization**
 
 <dl class="cli-reference">
+<dt><code>--sync</code></dt>
+<dd><p>Automatically synchronize only the Git sources used by the selected workflow. In Docker, Odoo is synced only with <code>[docker].odoo_source = workspace</code>; in Venv, Git-managed Odoo is synced. Both workflows sync configured Git addons.</p></dd>
+
 <dt><code>--sync-odoo</code></dt>
 <dd><p>Sync Git-managed Odoo sources; reuse <code>[odoo].path</code> without Git sync when a local path is configured.</p></dd>
 
@@ -783,10 +786,10 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 <dd><p>Sync Git-managed addons into <code>ROOT/odoo-addons/</code>.</p></dd>
 
 <dt><code>--sync-all</code></dt>
-<dd><p>Sync both Odoo and addons.</p></dd>
+<dd><p>Explicitly select both Odoo and addon sources, regardless of the selected workflow. Unlike <code>--sync</code>, this can fetch Odoo sources even when Docker runs Odoo from the base image.</p></dd>
 
 > **Note:**
-> Repository sync aborts if a target Git repository has uncommitted changes. Commit, stash or discard changes before syncing.
+> Repository sync aborts if a target Git repository has uncommitted changes **or a local branch contains commits absent from the remote branch**. Commit/stash uncommitted changes or push/reconcile unpublished commits before syncing. The four sync switches are mutually exclusive; without any of them, <code>setup</code> only regenerates artifacts and does not fetch repositories.
 
 </dl>
 
@@ -829,7 +832,7 @@ odoo-compose setup ./odoo19
 odoo-compose setup ./odoo18 --set odoo:version=18.0
 
 # Native workflow:
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv
+odoo-compose-venv setup ./odoo19 --sync --create-venv
 odoo-compose-venv setup ./odoo18 --set odoo:version=18.0 --sync-all --create-venv
 ```
 

{odoo_devops_tools-1.25.2 → odoo_devops_tools-1.25.4}/README.md

@@ -117,8 +117,8 @@ Add-Content -Path $PROFILE -Value 'odoo-compose-venv completion powershell | Out
 ```
 
 Restart your shell or reload its configuration to activate completion. For example,
-`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync-odoo`,
-`--sync-addons`, and `--sync-all`.
+`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync`,
+`--sync-odoo`, `--sync-addons`, and `--sync-all`.
 
 ---
 
@@ -188,7 +188,7 @@ branch = ${odoo:version}
 Sync the addon repositories and regenerate the Docker environment:
 
 ```bash
-odoo-compose setup --sync-addons
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -227,7 +227,7 @@ odoo_source = workspace
 Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
-odoo-compose setup --sync-all
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -301,13 +301,13 @@ Use `--create-docker-deploy` to generate a self-contained Docker build context f
 Addon modules are staged into the build context so the resulting image does not depend on bind-mounted workspace sources:
 
 ```bash
-odoo-compose setup --sync-addons --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 When `[docker].odoo_source = workspace`, sync the Odoo source as well:
 
 ```bash
-odoo-compose setup --sync-all --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 This additionally creates:
@@ -336,7 +336,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv \
+odoo-compose-venv setup ./odoo19 --sync --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -395,7 +395,7 @@ branch = ${odoo:version}
 Sync the addon repositories and recreate the Python environment to include their dependencies:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 The repositories are cloned into `ROOT/odoo-addons/` and automatically added to the generated `addons_path`. Python dependencies from their `requirements.txt` files are included in the virtual environment.
@@ -439,7 +439,7 @@ python_version = 3.11
 After changing the project file, run `odoo-compose` again from the workspace root:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 This recreates the virtual environment at `ROOT/venv` using the system Python.
@@ -529,7 +529,7 @@ Those machine-specific outputs are recreated on the target machine.
 On an internet-connected build machine, sync the sources, build the wheelhouse, and create the bundle in one command:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle
 ```
 
 When no output path is supplied, the bundle is written to:
@@ -541,7 +541,7 @@ ROOT/dist/ROOT-NAME.odt.zip
 You can also select an explicit output file:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
+odoo-compose-venv setup --sync --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
 ```
 
 #### 4.1.1. Including uncommitted changes
@@ -551,7 +551,7 @@ By default, bundle creation stops when a bundled Git repository has uncommitted
 To intentionally include those changes in the bundle, use:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle --allow-dirty-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle --allow-dirty-bundle
 ```
 
 ### 4.2. Create the workspace on the target machine
@@ -748,6 +748,9 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 **Repository synchronization**
 
 <dl class="cli-reference">
+<dt><code>--sync</code></dt>
+<dd><p>Automatically synchronize only the Git sources used by the selected workflow. In Docker, Odoo is synced only with <code>[docker].odoo_source = workspace</code>; in Venv, Git-managed Odoo is synced. Both workflows sync configured Git addons.</p></dd>
+
 <dt><code>--sync-odoo</code></dt>
 <dd><p>Sync Git-managed Odoo sources; reuse <code>[odoo].path</code> without Git sync when a local path is configured.</p></dd>
 
@@ -755,10 +758,10 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 <dd><p>Sync Git-managed addons into <code>ROOT/odoo-addons/</code>.</p></dd>
 
 <dt><code>--sync-all</code></dt>
-<dd><p>Sync both Odoo and addons.</p></dd>
+<dd><p>Explicitly select both Odoo and addon sources, regardless of the selected workflow. Unlike <code>--sync</code>, this can fetch Odoo sources even when Docker runs Odoo from the base image.</p></dd>
 
 > **Note:**
-> Repository sync aborts if a target Git repository has uncommitted changes. Commit, stash or discard changes before syncing.
+> Repository sync aborts if a target Git repository has uncommitted changes **or a local branch contains commits absent from the remote branch**. Commit/stash uncommitted changes or push/reconcile unpublished commits before syncing. The four sync switches are mutually exclusive; without any of them, <code>setup</code> only regenerates artifacts and does not fetch repositories.
 
 </dl>
 
@@ -801,7 +804,7 @@ odoo-compose setup ./odoo19
 odoo-compose setup ./odoo18 --set odoo:version=18.0
 
 # Native workflow:
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv
+odoo-compose-venv setup ./odoo19 --sync --create-venv
 odoo-compose-venv setup ./odoo18 --set odoo:version=18.0 --sync-all --create-venv
 ```
 

odoo_devops_tools-1.25.4/odoo_devops_tools/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.25.4"

{odoo_devops_tools-1.25.2 → odoo_devops_tools-1.25.4}/odoo_devops_tools/env.py

@@ -2342,6 +2342,61 @@ def ensure_repo(
     _run(cmd)
 
 
+def _assert_branch_can_fast_forward(repo_dir: Path, branch: str) -> None:
+    """Do not replace a local branch containing commits absent from origin.
+
+    A clean working tree does not imply that all local commits were pushed.
+    Resetting the branch with ``checkout -B`` would otherwise discard its tip.
+    Check the named branch (not HEAD, which might be another branch).
+    """
+    local_ref = f"refs/heads/{branch}"
+    remote_ref = f"refs/remotes/origin/{branch}"
+    present = subprocess.run(
+        ["git", "show-ref", "--verify", "--quiet", local_ref],
+        cwd=str(repo_dir), capture_output=True, text=True,
+    )
+    if present.returncode == 1:
+        return  # No existing local branch to overwrite.
+    if present.returncode != 0:
+        raise Exception(f"Failed to inspect local Git branch {branch!r} in {repo_dir}: {present.stderr}")
+
+    def is_fast_forward() -> bool:
+        check = subprocess.run(
+            ["git", "merge-base", "--is-ancestor", local_ref, remote_ref],
+            cwd=str(repo_dir), capture_output=True, text=True,
+        )
+        if check.returncode not in (0, 1):
+            raise Exception(f"Failed to compare Git branches in {repo_dir}: {check.stderr}")
+        return check.returncode == 0
+
+    if is_fast_forward():
+        return
+
+    # With a shallow checkout, the remote tip may have advanced beyond our
+    # shallow boundary. Fetch just enough ancestry to distinguish a normal
+    # fast-forward from unpublished local commits; fail closed if still unsure.
+    if _is_shallow_repo(repo_dir):
+        refspec = f"+refs/heads/{branch}:{remote_ref}"
+        for deepen_by in (1, 8, 32, 128, 512):
+            _run(["git", "fetch", "--deepen", str(deepen_by), "origin", refspec], cwd=repo_dir)
+            if is_fast_forward():
+                return
+            if not _is_shallow_repo(repo_dir):
+                break
+        if _is_shallow_repo(repo_dir):
+            _run(["git", "fetch", "--unshallow", "origin", refspec], cwd=repo_dir)
+            if is_fast_forward():
+                return
+
+    raise Exception(
+        f"Refusing to reset local Git branch {branch!r} in {repo_dir}: "
+        f"it contains commits that are not on origin/{branch} "
+        "(or the remote branch history diverged).\n"
+        "Your commits are preserved. Inspect `git log` and `git status`, "
+        "then push, rebase or resolve the divergence manually before syncing."
+    )
+
+
 def checkout_branch(
         dest: Path,
         branch: str,
@@ -2356,8 +2411,9 @@ def checkout_branch(
       This matches the previous behavior and is suitable for full clones (e.g. addons).
 
     - fetch_all=False: fetch ONLY `origin/<branch>` (optionally shallow via depth),
-      then force local branch `<branch>` to match `origin/<branch>`.
+      then fast-forward the local branch to `origin/<branch>`.
       This is intended for the Odoo repo where we want single-branch + shallow clones.
+    - Local commits absent from the remote are never silently discarded.
     - already_fetched=True: reuse the fetch performed by ensure_repo() instead
       of fetching the same branch again.
     """
@@ -2372,29 +2428,16 @@ def checkout_branch(
                 _ensure_full_origin_refspec(dest)
                 _unshallow_if_needed(dest)
             _run(["git", "fetch", "--all", "--tags", "--prune"], cwd=dest)
+    else:
+        # Narrow fetch: ensure origin/<branch> exists even if origin was cloned
+        # with --single-branch and has a restricted remote.origin.fetch refspec.
+        # ensure_repo() already fetched this ref when already_fetched=True.
+        if not already_fetched:
+            _fetch_branch(dest, branch=branch, depth=depth)
 
-        try:
-            _run(["git", "rev-parse", "--verify", f"origin/{branch}"], cwd=dest)
-            _run(["git", "checkout", "-B", branch, f"origin/{branch}"], cwd=dest)
-            assert_clean_worktree(dest)
-            _run(["git", "pull", "--ff-only"], cwd=dest)
-            return
-        except:
-            pass
-
-        _run(["git", "checkout", branch], cwd=dest)
-        return
-
-    # Narrow fetch: ensure origin/<branch> exists even if origin was cloned
-    # with --single-branch and has a restricted remote.origin.fetch refspec.
-    # ensure_repo() already fetched this ref when already_fetched=True.
-    if not already_fetched:
-        _fetch_branch(dest, branch=branch, depth=depth)
-
-    _run(["git", "rev-parse", "--verify", f"origin/{branch}"], cwd=dest)
+    _run(["git", "rev-parse", "--verify", f"refs/remotes/origin/{branch}"], cwd=dest)
+    _assert_branch_can_fast_forward(dest, branch)
     _run(["git", "checkout", "-B", branch, f"origin/{branch}"], cwd=dest)
-    # Ensure the working tree exactly matches the remote branch (no pull, no extra refs).
-    _run(["git", "reset", "--hard", f"origin/{branch}"], cwd=dest)
     assert_clean_worktree(dest)
 
 
@@ -5493,8 +5536,8 @@ def build_parser(prog: str = "odoo-compose", target: str = "docker", *, setup_co
         epilog = """Create or update an Odoo Docker workspace.
 
 Examples:
-  odoo-compose setup ./odoo19 --sync-addons
-  odoo-compose setup --sync-all --create-docker-deploy
+  odoo-compose setup ./odoo19 --sync
+  odoo-compose setup --sync --create-docker-deploy
   odoo-compose setup ./odoo-project.ini --show-last-run
 """
     else:
@@ -5502,8 +5545,8 @@ Examples:
 The virtual environment is recreated only when explicitly requested.
 
 Examples:
-  odoo-compose-venv setup ./odoo19 --sync-all --create-venv
-  odoo-compose-venv setup -i base.ini -i addons.ini --sync-all --create-venv
+  odoo-compose-venv setup ./odoo19 --sync --create-venv
+  odoo-compose-venv setup -i base.ini -i addons.ini --sync --create-venv
   odoo-compose-venv setup --create-from-bundle ./workspace.odt.zip --root ./restored
 """
 
@@ -5561,6 +5604,11 @@ Examples:
     )
 
     sync_group = parser.add_mutually_exclusive_group()
+    sync_group.add_argument(
+        "--sync", action="store_true",
+        help=("Sync Git sources used by this workflow: Odoo for native venv or Docker "
+              "odoo_source=workspace, plus configured Git addons"),
+    )
     sync_group.add_argument("--sync-odoo", dest="odoo", action="store_true", help="Sync only Odoo repository")
     sync_group.add_argument("--sync-addons", dest="addons", action="store_true", help="Sync only addon repositories")
     sync_group.add_argument("--sync-all", dest="all", action="store_true", help="Sync Odoo + addons")
@@ -7077,8 +7125,8 @@ def main(target: str = "docker", prog: str = "odoo-compose") -> None:
             conflicting_options.append("INI")
         if getattr(args, 'include_inis', None):
             conflicting_options.append("--include")
-        if args.all or args.odoo or args.addons:
-            conflicting_options.append("--sync-*")
+        if args.sync or args.all or args.odoo or args.addons:
+            conflicting_options.append("--sync*")
         if bool(getattr(args, 'create_venv', False)) or create_venv_from_wheelhouse:
             conflicting_options.append("--create-venv*")
         if clear_pip_wheel_cache:
@@ -7348,7 +7396,27 @@ def main(target: str = "docker", prog: str = "odoo-compose") -> None:
                     f"explicit local INI source was used; no existing ROOT/{_DEFAULT_PROJECT_INI_NAME}"
                 )
 
-    if args.all:
+    if args.sync:
+        # Select only the Git sources required by the effective workspace.
+        # Use the merged/resolved INI so --include, --set and -e affect selection.
+        try:
+            sync_cfg = load_project_config(
+                ini_path, vars_overrides=vars_overrides, ini_overrides=ini_overrides,
+                log_resolved=False, log_overrides=False,
+            )
+        except Exception as e:
+            _logger.error('%s', e)
+            raise SystemExit(1)
+        sync_odoo = (
+            not sync_cfg.odoo.is_local
+            and (target == "venv" or _docker_uses_workspace_odoo(sync_cfg))
+        )
+        sync_addons = any(not addon.is_local for addon in sync_cfg.addons.values())
+        _logger.info(
+            "Auto sync (--sync): Odoo Git=%s, addon Git=%s",
+            sync_odoo, sync_addons,
+        )
+    elif args.all:
         sync_odoo, sync_addons = True, True
     elif args.odoo:
         sync_odoo, sync_addons = True, False

{odoo_devops_tools-1.25.2 → odoo_devops_tools-1.25.4}/odoo_devops_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.25.2
+Version: 1.25.4
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -145,8 +145,8 @@ Add-Content -Path $PROFILE -Value 'odoo-compose-venv completion powershell | Out
 ```
 
 Restart your shell or reload its configuration to activate completion. For example,
-`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync-odoo`,
-`--sync-addons`, and `--sync-all`.
+`odoo-compose setup --sy<TAB>` suggests matching options such as `--sync`,
+`--sync-odoo`, `--sync-addons`, and `--sync-all`.
 
 ---
 
@@ -216,7 +216,7 @@ branch = ${odoo:version}
 Sync the addon repositories and regenerate the Docker environment:
 
 ```bash
-odoo-compose setup --sync-addons
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -255,7 +255,7 @@ odoo_source = workspace
 Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
-odoo-compose setup --sync-all
+odoo-compose setup --sync
 odoo-compose up --build
 ```
 
@@ -329,13 +329,13 @@ Use `--create-docker-deploy` to generate a self-contained Docker build context f
 Addon modules are staged into the build context so the resulting image does not depend on bind-mounted workspace sources:
 
 ```bash
-odoo-compose setup --sync-addons --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 When `[docker].odoo_source = workspace`, sync the Odoo source as well:
 
 ```bash
-odoo-compose setup --sync-all --create-docker-deploy
+odoo-compose setup --sync --create-docker-deploy
 ```
 
 This additionally creates:
@@ -364,7 +364,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv \
+odoo-compose-venv setup ./odoo19 --sync --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -423,7 +423,7 @@ branch = ${odoo:version}
 Sync the addon repositories and recreate the Python environment to include their dependencies:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 The repositories are cloned into `ROOT/odoo-addons/` and automatically added to the generated `addons_path`. Python dependencies from their `requirements.txt` files are included in the virtual environment.
@@ -467,7 +467,7 @@ python_version = 3.11
 After changing the project file, run `odoo-compose` again from the workspace root:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv
+odoo-compose-venv setup --sync --create-venv
 ```
 
 This recreates the virtual environment at `ROOT/venv` using the system Python.
@@ -557,7 +557,7 @@ Those machine-specific outputs are recreated on the target machine.
 On an internet-connected build machine, sync the sources, build the wheelhouse, and create the bundle in one command:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle
 ```
 
 When no output path is supplied, the bundle is written to:
@@ -569,7 +569,7 @@ ROOT/dist/ROOT-NAME.odt.zip
 You can also select an explicit output file:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
+odoo-compose-venv setup --sync --create-venv --create-bundle ./artifacts/odoo18-production.odt.zip
 ```
 
 #### 4.1.1. Including uncommitted changes
@@ -579,7 +579,7 @@ By default, bundle creation stops when a bundled Git repository has uncommitted
 To intentionally include those changes in the bundle, use:
 
 ```bash
-odoo-compose-venv setup --sync-all --create-venv --create-bundle --allow-dirty-bundle
+odoo-compose-venv setup --sync --create-venv --create-bundle --allow-dirty-bundle
 ```
 
 ### 4.2. Create the workspace on the target machine
@@ -776,6 +776,9 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 **Repository synchronization**
 
 <dl class="cli-reference">
+<dt><code>--sync</code></dt>
+<dd><p>Automatically synchronize only the Git sources used by the selected workflow. In Docker, Odoo is synced only with <code>[docker].odoo_source = workspace</code>; in Venv, Git-managed Odoo is synced. Both workflows sync configured Git addons.</p></dd>
+
 <dt><code>--sync-odoo</code></dt>
 <dd><p>Sync Git-managed Odoo sources; reuse <code>[odoo].path</code> without Git sync when a local path is configured.</p></dd>
 
@@ -783,10 +786,10 @@ Git source syntax: `git+REPO_URL//PATH/TO/PROJECT.ini?ref=REF`.
 <dd><p>Sync Git-managed addons into <code>ROOT/odoo-addons/</code>.</p></dd>
 
 <dt><code>--sync-all</code></dt>
-<dd><p>Sync both Odoo and addons.</p></dd>
+<dd><p>Explicitly select both Odoo and addon sources, regardless of the selected workflow. Unlike <code>--sync</code>, this can fetch Odoo sources even when Docker runs Odoo from the base image.</p></dd>
 
 > **Note:**
-> Repository sync aborts if a target Git repository has uncommitted changes. Commit, stash or discard changes before syncing.
+> Repository sync aborts if a target Git repository has uncommitted changes **or a local branch contains commits absent from the remote branch**. Commit/stash uncommitted changes or push/reconcile unpublished commits before syncing. The four sync switches are mutually exclusive; without any of them, <code>setup</code> only regenerates artifacts and does not fetch repositories.
 
 </dl>
 
@@ -829,7 +832,7 @@ odoo-compose setup ./odoo19
 odoo-compose setup ./odoo18 --set odoo:version=18.0
 
 # Native workflow:
-odoo-compose-venv setup ./odoo19 --sync-all --create-venv
+odoo-compose-venv setup ./odoo19 --sync --create-venv
 odoo-compose-venv setup ./odoo18 --set odoo:version=18.0 --sync-all --create-venv
 ```
 

{odoo_devops_tools-1.25.2 → odoo_devops_tools-1.25.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odoo-devops-tools"
-version = "1.25.2"
+version = "1.25.4"
 description = "Build reproducible Odoo workspaces from a single project definition."
 readme = "README.md"
 license = "MIT"

odoo_devops_tools-1.25.2/odoo_devops_tools/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.25.2"