gitbash 0.1.0

package/commands/status.sh

@@ -0,0 +1,323 @@
+# Show git status with fzf file selector and diff preview
+status() {
+  # -----------------------------
+  # 0. Check for help flag
+  # -----------------------------
+  if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+    cat << 'EOF'
+Usage: status [OPTIONS]
+
+Interactive git status viewer with fzf.
+Browse uncommitted changes and view diffs in preview pane.
+
+Options:
+  -h, --help    Show this help message
+
+Features:
+  - Lists all modified, staged, and untracked files
+  - Preview shows git diff for each file
+  - Color-coded file status indicators
+  - Supports both staged and unstaged changes
+  - Revert changes to discard modifications
+
+File Status Indicators:
+  M   Modified (unstaged)
+  A   Added (staged)
+  D   Deleted
+  R   Renamed
+  ??  Untracked
+
+Navigation:
+  ↑/↓ or j/k    Navigate through files
+  TAB           Select/deselect file (multi-select)
+  Enter         Toggle staging for selected file(s)
+  Ctrl-R        Revert changes (discard modifications)
+  ESC/Ctrl-C    Exit
+
+Examples:
+  $ status
+  Git Status >
+  > M  src/app.js
+    A  src/new-feature.js
+    ?? temp.txt
+    M  README.md
+
+  # Preview shows diff of selected file
+  # Navigate with arrow keys or j/k
+
+Requirements:
+  - Must be in a git repository
+  - fzf (fuzzy finder) - will prompt to install if not found
+
+Notes:
+  - Staged changes show diff with --cached
+  - Unstaged changes show working tree diff
+  - Untracked files show file contents
+  - Empty status means working tree is clean
+
+EOF
+    return 0
+  fi
+
+  # -----------------------------
+  # 1. Check prerequisites
+  # -----------------------------
+  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    echo "Not inside a git repository."
+    return 1
+  fi
+
+  if ! command -v fzf >/dev/null 2>&1; then
+    echo "fzf is not installed."
+
+    # Ask whether to install with Homebrew
+    read -rp "Install fzf with Homebrew? (y/N): " ans
+    case "$ans" in
+      [yY][eE][sS]|[yY])
+        echo "Installing fzf with brew..."
+        if ! command -v brew >/dev/null 2>&1; then
+          echo "Homebrew is not installed. Aborting."
+          return 1
+        fi
+        brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
+        # Optional: install shell integrations automatically
+        if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
+          echo "Running fzf install script..."
+          yes | "$(brew --prefix)/opt/fzf/install"
+        fi
+        ;;
+      *)
+        echo "Aborted (skipped fzf installation)."
+        return 1
+        ;;
+    esac
+  fi
+
+  # -----------------------------
+  # 2. Get git status and format with staging info
+  # -----------------------------
+  local status_output
+  status_output=$(git status --short | awk '{
+    index_status = substr($0, 1, 1);
+    work_status = substr($0, 2, 1);
+    file = substr($0, 4);
+    
+    # Determine staging status
+    if (index_status ~ /[MADRC]/) {
+      staged = "[STAGED]";
+    } else if (work_status == "?" || index_status == "?") {
+      staged = "[UNTRACKED]";
+    } else {
+      staged = "[UNSTAGED]";
+    }
+    
+    printf "%-12s %s %s\n", staged, substr($0, 1, 2), file;
+  }')
+
+  if [[ -z "$status_output" ]]; then
+    echo "Working tree clean - no changes to display."
+    return 0
+  fi
+
+  # -----------------------------
+  # 3. Run fzf with diff preview in a loop
+  # -----------------------------
+  while true; do
+    local selected_output
+    selected_output=$(
+      echo "$status_output" | fzf \
+        --height=100% \
+        -i \
+        --reverse \
+        --border \
+        --prompt="Git Status > " \
+        --header="[Enter] toggle stage | [Ctrl-r] revert | [TAB] multi-select | [ESC] exit" \
+        --multi \
+        --ansi \
+        --expect=ctrl-r \
+        --preview='
+          file=$(echo {} | awk "{print \$NF}");
+          file_status=$(echo {} | awk "{print \$2}");
+          
+          # Show diff based on file status
+          if [[ "$file_status" == "??" ]]; then
+            # Untracked file - show contents
+            echo "=== UNTRACKED FILE ===";
+            echo;
+            bat --color=always --style=numbers "$file" 2>/dev/null || cat "$file" 2>/dev/null || echo "Cannot preview file";
+          elif [[ "$file_status" =~ ^[MAC] ]]; then
+            # Staged file - show cached diff
+            echo "=== STAGED CHANGES ===";
+            echo;
+            git diff --cached --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --cached --color=always "$file" 2>/dev/null;
+            if git diff --color=always "$file" 2>/dev/null | grep -q .; then
+              echo;
+              echo "=== UNSTAGED CHANGES ===";
+              echo;
+              git diff --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+            fi
+          else
+            # Unstaged changes
+            echo "=== UNSTAGED CHANGES ===";
+            echo;
+            git diff --color=always "$file" 2>/dev/null | delta 2>/dev/null || git diff --color=always "$file" 2>/dev/null;
+          fi
+        ' \
+        --preview-window=right:60%
+    )
+
+    # Parse the key pressed and the selected files
+    local key_pressed
+    key_pressed=$(echo "$selected_output" | head -1)
+    
+    # Get all selected files (skip first line which is the key)
+    local selected_files=()
+    while IFS= read -r line; do
+      [[ -n "$line" ]] && selected_files+=("$line")
+    done <<< "$(echo "$selected_output" | tail -n +2)"
+
+    # Exit if no selection (ESC or Ctrl-C)
+    if [[ ${#selected_files[@]} -eq 0 ]]; then
+      echo "Exited status viewer."
+      break
+    fi
+
+    # -----------------------------
+    # 4. Handle action based on key pressed
+    # -----------------------------
+    if [[ "$key_pressed" == "ctrl-r" ]]; then
+      # Revert changes for all selected files
+      local files_to_revert=()
+      local untracked_to_delete=()
+      
+      for selected_file in "${selected_files[@]}"; do
+        local staging_status=$(echo "$selected_file" | awk '{print $1}')
+        local filename=$(echo "$selected_file" | awk '{print $NF}')
+        
+        if [[ "$staging_status" == "[UNTRACKED]" ]]; then
+          untracked_to_delete+=("$filename")
+        else
+          files_to_revert+=("$filename")
+        fi
+      done
+      
+      # Handle untracked files
+      if [[ ${#untracked_to_delete[@]} -gt 0 ]]; then
+        echo "Untracked files to delete:"
+        for f in "${untracked_to_delete[@]}"; do
+          echo "  - $f"
+        done
+        read -rp "Delete these ${#untracked_to_delete[@]} untracked file(s)? (y/N): " confirm
+        case "$confirm" in
+          [yY][eE][sS]|[yY])
+            for f in "${untracked_to_delete[@]}"; do
+              rm "$f"
+              echo "✓ Deleted: $f"
+            done
+            ;;
+          *)
+            echo "Skipped deletion."
+            ;;
+        esac
+      fi
+      
+      # Handle tracked files
+      if [[ ${#files_to_revert[@]} -gt 0 ]]; then
+        echo "Files to revert:"
+        for f in "${files_to_revert[@]}"; do
+          echo "  - $f"
+        done
+        read -rp "Revert changes in these ${#files_to_revert[@]} file(s)? This cannot be undone. (y/N): " confirm
+        case "$confirm" in
+          [yY][eE][sS]|[yY])
+            for f in "${files_to_revert[@]}"; do
+              git reset HEAD "$f" 2>/dev/null
+              git checkout -- "$f"
+              echo "✓ Reverted: $f"
+            done
+            ;;
+          *)
+            echo "Skipped revert."
+            ;;
+        esac
+      fi
+    else
+      # Toggle staging for all selected files
+      local did_stage=false
+      for selected_file in "${selected_files[@]}"; do
+        local staging_status=$(echo "$selected_file" | awk '{print $1}')
+        local filename=$(echo "$selected_file" | awk '{print $NF}')
+
+        if [[ "$staging_status" == "[STAGED]" ]]; then
+          echo "Unstaging: $filename"
+          git reset HEAD "$filename"
+        elif [[ "$staging_status" == "[UNSTAGED]" ]]; then
+          echo "Staging: $filename"
+          git add "$filename"
+          did_stage=true
+        elif [[ "$staging_status" == "[UNTRACKED]" ]]; then
+          echo "Adding: $filename"
+          git add "$filename"
+          did_stage=true
+        fi
+      done
+    fi
+
+    # Refresh status output
+    status_output=$(git status --short | awk '{
+      index_status = substr($0, 1, 1);
+      work_status = substr($0, 2, 1);
+      file = substr($0, 4);
+      
+      # Determine staging status
+      if (index_status ~ /[MADRC]/) {
+        staged = "[STAGED]";
+      } else if (work_status == "?" || index_status == "?") {
+        staged = "[UNTRACKED]";
+      } else {
+        staged = "[UNSTAGED]";
+      }
+      
+      printf "%-12s %s %s\n", staged, substr($0, 1, 2), file;
+    }')
+
+    # Check if working tree is now clean
+    if [[ -z "$status_output" ]]; then
+      echo "✓ Working tree is now clean - all changes staged or reverted."
+      break
+    fi
+
+    # Only ask for commit if we just staged something (not unstaged)
+    if [[ "$did_stage" == true ]] && echo "$status_output" | grep -q '\[STAGED\]'; then
+      echo
+      echo "Staged files:"
+      
+      # Get list of staged files and display in tree-like structure
+      git diff --cached --name-only | while IFS= read -r file; do
+        # Get the directory and filename
+        dir=$(dirname "$file")
+        base=$(basename "$file")
+        
+        # Simple tree-like output with indentation
+        if [[ "$dir" == "." ]]; then
+          echo "  └─ $base"
+        else
+          echo "  └─ $file"
+        fi
+      done
+      
+      echo
+      read -rp "Would you like to commit and push these changes? (Y/n): " ans
+      case "$ans" in
+        [nN][oO]|[nN])
+          echo "Continuing..."
+          ;;
+        *)
+          # Use the commit function with staged and push flags
+          commit -s -p
+          break
+          ;;
+      esac
+    fi
+  done
+}

package/commands/switch.sh

@@ -0,0 +1,174 @@
+# Select and switch to a branch using fzf
+switch() {
+  # -----------------------------
+  # 0. Check for help flag
+  # -----------------------------
+  if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+    cat << 'EOF'
+Usage: switch [FILTER...]
+
+Select a git branch using fzf and switch to it.
+
+Arguments:
+  FILTER...     Optional search filter words to pre-fill fzf (joined with spaces)
+
+Options:
+  -h, --help    Show this help message
+
+Behavior:
+  - Lists both local and remote branches
+  - Remote branches are hidden if a local branch with the same name exists
+  - Uses fzf for interactive selection
+  - Automatically switches to the selected branch
+  - For remote branches, creates a local tracking branch if needed
+  - Current branch is highlighted with an asterisk (*)
+
+Examples:
+  $ switch
+  # Opens fzf with list of branches, select one to switch
+
+  $ switch captcha
+  # Opens fzf with 'captcha' pre-filled as filter
+
+  $ switch LOVE-123
+  # Opens fzf filtering for branches containing 'LOVE-123'
+
+  $ switch update figma guidelines
+  # Opens fzf with 'update figma guidelines' pre-filled as filter
+
+Requirements:
+  - Must be in a git repository
+  - fzf must be installed
+
+EOF
+    return 0
+  fi
+
+  # -----------------------------
+  # 1. Check prerequisites
+  # -----------------------------
+  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    echo "Not inside a git repository."
+    return 1
+  fi
+
+  if ! command -v fzf >/dev/null 2>&1; then
+    echo "fzf is not installed."
+
+    # Ask whether to install with Homebrew
+    read -rp "Install fzf with Homebrew? (y/N): " ans
+    case "$ans" in
+      [yY][eE][sS]|[yY])
+        echo "Installing fzf with brew..."
+        if ! command -v brew >/dev/null 2>&1; then
+          echo "Homebrew is not installed. Aborting."
+          return 1
+        fi
+        brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
+        # Optional: install shell integrations automatically
+        if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
+          echo "Running fzf install script..."
+          yes | "$(brew --prefix)/opt/fzf/install"
+        fi
+        ;;
+      *)
+        echo "Aborted (skipped fzf installation)."
+        return 1
+        ;;
+    esac
+  fi
+
+  # -----------------------------
+  # 2. Get current branch and filter
+  # -----------------------------
+  local current_branch
+  current_branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  
+  local filter="$*"
+
+  # -----------------------------
+  # 3. List branches and select with fzf
+  # -----------------------------
+  # Get local branches
+  local local_branches
+  local_branches=$(git branch --format='%(refname:short)')
+  
+  # Get remote branches, filter out those that already exist locally
+  local remote_branches
+  remote_branches=$(git branch -r --format='%(refname:short)' | grep -v 'HEAD' | grep -v '^origin$' | while read -r remote; do
+    local_name="${remote#*/}"  # Remove origin/ prefix
+    # Only include if no local branch with this name exists
+    if ! echo "$local_branches" | grep -qx "$local_name"; then
+      echo "$remote"
+    fi
+  done)
+  
+  local selected_branch
+  selected_branch=$(
+    {
+      # List local branches
+      echo "$local_branches" | sed 's/^/local: /'
+      # Spacer (only if there are remote branches to show)
+      if [[ -n "$remote_branches" ]]; then
+        echo "─────────────────────────────"
+        # List filtered remote branches
+        echo "$remote_branches" | sed 's/^/remote: /'
+      fi
+    } | fzf \
+      --height=40% \
+      --reverse \
+      --border \
+      --prompt="Select branch: " \
+      --query="$filter" \
+      -i \
+      --preview="branch=\$(echo {} | sed 's/^[^:]*: //'); if [[ \"\$branch\" == *───* ]]; then echo 'Spacer - not selectable'; else git log --color=always -n 1 --format='%C(bold cyan)Author:%C(reset) %an%n%C(bold cyan)Date:%C(reset) %ar (%ad)%n%C(bold cyan)Message:%C(reset) %s%n' --date=format:'%Y-%m-%d %H:%M' \"\$branch\" 2>/dev/null && echo && git log --oneline --color=always -n 10 \"\$branch\" 2>/dev/null; fi" \
+      --preview-window=right:50% \
+      --header="Current: $current_branch"
+  )
+
+  # -----------------------------
+  # 4. Handle selection
+  # -----------------------------
+  if [[ -z "$selected_branch" ]]; then
+    echo "No branch selected."
+    return 0
+  fi
+
+  # Ignore spacer selection
+  if [[ "$selected_branch" == *───* ]]; then
+    echo "Invalid selection."
+    return 0
+  fi
+
+  # Extract branch type and name
+  local branch_type="${selected_branch%%:*}"
+  local branch_name="${selected_branch#*: }"
+
+  # -----------------------------
+  # 5. Switch to branch
+  # -----------------------------
+  if [[ "$branch_type" == "local" ]]; then
+    # Switch to local branch
+    echo "Switching to local branch: $branch_name"
+    git checkout "$branch_name"
+  else
+    # Handle remote branch
+    local local_branch="${branch_name#*/}"  # Remove origin/ prefix
+    
+    # Check if local branch already exists
+    if git show-ref --verify --quiet "refs/heads/$local_branch"; then
+      echo "Switching to existing local branch: $local_branch"
+      git checkout "$local_branch"
+    else
+      echo "Creating local tracking branch: $local_branch (tracking $branch_name)"
+      git checkout -b "$local_branch" --track "$branch_name"
+    fi
+  fi
+
+  if [[ $? -eq 0 ]]; then
+    echo "✓ Successfully switched to branch: $(git rev-parse --abbrev-ref HEAD)"
+  else
+    echo "✗ Failed to switch branch."
+    return 1
+  fi
+}

