@codebend3r/che 1.2.0 → 1.2.2

package/bin/git/sync-all-branches.py

@@ -1,42 +1,35 @@
 #!/usr/bin/env python3
-"""🔄 Sync every branch: delete merged ones, rebase the rest, check out new ones.
+"""🔄 Update every branch and worktree, keeping checkouts, locks and local work.
 
-Steps, in order:
-  1. Switch the main clone to the main branch
-  2. Fetch + prune every remote, once for the whole run
-  3. clean-stale-branches   (delete branches whose upstream is gone)
-  4. update-local-branches  (rebase every branch onto its upstream)
-  5. checkout-my-branches   (track your remote branches that aren't local)
-
-Only branches change. It never pushes, never adds, removes or prunes a
-worktree, and never runs a repo's git hooks: pushing and worktrees are the
-user's call, and a lefthook or husky pre-commit or pre-push gates the user's
-own work, not this bookkeeping. A branch checked out in a linked worktree is
-rebased in place there; a stale one is reported, not deleted. The main clone
-ends on main: new branches are created without being checked out.
+Fetch once, rebase branches onto their upstream (or origin/<branch>), and track
+new origin branches authored by you. Dirty tracked/untracked work is saved in
+an exact recovery stash and restored with its index. Conflicts are reported;
+independent branches continue. Nothing is pushed, hard reset or deleted.
 
 Usage:
   sync-all-branches.py [--dry-run] [--author=EMAIL] [--limit=N]
 
 Options:
-  --dry-run        Report what would be deleted / synced, change nothing
-  --author=EMAIL   Passed through to checkout-my-branches
-  --limit=N        Passed through to checkout-my-branches
+  --dry-run        Preview cached refs only; no fetch or changes
+  --author=EMAIL   Author of new origin branches (default: git config user.email)
+  --limit=N        Recent origin refs to scan for new branches (default: 100)
   --help           Show help
 
 Env:
-  DRY_RUN=true     Same as --dry-run (used by the .zshrc -dr wrapper)
+  DRY_RUN=true     Same as --dry-run (used by the shell -dr wrapper)
 """
 
 from __future__ import annotations
 
 import argparse
+import subprocess
 import sys
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
-from gitutils import fetch_remotes, park_main_worktree, skip_git_hooks
+from branchsync import BranchSync
+from gitutils import current_branch, fetch_remotes, for_each_ref, local_branches, skip_git_hooks
 from utils import (
     add_bool_flag,
     build_parser,
@@ -44,94 +37,108 @@ from utils import (
     heading,
     info,
     log,
+    parse_count,
     require_binary,
     run,
     run_cli,
+    run_output,
+    warning,
 )
 
-__version__ = "2.1.0"
-
-SCRIPT_DIR = Path(__file__).resolve().parent
-
-
-def delegate(script: str, args: list[str], *, cwd: Path) -> None:
-    """Run a sibling script in the main worktree, aborting the sync if it fails.
+__version__ = "3.0.0"
 
-    The shell version invoked these under ``set -e``, so a non-zero exit from
-    any of them ended the run. ``check=True`` reproduces that: a branch that
-    could not be rebased is a reason to stop and look, not to sail on.
 
-    The blank line before each one is flushed: a child writes straight to the
-    shared stdout, so an unflushed separator would surface after its output
-    whenever the sync is piped.
-    """
-    print(flush=True)
-    run([sys.executable, str(SCRIPT_DIR / script), *args], cwd=cwd)
+def track_new(sync: BranchSync, author: str, limit: int) -> list[str]:
+    tracked: list[str] = []
+    local = {branch for (branch,) in local_branches(cwd=sync.root)}
+    refs = for_each_ref(
+        "refs/remotes/origin/",
+        "authoremail:trim",
+        "refname:lstrip=3",
+        "symref",
+        sort="-committerdate",
+        cwd=sync.root,
+    )
+    for email, branch, symref in refs[:limit]:
+        if symref or email != author or branch in local:
+            continue
+        if sync.dry_run:
+            info(f"🌵 Would track: {branch}")
+            continue
+        if run(
+            ["git", "branch", "--track", branch, f"refs/remotes/origin/{branch}"],
+            cwd=sync.root,
+            check=False,
+        ).returncode:
+            sync.block(branch, "could not create tracking branch")
+        else:
+            tracked.append(branch)
+    return tracked
 
 
 def main(argv: list[str] | None = None) -> int:
     parser = build_parser(
         prog="sync-all-branches",
-        description="🔄 Delete merged branches, rebase the rest, check out new ones.",
+        description="🔄 Update every branch and worktree, preserving locks and local work.",
     )
     add_bool_flag(
         parser,
         "--dry-run",
         default=env_bool("DRY_RUN", False),
-        help="Report what would be deleted / synced, change nothing",
+        help="Preview cached refs only; no fetch or changes",
     )
-    # Accepted and ignored, from when the sync pushed and collapsed worktrees:
-    # chip's "Update from Origin" still passes --no-push and must keep running.
+    # Compatibility with chip and older wrappers. Neither pushing nor lock
+    # removal is ever part of syncing, regardless of these legacy flags.
     add_bool_flag(parser, "--no-push", allow_value=False, help=argparse.SUPPRESS)
     add_bool_flag(parser, "--keep-locked", help=argparse.SUPPRESS)
     parser.add_argument(
         "--author",
         default="",
         metavar="EMAIL",
-        help="Passed through to checkout-my-branches",
+        help="Author of new origin branches (default: git config user.email)",
     )
     parser.add_argument(
         "--limit",
-        default="",
+        default="100",
         metavar="N",
-        help="Passed through to checkout-my-branches",
+        help="Recent origin refs to scan for new branches (default: 100)",
     )
     args = parser.parse_args(argv)
-
+    limit = parse_count(args.limit, "--limit", minimum=1)
     require_binary("git")
     skip_git_hooks()
-
     heading("🔄  sync-all-branches", dry_run=args.dry_run)
-
-    # Every later step runs from the main worktree, because the delegated
-    # scripts expect the main clone. Passing cwd= to each call rather than
-    # `cd`-ing keeps the process's own directory untouched.
-    main_wt = park_main_worktree("sync", dry_run=args.dry_run)
-
-    # The one fetch of the run. Each delegated script fetches when run on its
-    # own; here they inherit the marker fetch_remotes leaves and skip theirs.
-    fetch_remotes()
-
-    # Dry-run travels as an explicit --dry-run=true|false, never as DRY_RUN in
-    # the environment, so a child can never disagree with the parent about
-    # which mode this is - whatever DRY_RUN it inherited.
-    mode = [f"--dry-run={'true' if args.dry_run else 'false'}"]
-    delegate("clean-stale-branches.py", mode, cwd=main_wt)
-    delegate("update-local-branches.py", mode, cwd=main_wt)
-
-    checkout_args = []
-    if args.author:
-        checkout_args.append(f"--author={args.author}")
-    if args.limit:
-        checkout_args.append(f"--limit={args.limit}")
-
+    if run_output(["git", "rev-parse", "--is-inside-work-tree"], check=False) != "true":
+        warning("❌ Not inside a git working tree.")
+        return 1
+    root = Path(run_output(["git", "rev-parse", "--show-toplevel"]))
+    author = args.author or run_output(["git", "config", "user.email"], cwd=root, check=False)
+    if not author:
+        warning("❌ No author email; pass --author=EMAIL or set git config user.email.")
+        return 1
+    original = current_branch(root) or run_output(["git", "rev-parse", "--short", "HEAD"], cwd=root)
+    info(f"📍 Keeping caller checkout: {original}")
+    # DELIBERATE DIVERGENCE: the old sync parked on main and delegated cleanup.
+    # Preserve active workspaces instead, and never discard a gone-upstream
+    # branch merely because its remote was deleted. Dry-run must not fetch.
     if args.dry_run:
-        print(flush=True)
-        info(f"🌵 Would run: checkout-my-branches {' '.join(checkout_args)}".rstrip())
+        info("🌵 Cached remote refs only; no fetch. Results reflect the last fetch.")
     else:
-        delegate("checkout-my-branches.py", checkout_args, cwd=main_wt)
-
-    log("🎉 Sync complete.")
+        fetch_remotes()
+    sync = BranchSync(root, args.dry_run)
+    sync.update()
+    try:
+        tracked = track_new(sync, author, limit)
+    except (subprocess.CalledProcessError, OSError) as exc:
+        sync.block("new origin branches", str(exc))
+        tracked = []
+    sync.summary(tracked)
+    if sync.blocked:
+        warning(
+            "Sync partially completed; blocked branches need attention. Remaining independent branches were attempted."
+        )
+        return 1
+    log("🎉 Preview complete." if args.dry_run else "🎉 Sync complete.")
     return 0
 
 

package/bin/gitutils.py

@@ -150,12 +150,12 @@ def worktrees(cwd: str | Path | None = None) -> list[Worktree]:
     The first entry is always the main worktree; callers drop it themselves so
     the distinction stays explicit at the call site.
 
-    The shell version parsed this with ``awk '{print $2}'``, which splits on
-    whitespace and so truncated any worktree path containing a space. Taking
-    the whole remainder of the line keeps such paths intact.
+    DELIBERATE DIVERGENCE: the shell version split on whitespace. NUL-delimited
+    porcelain preserves spaces, tabs, backslashes and newlines in paths without
+    Git's quoted-path escaping, so commands can route to the exact checkout.
     """
     found: list[Worktree] = []
-    for line in run_output(["git", "worktree", "list", "--porcelain"], cwd=cwd).splitlines():
+    for line in run_output(["git", "worktree", "list", "--porcelain", "-z"], cwd=cwd).split("\0"):
         if line.startswith("worktree "):
             found.append(Worktree(line.removeprefix("worktree "), ""))
         elif line.startswith("branch refs/heads/"):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebend3r/che",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Helper scripts shared across machines, called by name from your shell and browsable through one menu",
   "keywords": [
     "cli",

package/shell/che.bash

@@ -1,4 +1,4 @@
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -59,7 +59,8 @@ _che_restore_aliases() {
 
 _che_stash_aliases che_notify che all-actions all-actions-watch \
   checkout-my-branches clean-stale-branches clean-stale-branches-dr \
-  prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr \
+  hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees \
+  prune-worktrees-dr sync-all-branches sync-all-branches-dr \
   update-from-origin update-local-branches show-codecs fix-codecs \
   fix-codecs-dr find-video-mkv-issues validate-video-files \
   scan-videos-audio-language remove-metadata rename-video-file \
@@ -126,6 +127,18 @@ clean-stale-branches-dr() {
   che_notify 7 $?
 }
 
+# Check out every local branch and hard reset it to origin/<branch>
+hard-reset-all-branches() {
+  DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 4 $?
+}
+
+# Check out every local branch and hard reset it to origin/<branch> (preview only)
+hard-reset-all-branches-dr() {
+  DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 7 $?
+}
+
 # Remove every linked worktree, then prune stale admin records
 prune-worktrees() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" "$@"
@@ -138,13 +151,13 @@ prune-worktrees-dr() {
   che_notify 7 $?
 }
 
-# Delete merged branches, rebase the rest, check out new ones; branches only
+# Update every branch and worktree, preserving locks and local work
 sync-all-branches() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?
 }
 
-# Delete merged branches, rebase the rest, check out new ones; branches only (preview only)
+# Update every branch and worktree, preserving locks and local work (preview only)
 sync-all-branches-dr() {
   DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?

package/shell/che.fish

@@ -1,4 +1,4 @@
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -68,6 +68,16 @@ function clean-stale-branches-dr --description 'Delete local branches whose upst
     che_notify 7 $status
 end
 
+function hard-reset-all-branches --description 'Check out every local branch and hard reset it to origin/<branch>'
+    env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" $argv
+    che_notify 4 $status
+end
+
+function hard-reset-all-branches-dr --description 'Check out every local branch and hard reset it to origin/<branch> (preview only)'
+    env DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" $argv
+    che_notify 7 $status
+end
+
 function prune-worktrees --description 'Remove every linked worktree, then prune stale admin records'
     env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" $argv
     che_notify 4 $status
@@ -78,12 +88,12 @@ function prune-worktrees-dr --description 'Remove every linked worktree, then pr
     che_notify 7 $status
 end
 
-function sync-all-branches --description 'Delete merged branches, rebase the rest, check out new ones; branches only'
+function sync-all-branches --description 'Update every branch and worktree, preserving locks and local work'
     env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" $argv
     che_notify 7 $status
 end
 
-function sync-all-branches-dr --description 'Delete merged branches, rebase the rest, check out new ones; branches only (preview only)'
+function sync-all-branches-dr --description 'Update every branch and worktree, preserving locks and local work (preview only)'
     env DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" $argv
     che_notify 7 $status
 end

package/shell/che.zsh

@@ -1,4 +1,4 @@
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -65,7 +65,8 @@ _che_restore_aliases() {
 
 _che_stash_aliases che_notify che all-actions all-actions-watch \
   checkout-my-branches clean-stale-branches clean-stale-branches-dr \
-  prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr \
+  hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees \
+  prune-worktrees-dr sync-all-branches sync-all-branches-dr \
   update-from-origin update-local-branches show-codecs fix-codecs \
   fix-codecs-dr find-video-mkv-issues validate-video-files \
   scan-videos-audio-language remove-metadata rename-video-file \
@@ -132,6 +133,18 @@ clean-stale-branches-dr() {
   che_notify 7 $?
 }
 
+# Check out every local branch and hard reset it to origin/<branch>
+hard-reset-all-branches() {
+  DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 4 $?
+}
+
+# Check out every local branch and hard reset it to origin/<branch> (preview only)
+hard-reset-all-branches-dr() {
+  DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 7 $?
+}
+
 # Remove every linked worktree, then prune stale admin records
 prune-worktrees() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" "$@"
@@ -144,13 +157,13 @@ prune-worktrees-dr() {
   che_notify 7 $?
 }
 
-# Delete merged branches, rebase the rest, check out new ones; branches only
+# Update every branch and worktree, preserving locks and local work
 sync-all-branches() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?
 }
 
-# Delete merged branches, rebase the rest, check out new ones; branches only (preview only)
+# Update every branch and worktree, preserving locks and local work (preview only)
 sync-all-branches-dr() {
   DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?

package/shell/completions/_che

@@ -1,5 +1,5 @@
 #compdef che
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -11,6 +11,8 @@ _che_flags_for() {
     checkout-my-branches) print -r -- '--author= --limit= --help' ;;
     clean-stale-branches) print -r -- '--dry-run --protect= --help' ;;
     clean-stale-branches-dr) print -r -- '--dry-run --protect= --help' ;;
+    hard-reset-all-branches) print -r -- '--dry-run --force --help' ;;
+    hard-reset-all-branches-dr) print -r -- '--dry-run --force --help' ;;
     prune-worktrees) print -r -- '--dry-run --force --help' ;;
     prune-worktrees-dr) print -r -- '--dry-run --force --help' ;;
     sync-all-branches) print -r -- '--dry-run --author= --limit= --help' ;;
