gitbash 0.2.3 → 0.2.4

package/commands/cleanup.sh

@@ -70,7 +70,6 @@ EOF
                 ;;
         esac
     done
-
     # -----------------------------
     # 1. Check prerequisites
     # -----------------------------
@@ -110,7 +109,11 @@ EOF
     if [[ "$json_mode" == false ]]; then
         echo "Fetching and pruning remote..."
     fi
-    git fetch --prune origin 2>/dev/null
+    if ! git fetch --prune origin 2>/dev/null; then
+        if [[ "$json_mode" == false ]]; then
+            echo "⚠ Fetch failed; continuing with local data." >&2
+        fi
+    fi
 
     # -----------------------------
     # 3. Detect base branch
@@ -144,9 +147,12 @@ EOF
     remote_branches=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | sed 's|^origin/||' | grep -v '^HEAD$' || true)
 
     # Arrays to hold branches by category (format: timestamp|branch|relative_date|author_email|author_name)
-    local merged_branches=()
-    local stale_branches=()
-    local recent_branches=()
+    local -a merged_branches
+    local -a stale_branches
+    local -a recent_branches
+    merged_branches=()
+    stale_branches=()
+    recent_branches=()
 
     # Process each local branch
     while IFS= read -r branch; do
@@ -186,15 +192,26 @@ EOF
         fi
     done < <(git for-each-ref --format='%(refname:short)' refs/heads)
 