package/commands/unstash.sh

@@ -0,0 +1,174 @@
+unstash() {
+    # -----------------------------
+    # 0. Check for help flag
+    # -----------------------------
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        cat << 'EOF'
+Usage: unstash [OPTIONS]
+
+Apply a git stash to your working directory with optional removal.
+Interactive fuzzy finder (fzf) with preview support.
+
+Options:
+  -h, --help    Show this help message
+
+Features:
+  - Single-select stash picker
+  - Preview stash contents before applying
+  - Apply stash to working directory
+  - Optional confirmation to drop stash after applying
+
+Navigation:
+  ↑/↓ or j/k    Navigate through stashes
+  Enter         Select and apply stash
+  ESC/Ctrl-C    Abort
+
+Examples:
+  $ unstash
+  Available stashes >
+  > stash@{0}: WIP on main: 1a2b3c4 commit message
+    stash@{1}: WIP on feature: 5d6e7f8 another commit
+    stash@{2}: On dev: 9a8b7c6 old work
+    ✖ Abort
+
+  # Navigate to desired stash and press Enter
+  
+  Applying stash@{1} ...
+  On branch main
+  Changes not staged for commit:
+    modified:   src/app.js
+
+  Drop stash@{1} now? (y/N): y
+  Dropping stash@{1} ...
+  Dropped stash@{1} (5d6e7f8abcd...)
+
+Workflow:
+  1. Select a stash from the list
+  2. Stash is applied to your working directory
+  3. Choose whether to drop (delete) the stash or keep it
+
+Requirements:
+  - fzf (fuzzy finder) - will prompt to install if not found
+  - git stash list with at least one stash
+
+Notes:
+  - Uses 'git stash apply' to preserve the stash initially
+  - Stash is only dropped if you confirm after successful apply
+  - Preview shows the full diff of the selected stash
+  - If apply fails, the stash is automatically kept
+
+EOF
+        return 0
+    fi
+
+    # -----------------------------
+    # 1. Check for fzf
+    # -----------------------------
+    if ! command -v fzf >/dev/null 2>&1; then
+        echo "fzf is not installed."
+
+        # Ask whether to install with Homebrew
+        read -rp "Install fzf with Homebrew? (y/N): " ans
+        case "$ans" in
+            [yY][eE][sS]|[yY])
+                echo "Installing fzf with brew..."
+                if ! command -v brew >/dev/null 2>&1; then
+                    echo "Homebrew is not installed. Aborting."
+                    return 1
+                fi
+                brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
+                # Optional: install shell integrations automatically
+                if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
+                    echo "Running fzf install script..."
+                    yes | "$(brew --prefix)/opt/fzf/install"
+                fi
+                ;;
+            *)
+                echo "Aborted (skipped fzf installation)."
+                return 1
+                ;;
+        esac
+    fi
+
+    # -----------------------------
+    # 2. Build menu entries
+    # -----------------------------
+    local abort_label="✖ Abort"
+
+    local choices
+    choices=$(
+        {
+            git stash list
+            echo "$abort_label"
+        }
+    )
+
+    # -----------------------------
+    # 3. Run fzf full-screen picker with preview
+    # -----------------------------
+    local selection
+    selection=$(printf "%s\n" "$choices" \
+        | fzf --prompt="Available stashes > " \
+              -i \
+              --reverse \
+              --border \
+              --header="Select a stash to apply" \
+              --no-multi \
+              --bind=enter:accept \
+              --preview='
+                    sel=$(echo {} | grep -o "stash@{[0-9]\+}" || true);
+                    if [[ -n "$sel" ]]; then
+                        git stash show -p "$sel";
+                    else
+                        echo "No preview";
+                    fi
+              '
+    )
+
+    # ESC or Ctrl-C
+    if [[ -z "$selection" ]]; then
+        echo "Aborted."
+        return 1
+    fi
+
+    # Abort option
+    if [[ "$selection" == "$abort_label" ]]; then
+        echo "Aborted."
+        return 1
+    fi
+
+    # -----------------------------
+    # 4. Extract stash ID safely
+    # -----------------------------
+    local stash_id
+    stash_id=$(echo "$selection" | grep -o 'stash@{[0-9]\+}')
+
+    if [[ -z "$stash_id" ]]; then
+        echo "Error: Could not determine stash ID."
+        return 1
+    fi
+
+    # -----------------------------
+    # 5. Apply the stash
+    # -----------------------------
+    echo "Applying $stash_id ..."
+    if ! git stash apply "$stash_id"; then
+        echo "Apply failed, kept stash."
+        return 1
+    fi
+
+    # -----------------------------
+    # 6. Confirm before dropping
+    # -----------------------------
+    echo
+    read -rp "Drop $stash_id now? (y/N): " drop_ans
+    case "$drop_ans" in
+        [yY][eE][sS]|[yY])
+            echo "Dropping $stash_id ..."
+            git stash drop "$stash_id"
+            ;;
+        *)
+            echo "Stash NOT dropped."
+            ;;
+    esac
+}