strategic update

Author: f5epcim

Crossfile

@@ -2,12 +2,12 @@
 # This is an example Crossfile, see more under `./examples`
 
 # define upstream repos
-use git-cross https://github.com/epcim/git-cross.git
+cross use git-cross https://github.com/epcim/git-cross.git
 
 # patch their paths to local
-patch git-cross:. vendor/git-cross
-sync
+cross patch git-cross:. vendor/git-cross
+cross sync
 
-# git remote -v | grep fetch | column -t
-# git worktree list
+# cross exec git remote -v | grep fetch | column -t
+# cross exec git worktree list
 

Justfile

@@ -6,6 +6,7 @@ export PATH := env_var('HOME') + "/bin:" + HOMEBREW_PREFIX + "/bin:" + env_var('
 @cross +ARGS:
   just {{ARGS}}
 
+# Auto-setup environment on first use
 # Auto-setup environment on first use
 setup:
     #!/usr/bin/env fish
@@ -16,6 +17,24 @@ setup:
         end
     end
 
+# Show this help message
+help:
+    @echo "git-cross - Vendor parts of git repos into your project"
+    @echo ""
+    @echo "Usage:"
+    @echo "  just <command> [options]"
+    @echo "  ./cross <command> [options]  (wrapper script)"
+    @echo ""
+    @echo "Available commands:"
+    @just --list --unsorted
+    @echo ""
+    @echo "Quick start:"
+    @echo "  1. Add upstream repo:    just use <name> <url>"
+    @echo "  2. Patch directory:      just patch <name>:<path> <local_path>"
+    @echo "  3. Sync from upstream:   just sync"
+    @echo " "
+    @echo "For more details, see README.md"
+
 # Check for required dependencies
 check-deps:
     #!/usr/bin/env fish
@@ -51,13 +70,18 @@ _resolve_context arg_rspec arg_lpath invocation_dir:
     # Check Crossfile for matching local path
     if test -f Crossfile
         while read -l line
-            # Parse: patch <remote>:<path> <local> ...
+            # Parse: [cross] patch <remote>:<path> <local> ...
             set parts (string split " " $line)
-            if test "$parts[1]" = "patch"
-                set p_local $parts[3]
+            set cmd_idx 1
+            if test "$parts[1]" = "cross"
+                set cmd_idx 2
+            end
+            
+            if test "$parts[$cmd_idx]" = "patch"
+                set p_local $parts[(math $cmd_idx + 2)] # Local path is 2 positions after command
                 # Check if CWD is inside the patch local path
                 if string match -q "$p_local*" "$rel_cwd"
-                    set rspec $parts[2]
+                    set rspec $parts[(math $cmd_idx + 1)] # Remote spec is 1 position after command
                     set lpath $p_local
                     echo "$rspec|$lpath"
                     exit 0
@@ -82,117 +106,121 @@ update_crossfile cmd:
         echo "{{cmd}}" >> $CROSSFILE
     end
 
+# Execute arbitrary shell command
+exec +CMD:
+    {{CMD}}
+
 # Add a remote repository
-use name url: check-deps (update_crossfile "use " + name + " " + url)
+use name url: check-deps (update_crossfile "cross use " + name + " " + url)
     echo here\
     @git remote show | grep -q "^{{name}}$" \
       || { git remote add {{name}} {{url}} && echo "Added remote: {{name}} -> {{url}}"; }
 
 # Patch a directory from a remote into a local path
-patch remote_spec local_path branch="master": check-deps (update_crossfile "patch " + remote_spec + " " + local_path + (if branch != "master" { " " + branch } else { "" }))
+patch remote_spec local_path branch="master": check-deps (update_crossfile "cross patch " + remote_spec + " " + local_path + (if branch != "master" { " " + branch } else { "" }))
     #!/usr/bin/env fish
     set parts (string split -m1 : {{remote_spec}})
     set remote $parts[1]
     set remote_path $parts[2]
-    
     test -n "$remote" -a -n "$remote_path" || begin
         echo "Error: Invalid format. Use remote:path"
         exit 1
     end
-    
     git remote show | grep -q "^$remote\$" || begin
         echo "Error: Remote '$remote' not found. Run: just use $remote <url>"
         exit 1
     end
-    
     set hash (echo $remote_path | md5sum | cut -d' ' -f1)
     set wt ".git/cross/worktrees/$remote"_"$hash"
-    
     echo "Setting up hidden worktree at $wt..."
-    
     if not test -d $wt
         mkdir -p (dirname $wt)
-        
         echo "Fetching $remote {{branch}}..."
         git fetch $remote {{branch}}
-        
         git rev-parse --verify "$remote/{{branch}}" >/dev/null || begin
             echo "Error: $remote/{{branch}} does not exist"
             exit 1
         end
-        
         git worktree add --no-checkout -B "cross/$remote/{{branch}}/$hash" $wt "$remote/{{branch}}" >/dev/null 2>&1
-        
         set sparse (git -C $wt rev-parse --git-path info/sparse-checkout)
         mkdir -p (dirname $sparse)
         echo "/$remote_path/" > $sparse
-        
         git -C $wt config core.sparseCheckout true
         git -C $wt read-tree -mu HEAD >/dev/null 2>&1
     end
-    
     echo "Syncing files to {{local_path}}..."
     mkdir -p {{local_path}}
     rsync -av --delete --exclude .git $wt/$remote_path/ {{local_path}}/
-    
     echo "Done. {{local_path}} now contains files from $remote:$remote_path"
 
+# Internal: sync local paths from Crossfile
+_sync_from_crossfile:
+    #!/usr/bin/env fish
+    # Check if Crossfile exists
+    if not test -f Crossfile
+        echo "Note: No Crossfile found. Only worktrees were updated."
+        exit 0
+    end
+    echo "Syncing changes to local paths..."
+    while read -l line
+        set parts (string split " " $line)
+        # Determine if line starts with 'cross' prefix
+        set cmd_idx 1
+        if test "$parts[1]" = "cross"
+            set cmd_idx 2
+        end
+        # Handle 'patch' command: sync worktree to local path
+        if test "$parts[$cmd_idx]" = "patch"
+            set rspec $parts[(math $cmd_idx + 1)]
+            set lpath $parts[(math $cmd_idx + 2)]
+            set rparts (string split -m1 : $rspec)
+            set remote $rparts[1]
+            set rpath $rparts[2]
+            set hash (echo $rpath | md5sum | cut -d' ' -f1)
+            set wt ".git/cross/worktrees/$remote"_"$hash"
+            # Sync only if worktree exists
+            if test -d $wt
+                echo "  $lpath ← $rspec"
+                mkdir -p $lpath
+                rsync -a --delete --exclude .git $wt/$rpath/ $lpath/ >/dev/null 2>&1
+            end
+        # Handle 'exec' command: run post-hooks or custom commands
+        else if test "$parts[$cmd_idx]" = "exec"
+            set cmd_str (string join " " $parts[(math $cmd_idx + 1)..-1])
+            echo "  exec: $cmd_str"
+            eval $cmd_str
+        end
+    end < Crossfile
+    echo "✅ Sync complete"
+
 # Sync all patches from upstream
 sync: check-deps
     #!/usr/bin/env fish
     test -d .git/cross/worktrees || begin
         echo "No worktrees found."
         exit 0
     end
-    
     # First, update all worktrees from upstream
     for wt in .git/cross/worktrees/*
         test -d $wt || continue
         echo "Updating $wt..."
-        
         # Stash local changes if any
         set dirty (git -C $wt status --porcelain)
         if test -n "$dirty"
             echo "Stashing local changes in $wt..."
             git -C $wt stash
         end
-        
         set branch (git -C $wt rev-parse --abbrev-ref HEAD)
         set upstream (git -C $wt rev-parse --abbrev-ref --symbolic-full-name '@{upstream}')
         git -C $wt pull --rebase >/dev/null 2>&1
-        
         # Pop stash if we stashed
         if test -n "$dirty"
             echo "Popping stash in $wt..."
             git -C $wt stash pop
         end
     end
-    
     # Then, sync changes to local paths using Crossfile
-    if test -f Crossfile
-        echo "Syncing changes to local paths..."
-        while read -l line
-            set parts (string split " " $line)
-            if test "$parts[1]" = "patch"
-                set rspec $parts[2]
-                set lpath $parts[3]
-                set rparts (string split -m1 : $rspec)
-                set remote $rparts[1]
-                set rpath $rparts[2]
-                
-                set hash (echo $rpath | md5sum | cut -d' ' -f1)
-                set wt ".git/cross/worktrees/$remote"_"$hash"
-                
-                if test -d $wt
-                    echo "  $lpath ← $rspec"
-                    rsync -a --delete --exclude .git $wt/$rpath/ $lpath/ >/dev/null 2>&1
-                end
-            end
-        end < Crossfile
-        echo "✅ Sync complete"
-    else
-        echo "Note: No Crossfile found. Only worktrees were updated."
-    end
+    just --quiet _sync_from_crossfile
 
 # Diff local vs upstream
 diff arg_rspec="" arg_lpath="": check-deps
@@ -289,9 +317,14 @@ list: check-deps
 
     while read -l line
         set parts (string split " " $line)
-        if test "$parts[1]" = "patch"
-            set remote_spec $parts[2]
-            set local_path $parts[3]
+        set cmd_idx 1
+        if test "$parts[1]" = "cross"
+            set cmd_idx 2
+        end
+
+        if test "$parts[$cmd_idx]" = "patch"
+            set remote_spec $parts[(math $cmd_idx + 1)] # Remote spec
+            set local_path $parts[(math $cmd_idx + 2)] # Local path
             set rparts (string split -m1 : $remote_spec)
             printf "%-20s %-30s %-20s\n" $rparts[1] $rparts[2] $local_path
         end
@@ -310,9 +343,14 @@ status: check-deps
 
     while read -l line
         set parts (string split " " $line)
-        if test "$parts[1]" = "patch"
-            set remote_spec $parts[2]
-            set local_path $parts[3]
+        set cmd_idx 1
+        if test "$parts[1]" = "cross"
+            set cmd_idx 2
+        end
+
+        if test "$parts[$cmd_idx]" = "patch"
+            set remote_spec $parts[(math $cmd_idx + 1)] # Remote spec
+            set local_path $parts[(math $cmd_idx + 2)] # Local path
             set rparts (string split -m1 : $remote_spec)
             set remote $rparts[1]
             set rpath $rparts[2]
@@ -370,8 +408,15 @@ replay: check-deps
             continue
         end
 
-        echo "▶ just $line"
-        just $line
+        # If line starts with "cross", execute it directly via just
+        if string match -q "cross *" $line
+             echo "▶ just $line"
+             just $line
+        else
+             # Backward compatibility for old format (implicit "cross")
+             echo "▶ just cross $line"
+             just cross $line
+        end
     end < Crossfile
 
     echo "✅ Crossfile replay complete"

README.md

@@ -40,9 +40,11 @@ This allows you to "vendor" files from other repositories directly into your sou
 
 ```bash
 cd $YOUR_REPO
+just cross help                                 # Show all commands
 just cross use demo https://github.com/example/demo.git
 just cross patch demo:docs vendor/docs
-just cross [sync|diff|push|list|status|...]
+just cross sync                                 # Update from upstream
+just cross exec just posthook                   # Run post-hooks
 ```
 
 ## Installation
@@ -198,6 +200,60 @@ vendor/docs          Modified        Synced          No
 vendor/ansible/roles Clean           2 behind        No              
 ```
 
+---
+
+#### `exec` - Run Custom Commands
+
+Execute arbitrary shell commands or scripts from your `Crossfile`. Perfect for post-hooks, cleanup tasks, or custom automation:
+
+```bash
+just cross exec <command>
+```
+
+**Example:**
+
+```bash
+# Simple command
+just cross exec echo "Setup complete"
+
+# Run a recipe from your own Justfile
+just cross exec just posthook
+
+# Chain multiple commands
+just cross exec "npm install && npm run build"
+```
+
+**Multiline commands in Crossfile:**
+
+For complex commands, you can use shell escaping or line continuation:
+
+```
+# Crossfile
+cross use demo https://github.com/example/demo.git
+cross patch demo:src vendor/src
+
+# Simple exec
+cross exec echo "Patching complete"
+
+# Multiline via shell continuation
+cross exec sh -c 'echo "Step 1" && echo "Step 2" && echo "Step 3"'
+
+# Call your own Justfile recipes
+cross exec just build
+cross exec just deploy
+```
+
+**Common use cases:**
+
+- **Post-patch hooks**: Run build scripts after vendoring dependencies
+- **Cleanup tasks**: Remove unwanted files or directories  
+- **Custom automation**: Trigger CI/CD pipelines, notifications, etc.
+- **Integration**: Call your project's own `just` recipes or shell scripts
+
+> **Note**: The `exec` command runs in your project's root directory with access to your full shell environment. Commands are executed via `eval` in `fish`.  
+
+---
+
 **Status indicators:**
 
 - **DIFF**: `Clean` | `Modified` | `Missing WT`

TODO.md

@@ -1,6 +1,8 @@
 Known issues:
 
-- re-test `replay` of default Crossfile and add additional test cases
-- patch/replay fails if "vendor" folder dont exist, `patch` function shall create required directories
-- Crossfile commands shall start with "cross"
-- Feature post hook. How to implement some clenaup per "patch". Alt1: Crossfile could be understood as "shell" file. Alt2: we could define post_hooks in Crossfile per patch, and innter would be shell cmds to executed.
+- [x] re-test `replay` of default Crossfile and add additional test cases
+- [x] patch/replay fails if "vendor" folder dont exist, `patch` function shall create required directories
+- [x] Crossfile commands shall start with "cross" (or plugin name). Future: "cross" could be the name of the tracking remote/plugin. `replay` should support 3rd party actions (e.g., `just <plugin> <cmd>`).
+- Crossfile commands shall start with "cross" (or plugin name). Future: "cross" could be the name of the tracking remote/plugin. `replay` should support 3rd party actions (e.g., `just <plugin> <cmd>`).
+- Crossfile commands shall start with "cross" (or plugin name). Future: "cross" could be the name of the tracking remote/plugin. `replay` should support 3rd party actions (e.g., `just <plugin> <cmd>`).
+- [x] Feature post hook: Implemented via `cross exec <cmd>`. User can add `cross exec just posthook` to Crossfile to trigger their own Justfile recipes.

examples/Crossfile-001

@@ -1,7 +1,7 @@
 # upstream
-use khue	https://github.com/khuedoan/homelab
+cross use khue	https://github.com/khuedoan/homelab
 
 # cross patches
 # ex: origin:path/remote/dir [local/path/to/dir] [branch]
-patch khue:/metal       deploy/metal
+cross patch khue:/metal       deploy/metal