@@ -83,10 +85,12 @@ _che() {
     'checkout-my-branches:Check out recent remote branches you authored that aren'"'"'t local yet'
     'clean-stale-branches:Delete local branches whose upstream is gone'
     'clean-stale-branches-dr:Delete local branches whose upstream is gone (preview)'
+    'hard-reset-all-branches:Check out every local branch and hard reset it to origin/<branch>'
+    'hard-reset-all-branches-dr:Check out every local branch and hard reset it to origin/<branch> (preview)'
     'prune-worktrees:Remove every linked worktree, then prune stale admin records'
     'prune-worktrees-dr:Remove every linked worktree, then prune stale admin records (preview)'
-    'sync-all-branches:Delete merged branches, rebase the rest, check out new ones; branches only'
-    'sync-all-branches-dr:Delete merged branches, rebase the rest, check out new ones; branches only (preview)'
+    'sync-all-branches:Update every branch and worktree, preserving locks and local work'
+    'sync-all-branches-dr:Update every branch and worktree, preserving locks and local work (preview)'
     'update-from-origin:Alias of sync-all-branches'
     'update-local-branches:Rebase every local branch that has an upstream onto origin'
     'show-codecs:Report media files outside the Direct Play codec/container set'
@@ -143,4 +147,4 @@ _che_wrapper() {
 }
 
 compdef _che che
-compdef _che_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop
+compdef _che_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop

package/shell/completions/che.bash

@@ -1,4 +1,4 @@
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -11,6 +11,8 @@ _che_flags_for() {
     checkout-my-branches) echo "--author= --limit= --help" ;;
     clean-stale-branches) echo "--dry-run --protect= --help" ;;
     clean-stale-branches-dr) echo "--dry-run --protect= --help" ;;