-    # Sort each category by timestamp (most recent first)
-    if [[ ${#merged_branches[@]} -gt 0 ]]; then
-        mapfile -t merged_branches < <(printf '%s\n' "${merged_branches[@]}" | sort -t'|' -k1 -rn)
+    # Sort each category by timestamp (most recent first), compatible with bash 3.x (no mapfile)
+    _sort_desc() {
+        local _var="$1"
+        shift
+        local _out=()
+        while IFS= read -r line; do
+            _out+=("$line")
+        done < <(printf '%s\n' "$@" | sort -t'|' -k1 -rn)
+        # shellcheck disable=SC2034  # assigned via eval to caller var
+        eval "$_var=(\"\${_out[@]}\")"
+    }
+
+    if [[ ${merged_branches+set} && ${#merged_branches[@]} -gt 0 ]]; then
+        _sort_desc merged_branches "${merged_branches[@]}"
     fi
-    if [[ ${#stale_branches[@]} -gt 0 ]]; then
-        mapfile -t stale_branches < <(printf '%s\n' "${stale_branches[@]}" | sort -t'|' -k1 -rn)
+    if [[ ${stale_branches+set} && ${#stale_branches[@]} -gt 0 ]]; then
+        _sort_desc stale_branches "${stale_branches[@]}"
     fi
-    if [[ ${#recent_branches[@]} -gt 0 ]]; then
-        mapfile -t recent_branches < <(printf '%s\n' "${recent_branches[@]}" | sort -t'|' -k1 -rn)
+    if [[ ${recent_branches+set} && ${#recent_branches[@]} -gt 0 ]]; then
+        _sort_desc recent_branches "${recent_branches[@]}"
     fi
 
     # -----------------------------
@@ -216,7 +233,18 @@ EOF
         }
         
         # Process all branches for JSON output
-        for entry in "${merged_branches[@]}" "${stale_branches[@]}" "${recent_branches[@]}"; do
+        local all_entries=()
+        if [[ ${merged_branches+set} ]]; then
+            all_entries+=("${merged_branches[@]}")
+        fi
+        if [[ ${stale_branches+set} ]]; then
+            all_entries+=("${stale_branches[@]}")
+        fi
+        if [[ ${recent_branches+set} ]]; then
+            all_entries+=("${recent_branches[@]}")
+        fi
+
+        for entry in "${all_entries[@]}"; do
             [[ -z "$entry" ]] && continue
             
             local ts name rel_date email author
@@ -255,7 +283,8 @@ EOF
     local max_branch_len=60
 
     # Add merged branches (pre-selected)
-    for entry in "${merged_branches[@]}"; do
+    if [[ ${merged_branches+set} ]]; then
+        for entry in "${merged_branches[@]}"; do
         local branch date display_branch line
         branch=$(echo "$entry" | cut -d'|' -f2)
         date=$(echo "$entry" | cut -d'|' -f3)
@@ -267,36 +296,41 @@ EOF
         branch_list+="$line"$'\n'
         preselect_list+="$line"$'\n'
         ((idx++))
-    done
+        done
+    fi
 
     # Add stale branches (pre-selected)
-    for entry in "${stale_branches[@]}"; do
-        local branch date display_branch line
-        branch=$(echo "$entry" | cut -d'|' -f2)
-        date=$(echo "$entry" | cut -d'|' -f3)
-        display_branch="$branch"
-        if [[ ${#display_branch} -gt $max_branch_len ]]; then
-            display_branch="${display_branch:0:$((max_branch_len - 3))}..."
-        fi
-        line=$(printf "[STALE]   %-${max_branch_len}s  %s\t%s" "$display_branch" "$date" "$branch")
-        branch_list+="$line"$'\n'
-        preselect_list+="$line"$'\n'
-        ((idx++))
-    done
+    if [[ ${stale_branches+set} ]]; then
+        for entry in "${stale_branches[@]}"; do
+            local branch date display_branch line
+            branch=$(echo "$entry" | cut -d'|' -f2)
+            date=$(echo "$entry" | cut -d'|' -f3)
+            display_branch="$branch"
+            if [[ ${#display_branch} -gt $max_branch_len ]]; then
+                display_branch="${display_branch:0:$((max_branch_len - 3))}..."
+            fi
+            line=$(printf "[STALE]   %-${max_branch_len}s  %s\t%s" "$display_branch" "$date" "$branch")
+            branch_list+="$line"$'\n'
+            preselect_list+="$line"$'\n'
+            ((idx++))
+        done
+    fi
 
     # Add recent branches (not pre-selected)
-    for entry in "${recent_branches[@]}"; do
-        local branch date display_branch line
-        branch=$(echo "$entry" | cut -d'|' -f2)
-        date=$(echo "$entry" | cut -d'|' -f3)
-        display_branch="$branch"
-        if [[ ${#display_branch} -gt $max_branch_len ]]; then
-            display_branch="${display_branch:0:$((max_branch_len - 3))}..."
-        fi
-        line=$(printf "[RECENT]  %-${max_branch_len}s  %s\t%s" "$display_branch" "$date" "$branch")
-        branch_list+="$line"$'\n'
-        ((idx++))
-    done
+    if [[ ${recent_branches+set} ]]; then
+        for entry in "${recent_branches[@]}"; do
+            local branch date display_branch line
+            branch=$(echo "$entry" | cut -d'|' -f2)
+            date=$(echo "$entry" | cut -d'|' -f3)
+            display_branch="$branch"
+            if [[ ${#display_branch} -gt $max_branch_len ]]; then
+                display_branch="${display_branch:0:$((max_branch_len - 3))}..."
+            fi
+            line=$(printf "[RECENT]  %-${max_branch_len}s  %s\t%s" "$display_branch" "$date" "$branch")
+            branch_list+="$line"$'\n'
+            ((idx++))
+        done
+    fi
 
     if [[ -z "$branch_list" ]]; then
         echo "No local branches to clean up."
@@ -316,8 +350,16 @@ EOF
     # -----------------------------
     # 7. Run fzf picker
     # -----------------------------
-    local total_count=$((${#merged_branches[@]} + ${#stale_branches[@]} + ${#recent_branches[@]}))
-    local preselect_count=$((${#merged_branches[@]} + ${#stale_branches[@]}))
+    local merged_count=0
+    local stale_count=0
+    local recent_count=0
+
+    [[ ${merged_branches+set} ]] && merged_count=${#merged_branches[@]}
+    [[ ${stale_branches+set} ]] && stale_count=${#stale_branches[@]}
+    [[ ${recent_branches+set} ]] && recent_count=${#recent_branches[@]}
+
+    local total_count=$((merged_count + stale_count + recent_count))
+    local preselect_count=$((merged_count + stale_count))
 
     # Build toggle sequence for pre-selection (toggle first N items)
     local toggle_sequence="first"

package/commands/stale.sh

@@ -144,7 +144,11 @@ EOF
     if [[ "$json_mode" == false ]]; then
         echo "Fetching latest from remote..."
     fi
-    git fetch --prune origin 2>/dev/null
+    if ! git fetch --prune origin 2>/dev/null; then
+        if [[ "$json_mode" == false ]]; then
+            echo "⚠ Fetch failed; continuing with local data." >&2
+        fi
+    fi
 
     # -----------------------------
     # 4. Build branch list sorted by date (oldest first)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",

package/commands/stale.zsh

@@ -1,404 +0,0 @@
-stale() {
-    # -----------------------------
-    # 0. Check for help flag and parse options
-    # -----------------------------
-    local json_mode=false
-    local my_mode=false
-    local filter_args=()
-    
-    while [[ $# -gt 0 ]]; do
-        case "$1" in
-            -h|--help)
-                cat << 'EOF'
-Usage: stale [OPTIONS] [FILTER...]
-
-Show a list of remote branches ordered by last modification date (oldest first).
-Useful for identifying stale branches that may need cleanup.
-
-Arguments:
-  FILTER...     Optional search filter words to pre-fill fzf (joined with spaces)
-
-Options:
-  -h, --help    Show this help message
-  -m, --my      Pre-fill filter with your git username (from git config user.name)
-  --json        Output branch data as JSON (non-interactive)
-
-Features:
-  - Lists all remote branches sorted by last commit date (oldest first)
-  - By default, only shows branches older than 3 months (truly stale)
-  - Shows branch name, relative date, and author
-  - Interactive selection with fzf
-  - Preview shows recent commits on the selected branch
-  - Delete selected branches directly from the list
-
-Navigation:
-  ↑/↓ or j/k    Navigate through branches
-  TAB           Select/deselect branch (multi-select)
-  Ctrl-A        Toggle showing all branches (including recent ones)
-  Enter         Delete selected branch(es)
-  ESC/Ctrl-C    Exit without action
-
-Examples:
-  $ stale
-  Stale branches (oldest first) >
-  > feature/very-old                       6 months ago    Bob Wilson
-    feature/another-old-one                4 months ago    Jane Smith
-    feature/old-feature                    3 months ago    John Doe
-    ✖ Abort
-
-  # Press Ctrl-A to show all branches including recent ones
-  # Select branches with TAB, press Enter to delete
-
-  $ stale --my
-  # Pre-fills fzf filter with your git username to show only your branches
-
-  $ stale Product refactoring
-  # Pre-fills fzf filter with "Product refactoring"
-
-  $ stale --json
-  # Output JSON for scripting
-
-Output format:
-  <branch-name>                            <relative-date>  <author>
-
-Requirements:
-  - Must be in a git repository
-  - fzf (fuzzy finder) - will prompt to install if not found (not required for --json)
-
-EOF
-                return 0
-                ;;
-            --json)
-                json_mode=true
-                shift
-                ;;
-            -m|--my)
-                my_mode=true
-                shift
-                ;;
-            *)
-                filter_args+=("$1")
-                shift
-                ;;
-        esac
-    done
-
-    # -----------------------------
-    # 1. Check prerequisites
-    # -----------------------------
-    if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-        if [[ "$json_mode" == true ]]; then
-            echo "[]"
-        else
-            echo "Not inside a git repository."
-        fi
-        return 1
-    fi
-
-    if [[ "$json_mode" == false ]]; then
-        if ! command -v fzf >/dev/null 2>&1; then
-            echo "fzf is not installed."
-
-            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; }
-                    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
-    fi
-
-    # -----------------------------
-    # 2. Handle filter (--my flag or arbitrary words)
-    # -----------------------------
-    local filter=""
-    if [[ "$my_mode" == true ]]; then
-        filter=$(git config user.name)
-        if [[ -z "$filter" && "$json_mode" == false ]]; then
-            echo "Warning: git config user.name is not set."
-        fi
-    elif [[ ${#filter_args[@]} -gt 0 ]]; then
-        filter="${filter_args[*]}"
-    fi
-
-    # -----------------------------
-    # 3. Fetch latest from remote
-    # -----------------------------
-    if [[ "$json_mode" == false ]]; then
-        echo "Fetching latest from remote..."
-    fi
-    git fetch --prune origin 2>/dev/null
-
-    # -----------------------------
-    # 4. Build branch list sorted by date (oldest first)
-    # -----------------------------
-    local abort_label="✖ Abort"
-    local max_branch_length=65
-    
-    # Calculate date 3 months ago
-    local three_months_ago
-    three_months_ago=$(date -v-3m +%s 2>/dev/null || date -d "3 months ago" +%s 2>/dev/null)
-    
-    # Build full branch list (all branches)
-    # Format: display_branch | date | author | full_branch (tab-separated, last field is full branch for operations)
-    local all_branch_list
-    all_branch_list=$(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(committerdate:unix)' refs/remotes/origin | \
-        grep -v 'origin/HEAD' | \
-        grep -v '^origin$' | \
-        while IFS='|' read -r branch date author timestamp; do
-            # Remove origin/ prefix for display
-            local full_branch="${branch#origin/}"
-            local display_branch="$full_branch"
-            # Truncate branch name if too long
-            if [[ ${#display_branch} -gt $max_branch_length ]]; then
-                display_branch="${display_branch:0:$((max_branch_length - 3))}..."
-            fi
-            # Format: display branch (padded), date, author, TAB, full branch name
-            printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
-        done || true)
-    
-    # Build stale branch list (only branches older than 3 months)
-    local stale_branch_list
-    stale_branch_list=$(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(committerdate:unix)' refs/remotes/origin | \
-        grep -v 'origin/HEAD' | \
-        grep -v '^origin$' | \
-        while IFS='|' read -r branch date author timestamp; do
-            # Only include if older than 3 months
-            if [[ "$timestamp" -lt "$three_months_ago" ]]; then
-                # Remove origin/ prefix for display
-                local full_branch="${branch#origin/}"
-                local display_branch="$full_branch"
-                # Truncate branch name if too long
-                if [[ ${#display_branch} -gt $max_branch_length ]]; then
-                    display_branch="${display_branch:0:$((max_branch_length - 3))}..."
-                fi
-                # Format: display branch (padded), date, author, TAB, full branch name
-                printf "%-${max_branch_length}s  %-20s %-25s\t%s\n" "$display_branch" "$date" "$author" "$full_branch"
-            fi
-        done || true)
-
-    if [[ -z "$all_branch_list" ]]; then
-        if [[ "$json_mode" == true ]]; then
-            echo "[]"
-        else
-            echo "No remote branches found."
-        fi
-        return 0
-    fi
-
-    # -----------------------------
-    # 5. JSON mode output
-    # -----------------------------
-    if [[ "$json_mode" == true ]]; then
-        local json_output="["
-        local first=true
-        
-        # Helper function to escape JSON strings
-        _json_escape() {
-            local str="$1"
-            str="${str//\\/\\\\}"
-            str="${str//\"/\\\"}"
-            str="${str//$'\n'/\\n}"
-            str="${str//$'\r'/\\r}"
-            str="${str//$'\t'/\\t}"
-            echo "$str"
-        }
-        
-        # Build JSON from stale branches
-        {
-        while IFS='|' read -r branch rel_date author_name author_email timestamp; do
-            [[ -z "$branch" ]] && continue
-            # Only include if older than 3 months
-            if [[ "$timestamp" -lt "$three_months_ago" ]]; then
-                local name="${branch#origin/}"
-                # Remove angle brackets from email
-                author_email="${author_email#<}"
-                author_email="${author_email%>}"
-                
-                # Escape values for JSON
-                name=$(_json_escape "$name")
-                rel_date=$(_json_escape "$rel_date")
-                author_email=$(_json_escape "$author_email")
-                author_name=$(_json_escape "$author_name")
-                
-                if [[ "$first" == true ]]; then
-                    first=false
-                else
-                    json_output+=","
-                fi
-                
-                json_output+="{\"last_change_timestamp\":$timestamp,\"author_email\":\"$author_email\",\"author_name\":\"$author_name\",\"name\":\"$name\",\"last_change_relative\":\"$rel_date\"}"
-            fi
-        done < <(git for-each-ref --sort=committerdate --format='%(refname:short)|%(committerdate:relative)|%(authorname)|%(authoremail)|%(committerdate:unix)' refs/remotes/origin 2>/dev/null | grep -v 'origin/HEAD' | grep -v '^origin$' || true)
-        } &>/dev/null
-        json_output+="]"
-        echo "$json_output"
-        return 0
-    fi
-    
-    # Create temp files for fzf reload
-    local stale_file=$(mktemp)
-    local all_file=$(mktemp)
-    local state_file=$(mktemp)
-    echo "$stale_branch_list" > "$stale_file"
-    echo "$abort_label" >> "$stale_file"
-    echo "$all_branch_list" > "$all_file"
-    echo "$abort_label" >> "$all_file"
-    echo "stale" > "$state_file"
-
-    # -----------------------------
-    # 6. Run fzf picker with preview
-    # -----------------------------
-    local stale_count=$(echo "$stale_branch_list" | grep -c . || echo "0")
-    local all_count=$(echo "$all_branch_list" | grep -c . || echo "0")
-    
-    # Create toggle script
-    local toggle_script=$(mktemp)
-    cat > "$toggle_script" << TOGGLE_EOF
-#!/bin/bash
-state=\$(cat "$state_file")
-if [[ "\$state" == "stale" ]]; then
-    echo "all" > "$state_file"
-    cat "$all_file"
-else
-    echo "stale" > "$state_file"
-    cat "$stale_file"
-fi
-TOGGLE_EOF
-    chmod +x "$toggle_script"
-    
-    # Create prompt script
-    local prompt_script=$(mktemp)
-    cat > "$prompt_script" << PROMPT_EOF
-#!/bin/bash
-state=\$(cat "$state_file")
-if [[ "\$state" == "stale" ]]; then
-    echo "Stale branches (>3 months, oldest first) > "
-else
-    echo "All branches (oldest first) > "
-fi
-PROMPT_EOF
-    chmod +x "$prompt_script"
-    
-    # Create header script  
-    local header_script=$(mktemp)
-    cat > "$header_script" << HEADER_EOF
-#!/bin/bash
-state=\$(cat "$state_file")
-if [[ "\$state" == "stale" ]]; then
-    echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than 3 months)"
-else
-    echo "[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing all $all_count branches"
-fi
-HEADER_EOF
-    chmod +x "$header_script"
-    
-    local selection
-    selection=$(
-        fzf \
-            --prompt="Stale branches (>3 months, oldest first) > " \
-            --query="$filter" \
-            -i \
-            --reverse \
-            --border \
-            --header="[TAB] select | [Ctrl-A] toggle all/stale | [Enter] delete | [ESC] exit
-Showing $stale_count stale branches (older than 3 months)" \
-            --multi \
-            --delimiter=$'\t' \
-            --with-nth=1 \
-            --bind=enter:accept \
-            --bind="ctrl-a:reload($toggle_script)+transform-prompt($prompt_script)+transform-header($header_script)" \
-            --preview='
-                line={}
-                if [[ "$line" == "✖ Abort" ]]; then
-                    echo "Exit without action";
-                else
-                    # Extract full branch name (after tab)
-                    branch=$(echo "$line" | cut -f2)
-                    echo "Branch: origin/$branch";
-                    echo "";
-                    echo "Recent commits:";
-                    git log --oneline --color=always -n 15 "origin/$branch" 2>/dev/null || echo "No commits found";
-                fi
-            ' \
-            --preview-window=right:35% \
-            < "$stale_file"
-    ) </dev/tty || true
-    
-    # Cleanup temp files
-    rm -f "$stale_file" "$all_file" "$state_file" "$toggle_script" "$prompt_script" "$header_script"
-
-    # ESC or Ctrl-C
-    if [[ -z "$selection" ]]; then
-        echo "Exited."
-        return 0
-    fi
-
-    # Abort option
-    if echo "$selection" | grep -q "^$abort_label"; then
-        echo "Aborted."
-        return 0
-    fi
-
-    # -----------------------------
-    # 7. Extract branch names and confirm deletion
-    # -----------------------------
-    local branches_to_delete=()
-    while IFS= read -r line; do
-        # Skip abort option
-        if [[ "$line" == "✖ Abort" ]]; then
-            continue
-        fi
-        # Extract full branch name (after tab)
-        local branch_name
-        branch_name=$(echo "$line" | cut -f2)
-        if [[ -n "$branch_name" ]]; then
-            branches_to_delete+=("$branch_name")
-        fi
-    done <<< "$selection"
-
-    if [[ ${#branches_to_delete[@]} -eq 0 ]]; then
-        echo "No branches selected."
-        return 0
-    fi
-
-    echo ""
-    echo "Selected branches to delete from remote:"
-    for branch in "${branches_to_delete[@]}"; do
-        echo "  - origin/$branch"
-    done
-    echo ""
-
-    read -rp "Delete these ${#branches_to_delete[@]} branch(es) from remote? (y/N): " confirm
-    case "$confirm" in
-        [yY][eE][sS]|[yY])
-            echo "Deleting branches..."
-            for branch in "${branches_to_delete[@]}"; do
-                echo "Deleting origin/$branch ..."
-                if git push origin --delete "$branch" 2>/dev/null; then
-                    echo "✓ Deleted origin/$branch"
-                else
-                    echo "✗ Failed to delete origin/$branch"
-                fi
-            done
-            ;;
-        *)
-            echo "Deletion cancelled."
-            ;;
-    esac
-}