gitbash 0.1.0

package/commands/cleanup.sh

@@ -0,0 +1,452 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Cleanup local branches that are no longer needed
+cleanup() {
+    # -----------------------------
+    # 0. Check for help flag and parse options
+    # -----------------------------
+    local json_mode=false
+    
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            -h|--help)
+                cat << 'EOF'
+Usage: cleanup [OPTIONS]
+
+Find and delete local branches that are no longer needed.
+
+Options:
+  -h, --help    Show this help message
+  --json        Output branch data as JSON (non-interactive)
+
+Categories (pre-selected for deletion):
+  - Merged branches: Local branches whose remote was merged and deleted
+  - Stale branches: Local branches with no commits in 7+ days
+
+Not pre-selected (but listed):
+  - Recent branches: Local branches with commits in the last 7 days
+
+Navigation:
+  ↑/↓ or j/k    Navigate through branches
+  TAB           Select/deselect branch
+  Enter         Delete selected branch(es)
+  ESC/Ctrl-C    Exit without action
+
+Notes:
+  - Only deletes LOCAL branches (never touches remote)
+  - If current branch is selected, switches to main/master first
+  - Force deletes branches (even if not fully merged)
+
+Examples:
+  $ cleanup
+  Local branches to clean up >
+  > [MERGED]  feature/old-feature        2 weeks ago
+    [STALE]   feature/abandoned          8 days ago
+    [RECENT]  feature/work-in-progress   2 days ago
+    ✖ Abort
+
+  $ cleanup --json
+  [{"last_change_timestamp":1733123456,"author_email":"dev@example.com",...}]
+
+Requirements:
+  - Must be in a git repository
+  - fzf (fuzzy finder) - not required for --json mode
+
+EOF
+                return 0
+                ;;
+            --json)
+                json_mode=true
+                shift
+                ;;
+            *)
+                echo "Unknown option: $1"
+                return 1
+                ;;
+        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." >&2
+        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; }
+                    ;;
+                *)
+                    echo "Aborted (skipped fzf installation)."
+                    return 1
+                    ;;
+            esac
+        fi
+    fi
+
+    # -----------------------------
+    # 2. Fetch and prune to sync with remote
+    # -----------------------------
+    if [[ "$json_mode" == false ]]; then
+        echo "Fetching and pruning remote..."
+    fi
+    git fetch --prune origin 2>/dev/null
+
+    # -----------------------------
+    # 3. Detect base branch
+    # -----------------------------
+    local base_branch
+    if git show-ref --verify --quiet refs/heads/main; then
+        base_branch="main"
+    elif git show-ref --verify --quiet refs/heads/master; then
+        base_branch="master"
+    else
+        if [[ "$json_mode" == false ]]; then
+            echo "Could not detect 'main' or 'master' locally."
+        else
+            echo "[]"
+        fi
+        return 1
+    fi
+
+    local current_branch
+    current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+    # -----------------------------
+    # 4. Build branch lists
+    # -----------------------------
+    local abort_label="✖ Abort"
+    local one_week_ago
+    one_week_ago=$(date -v-7d +%s 2>/dev/null || date -d "7 days ago" +%s 2>/dev/null)
+
+    # Get list of remote branches (without origin/ prefix)
+    local remote_branches
+    remote_branches=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | sed 's|^origin/||' | grep -v '^HEAD$')
+
+    # Arrays to hold branches by category (format: timestamp|branch|relative_date|author_email|author_name)
+    local merged_branches=()
+    local stale_branches=()
+    local recent_branches=()
+
+    # Process each local branch
+    while IFS= read -r branch; do
+        # Skip base branch
+        [[ "$branch" == "$base_branch" ]] && continue
+        [[ -z "$branch" ]] && continue
+
+        # Get last commit info for all branches
+        local last_commit_ts relative_date author_email author_name
+        last_commit_ts=$(git log -1 --format='%ct' "$branch" 2>/dev/null)
+        relative_date=$(git log -1 --format='%cr' "$branch" 2>/dev/null)
+        author_email=$(git log -1 --format='%ae' "$branch" 2>/dev/null)
+        author_name=$(git log -1 --format='%an' "$branch" 2>/dev/null)
+        
+        # Check if remote branch exists
+        local has_remote=false
+        if echo "$remote_branches" | grep -qx "$branch"; then
+            has_remote=true
+        fi
+
+        # Check if it HAD an upstream (was pushed before)
+        local configured_upstream
+        configured_upstream=$(git config "branch.$branch.remote" 2>/dev/null)
+
+        # Entry format: timestamp|branch|relative_date|author_email|author_name
+        local entry="$last_commit_ts|$branch|$relative_date|$author_email|$author_name"
+
+        if [[ "$has_remote" == false && -n "$configured_upstream" ]]; then
+            # Had upstream but remote is gone = merged and deleted remotely
+            merged_branches+=("$entry")
+        elif [[ -n "$last_commit_ts" && "$last_commit_ts" -lt "$one_week_ago" ]]; then
+            # Stale: no commits in 7+ days (pre-select for deletion)
+            stale_branches+=("$entry")
+        else
+            # Recent: has recent activity (don't pre-select)
+            recent_branches+=("$entry")
+        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)
+    fi
+    if [[ ${#stale_branches[@]} -gt 0 ]]; then
+        mapfile -t stale_branches < <(printf '%s\n' "${stale_branches[@]}" | sort -t'|' -k1 -rn)
+    fi
+    if [[ ${#recent_branches[@]} -gt 0 ]]; then
+        mapfile -t recent_branches < <(printf '%s\n' "${recent_branches[@]}" | sort -t'|' -k1 -rn)
+    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"
+        }
+        
+        # Process all branches for JSON output
+        for entry in "${merged_branches[@]}" "${stale_branches[@]}" "${recent_branches[@]}"; do
+            [[ -z "$entry" ]] && continue
+            
+            local ts name rel_date email author
+            ts=$(echo "$entry" | cut -d'|' -f1)
+            name=$(echo "$entry" | cut -d'|' -f2)
+            rel_date=$(echo "$entry" | cut -d'|' -f3)
+            email=$(echo "$entry" | cut -d'|' -f4)
+            author=$(echo "$entry" | cut -d'|' -f5)
+            
+            # Escape values for JSON
+            name=$(_json_escape "$name")
+            rel_date=$(_json_escape "$rel_date")
+            email=$(_json_escape "$email")
+            author=$(_json_escape "$author")
+            
+            if [[ "$first" == true ]]; then
+                first=false
+            else
+                json_output+=","
+            fi
+            
+            json_output+="{\"last_change_timestamp\":$ts,\"author_email\":\"$email\",\"author_name\":\"$author\",\"name\":\"$name\",\"last_change_relative\":\"$rel_date\"}"
+        done
+        
+        json_output+="]"
+        echo "$json_output"
+        return 0
+    fi
+
+    # -----------------------------
+    # 6. Build fzf input with pre-selection markers
+    # -----------------------------
+    local branch_list=""
+    local preselect_list=""
+    local idx=0
+    local max_branch_len=60
+
+    # Add merged branches (pre-selected)
+    for entry in "${merged_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 "[MERGED]  %-${max_branch_len}s  %s\t%s" "$display_branch" "$date" "$branch")
+        branch_list+="$line"$'\n'
+        preselect_list+="$line"$'\n'
+        ((idx++))
+    done
+
+    # 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
+
+    # 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 [[ -z "$branch_list" ]]; then
+        echo "No local branches to clean up."
+        return 0
+    fi
+
+    # Add abort option
+    branch_list+="$abort_label"$'\t\t'
+
+    # Create temp files
+    local branch_file preselect_file
+    branch_file=$(mktemp)
+    preselect_file=$(mktemp)
+    echo -e "$branch_list" > "$branch_file"
+    echo -e "$preselect_list" > "$preselect_file"
+
+    # -----------------------------
+    # 7. Run fzf picker
+    # -----------------------------
+    local total_count=$((${#merged_branches[@]} + ${#stale_branches[@]} + ${#recent_branches[@]}))
+    local preselect_count=$((${#merged_branches[@]} + ${#stale_branches[@]}))
+
+    # Build toggle sequence for pre-selection (toggle first N items)
+    local toggle_sequence="first"
+    for ((i=0; i<preselect_count; i++)); do
+        toggle_sequence+="+toggle+down"
+    done
+    toggle_sequence+="+first"
+
+    local selection
+    selection=$(cat "$branch_file" | fzf \
+        --prompt="Local branches to clean up > " \
+        -i \
+        --reverse \
+        --border \
+        --header="[TAB] toggle | [Enter] delete selected | [ESC] exit
+Found $total_count branches ($preselect_count pre-selected for deletion)" \
+        --multi \
+        --delimiter=$'\t' \
+        --with-nth=1 \
+        --bind=enter:accept \
+        --preview='
+            line={}
+            if [[ "$line" == "✖ Abort"* ]]; then
+                echo "Exit without action";
+            else
+                branch=$(echo "$line" | cut -f2)
+                echo "Branch: $branch";
+                echo "";
+                echo "Recent commits:";
+                git log --oneline --color=always -n 15 "$branch" 2>/dev/null || echo "No commits found";
+            fi
+        ' \
+        --preview-window=right:35% \
+        --bind "load:$toggle_sequence"
+    )
+
+    # Cleanup temp files
+    rm -f "$branch_file" "$preselect_file"
+
+    # 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
+
+    # -----------------------------
+    # 8. Extract branch names and confirm deletion
+    # -----------------------------
+    local branches_to_delete=()
+    local need_switch=false
+    local only_merged=true
+
+    while IFS= read -r line; do
+        [[ "$line" == "✖ Abort"* ]] && continue
+        local branch_name
+        branch_name=$(echo "$line" | cut -f2)
+        if [[ -n "$branch_name" ]]; then
+            branches_to_delete+=("$branch_name")
+            if [[ "$branch_name" == "$current_branch" ]]; then
+                need_switch=true
+            fi
+            # Check if this is not a MERGED branch
+            if [[ ! "$line" == "[MERGED]"* ]]; then
+                only_merged=false
+            fi
+        fi
+    done <<< "$selection"
+
+    if [[ ${#branches_to_delete[@]} -eq 0 ]]; then
+        echo "No branches selected."
+        return 0
+    fi
+
+    echo ""
+    echo "Selected local branches to delete:"
+    for branch in "${branches_to_delete[@]}"; do
+        if [[ "$branch" == "$current_branch" ]]; then
+            echo "  - $branch (current branch)"
+        else
+            echo "  - $branch"
+        fi
+    done
+    
+    if [[ "$need_switch" == true ]]; then
+        echo ""
+        echo "Note: Will switch to '$base_branch' first (current branch selected for deletion)"
+    fi
+    echo ""
+
+    # Default to Y if only merged branches, otherwise N
+    local confirm
+    if [[ "$only_merged" == true ]]; then
+        read -rp "Delete these ${#branches_to_delete[@]} local branch(es)? (Y/n): " confirm
+        case "$confirm" in
+            [nN][oO]|[nN])
+                echo "Deletion cancelled."
+                return 0
+                ;;
+        esac
+    else
+        read -rp "Delete these ${#branches_to_delete[@]} local branch(es)? (y/N): " confirm
+        case "$confirm" in
+            [yY][eE][sS]|[yY])
+                ;;
+            *)
+                echo "Deletion cancelled."
+                return 0
+                ;;
+        esac
+    fi
+
+    # Switch to base branch if needed
+    if [[ "$need_switch" == true ]]; then
+        echo "Switching to '$base_branch'..."
+        git checkout "$base_branch" || {
+            echo "⚠ Failed to switch to '$base_branch'. Aborting deletion."
+            return 1
+        }
+    fi
+
+    echo "Deleting branches..."
+    for branch in "${branches_to_delete[@]}"; do
+        echo "Deleting $branch ..."
+        if git branch -D "$branch" 2>/dev/null; then
+            echo "✓ Deleted $branch"
+        else
+            echo "✗ Failed to delete $branch"
+        fi
+    done
+}

package/commands/commit.sh

@@ -0,0 +1,169 @@
+# Stage all changes and commit with a message.
+# If no commit message argument is given, prompt the user for one.
+commit() {
+  local should_push=false
+  local staged_only=false
+  local msg_parts=()
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -h|--help)
+        cat << 'EOF'
+Usage: commit [MESSAGE] [OPTIONS]
+
+Stage all changes (git add -A) and commit with a message.
+
+Options:
+  -p, --push    Push to origin after successful commit
+  -s, --staged  Commit only staged changes (skip prompt, ignore unstaged)
+  -h, --help    Show this help message
+
+Interactive mode (no message):
+  $ commit
+  Commit message: fix login bug
+  [main 1a2b3c4] fix login bug
+   1 file changed, 5 insertions(+), 2 deletions(-)
+
+With message argument:
+  $ commit implement new feature
+  [main 5d6e7f8] implement new feature
+   3 files changed, 42 insertions(+), 8 deletions(-)
+
+With push option:
+  $ commit update documentation -p
+  [main 9a8b7c6] update documentation
+   1 file changed, 10 insertions(+), 3 deletions(-)
+  Pushing 'main' to origin...
+  ✓ Successfully pushed 'main' to origin.
+
+  $ commit -p hotfix: critical bug
+  [main 3c2d1e0] hotfix: critical bug
+   2 files changed, 15 insertions(+), 5 deletions(-)
+  Pushing 'main' to origin...
+  ✓ Successfully pushed 'main' to origin.
+
+Examples:
+  commit                                    # Interactive mode
+  commit add user validation                # Quick commit
+  commit refactor auth module --push        # Commit and push
+  commit -p update dependencies             # Commit and push (short flag)
+  commit -s -p fix bug                      # Commit only staged and push
+
+EOF
+        return 0
+        ;;
+      -p|--push)
+        should_push=true
+        shift
+        ;;
+      -s|--staged)
+        staged_only=true
+        shift
+        ;;
+      -*)
+        echo "Unknown option: $1"
+        echo "Usage: commit [message] [-p|--push] [-s|--staged]"
+        return 1
+        ;;
+      *)
+        # Collect all non-flag arguments as message parts
+        msg_parts+=("$1")
+        shift
+        ;;
+    esac
+  done
+
+  # Join message parts with spaces
+  local msg="${msg_parts[*]}"
+
+  # If no commit message was provided...
+  if [ -z "$msg" ]; then
+    # Prompt the user for a commit message (no newline, no extra spaces)
+    read -rp "Commit message: " msg
+  fi
+
+  # Check if there are staged changes
+  local has_staged
+  has_staged=$(git diff --cached --name-only)
+  
+  local has_unstaged
+  has_unstaged=$(git diff --name-only)
+
+  # If --staged flag is set, only commit staged changes
+  if [[ "$staged_only" == true ]]; then
+    if [[ -z "$has_staged" ]]; then
+      echo "No staged changes to commit."
+      return 1
+    fi
+    echo "Committing staged changes only..."
+    git commit -m "$msg"
+  # If there are both staged and unstaged changes, ask what to commit
+  elif [[ -n "$has_staged" && -n "$has_unstaged" ]]; then
+    echo
+    echo "You have both staged and unstaged changes."
+    echo
+    read -rp "Commit [s]taged only, or [a]ll changes? (s/a): " commit_choice
+    
+    case "$commit_choice" in
+      [sS])
+        # Commit only staged changes
+        echo "Committing staged changes only..."
+        git commit -m "$msg"
+        ;;
+      [aA]|*)
+        # Stage all and commit
+        echo "Staging all changes and committing..."
+        git add -A && git commit -m "$msg"
+        ;;
+    esac
+  elif [[ -n "$has_staged" ]]; then
+    # Only staged changes exist
+    echo "Committing staged changes..."
+    git commit -m "$msg"
+  else
+    # No staged changes, stage all and commit
+    git add -A && git commit -m "$msg"
+  fi
+
+  # Push if requested and commit was successful
+  if [[ $? -eq 0 && "$should_push" == true ]]; then
+    current_branch=$(git rev-parse --abbrev-ref HEAD)
+    
+    # Check if remote has updates and pull first
+    git fetch origin "$current_branch" 2>/dev/null
+    local local_commit=$(git rev-parse HEAD)
+    local remote_commit=$(git rev-parse "origin/$current_branch" 2>/dev/null)
+    
+    if [[ -n "$remote_commit" && "$local_commit" != "$remote_commit" ]]; then
+      # Check if we're behind the remote
+      if git merge-base --is-ancestor "$local_commit" "$remote_commit" 2>/dev/null; then
+        echo "Remote has updates. Pulling first..."
+        git pull --rebase origin "$current_branch"
+        if [[ $? -ne 0 ]]; then
+          echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
+          return 1
+        fi
+        echo "✓ Pulled latest changes."
+      elif ! git merge-base --is-ancestor "$remote_commit" "$local_commit" 2>/dev/null; then
+        # Branches have diverged
+        echo "Remote has diverged. Pulling with rebase..."
+        git pull --rebase origin "$current_branch"
+        if [[ $? -ne 0 ]]; then
+          echo "⚠ Failed to pull remote changes. Please resolve conflicts and try again."
+          return 1
+        fi
+        echo "✓ Rebased on latest changes."
+      fi
+    fi
+    
+    echo "Pushing '$current_branch' to origin..."
+    git push origin "$current_branch"
+    if [[ $? -eq 0 ]]; then
+      echo "✓ Successfully pushed '$current_branch' to origin."
+    else
+      echo "⚠ Failed to push '$current_branch' to origin."
+      return 1
+    fi
+  fi
+}