+    hard-reset-all-branches) echo "--dry-run --force --help" ;;
+    hard-reset-all-branches-dr) echo "--dry-run --force --help" ;;
     prune-worktrees) echo "--dry-run --force --help" ;;
     prune-worktrees-dr) echo "--dry-run --force --help" ;;
     sync-all-branches) echo "--dry-run --author= --limit= --help" ;;
@@ -92,7 +94,7 @@ _che_complete() {
   local cur="${COMP_WORDS[COMP_CWORD]}"
 
   if [ "$COMP_CWORD" -eq 1 ]; then
-    _che_reply "" < <(compgen -W "all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop install update doctor uninstall list completions" -- "$cur")
+    _che_reply "" < <(compgen -W "all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop install update doctor uninstall list completions" -- "$cur")
     return
   fi
 
@@ -104,4 +106,4 @@ _che_complete_wrapper() {
 }
 
 complete -o nospace -F _che_complete che
-complete -o nospace -F _che_complete_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop
+complete -o nospace -F _che_complete_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop

package/shell/completions/che.fish

@@ -1,4 +1,4 @@
-# che 1.2.0 - generated file, do not edit.
+# che 1.2.2 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -9,10 +9,12 @@ complete -c che -n __fish_use_subcommand -a all-actions-watch -d 'Same as all-ac
 complete -c che -n __fish_use_subcommand -a checkout-my-branches -d 'Check out recent remote branches you authored that aren\'t local yet'
 complete -c che -n __fish_use_subcommand -a clean-stale-branches -d 'Delete local branches whose upstream is gone'
 complete -c che -n __fish_use_subcommand -a clean-stale-branches-dr -d 'Delete local branches whose upstream is gone (preview)'
+complete -c che -n __fish_use_subcommand -a hard-reset-all-branches -d 'Check out every local branch and hard reset it to origin/<branch>'
+complete -c che -n __fish_use_subcommand -a hard-reset-all-branches-dr -d 'Check out every local branch and hard reset it to origin/<branch> (preview)'
 complete -c che -n __fish_use_subcommand -a prune-worktrees -d 'Remove every linked worktree, then prune stale admin records'
 complete -c che -n __fish_use_subcommand -a prune-worktrees-dr -d 'Remove every linked worktree, then prune stale admin records (preview)'
-complete -c che -n __fish_use_subcommand -a sync-all-branches -d 'Delete merged branches, rebase the rest, check out new ones; branches only'
-complete -c che -n __fish_use_subcommand -a sync-all-branches-dr -d 'Delete merged branches, rebase the rest, check out new ones; branches only (preview)'
+complete -c che -n __fish_use_subcommand -a sync-all-branches -d 'Update every branch and worktree, preserving locks and local work'
+complete -c che -n __fish_use_subcommand -a sync-all-branches-dr -d 'Update every branch and worktree, preserving locks and local work (preview)'
 complete -c che -n __fish_use_subcommand -a update-from-origin -d 'Alias of sync-all-branches'
 complete -c che -n __fish_use_subcommand -a update-local-branches -d 'Rebase every local branch that has an upstream onto origin'
 complete -c che -n __fish_use_subcommand -a show-codecs -d 'Report media files outside the Direct Play codec/container set'
@@ -74,6 +76,10 @@ complete -c che -n "__fish_seen_subcommand_from clean-stale-branches" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches" -l protect -r
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches-dr" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches-dr" -l protect -r
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches" -l dry-run
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches" -l force
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches-dr" -l dry-run
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches-dr" -l force
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees" -l force
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees-dr" -l dry-run
@@ -233,6 +239,10 @@ complete -c clean-stale-branches -l dry-run
 complete -c clean-stale-branches -l protect -r
 complete -c clean-stale-branches-dr -l dry-run
 complete -c clean-stale-branches-dr -l protect -r
+complete -c hard-reset-all-branches -l dry-run
+complete -c hard-reset-all-branches -l force
+complete -c hard-reset-all-branches-dr -l dry-run
+complete -c hard-reset-all-branches-dr -l force
 complete -c prune-worktrees -l dry-run
 complete -c prune-worktrees -l force
 complete -c prune-worktrees-dr -l dry-run