gitbash 0.1.0

package/commands/commits.sh

@@ -0,0 +1,211 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# List recent commits and optionally revert selected ones
+commits() {
+    # -----------------------------
+    # 0. Check for help flag
+    # -----------------------------
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        cat << 'EOF'
+Usage: commits [COUNT]
+
+List recent commits in the current branch with option to revert selected ones.
+
+Arguments:
+  COUNT         Number of commits to show (default: 20)
+
+Navigation:
+  ↑/↓ or j/k    Navigate through commits
+  TAB           Select/deselect commit for revert
+  Enter         Revert selected commit(s)
+  ESC/Ctrl-C    Exit without action
+
+Notes:
+  - Shows commits from newest to oldest
+  - Preview shows full commit diff
+  - Multiple commits can be selected for revert
+  - Reverts are done in reverse order (oldest first) to avoid conflicts
+  - Each revert creates a new commit
+
+Examples:
+  $ commits
+  # Shows last 20 commits
+
+  $ commits 50
+  # Shows last 50 commits
+
+Requirements:
+  - Must be in a git repository
+  - fzf (fuzzy finder)
+
+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."
+        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
+
+    # -----------------------------
+    # 2. Get commit count
+    # -----------------------------
+    local count="${1:-20}"
+    local abort_label="✖ Abort"
+    local current_branch
+    current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+    # -----------------------------
+    # 3. Build commit list
+    # -----------------------------
+    local commit_list
+    commit_list=$(git log -n "$count" --format="%h|%s|%cr|%an" | while IFS='|' read -r hash subject date author; do
+        # Truncate subject if too long
+        if [[ ${#subject} -gt 60 ]]; then
+            subject="${subject:0:57}..."
+        fi
+        printf "%-8s  %-60s  %-15s  %s\t%s\n" "$hash" "$subject" "$date" "$author" "$hash"
+    done)
+
+    if [[ -z "$commit_list" ]]; then
+        echo "No commits found."
+        return 0
+    fi
+
+    # Add abort option
+    commit_list+=$'\n'"$abort_label"$'\t'
+
+    # Create temp file
+    local commit_file
+    commit_file=$(mktemp)
+    echo "$commit_list" > "$commit_file"
+
+    # -----------------------------
+    # 4. Run fzf picker
+    # -----------------------------
+    local selection
+    selection=$(cat "$commit_file" | fzf \
+        --prompt="Commits on '$current_branch' > " \
+        -i \
+        --reverse \
+        --border \
+        --header="[TAB] select for revert | [Enter] revert selected | [ESC] exit
+Showing last $count commits" \
+        --multi \
+        --delimiter=$'\t' \
+        --with-nth=1 \
+        --bind=enter:accept \
+        --preview='
+            line={}
+            if [[ "$line" == "✖ Abort"* ]]; then
+                echo "Exit without action";
+            else
+                hash=$(echo "$line" | cut -f2)
+                echo "Commit: $hash";
+                echo "";
+                git show --stat --color=always "$hash" 2>/dev/null;
+                echo "";
+                echo "─────────────────────────────────────────────────────";
+                echo "";
+                git show --color=always "$hash" 2>/dev/null | head -100;
+            fi
+        ' \
+        --preview-window=right:50%
+    )
+
+    # Cleanup temp file
+    rm -f "$commit_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
+
+    # -----------------------------
+    # 5. Extract commit hashes and confirm revert
+    # -----------------------------
+    local commits_to_revert=()
+
+    while IFS= read -r line; do
+        [[ "$line" == "✖ Abort"* ]] && continue
+        local hash
+        hash=$(echo "$line" | cut -f2)
+        if [[ -n "$hash" ]]; then
+            commits_to_revert+=("$hash")
+        fi
+    done <<< "$selection"
+
+    if [[ ${#commits_to_revert[@]} -eq 0 ]]; then
+        echo "No commits selected."
+        return 0
+    fi
+
+    echo ""
+    echo "Selected commits to revert:"
+    for hash in "${commits_to_revert[@]}"; do
+        local subject
+        subject=$(git log -1 --format="%s" "$hash")
+        echo "  - $hash: $subject"
+    done
+    echo ""
+
+    local confirm
+    read -rp "Revert these ${#commits_to_revert[@]} commit(s)? (y/N): " confirm
+    case "$confirm" in
+        [yY][eE][sS]|[yY])
+            echo "Reverting commits..."
+            
+            # Reverse the array to revert oldest first (avoids conflicts)
+            local reversed=()
+            for ((i=${#commits_to_revert[@]}-1; i>=0; i--)); do
+                reversed+=("${commits_to_revert[$i]}")
+            done
+
+            for hash in "${reversed[@]}"; do
+                echo "Reverting $hash ..."
+                if git revert --no-edit "$hash"; then
+                    echo "✓ Reverted $hash"
+                else
+                    echo "✗ Failed to revert $hash (conflict?)"
+                    echo "  Resolve the conflict and run 'git revert --continue'"
+                    return 1
+                fi
+            done
+            echo ""
+            echo "✓ All selected commits reverted."
+            ;;
+        *)
+            echo "Revert cancelled."
+            ;;
+    esac
+}

package/commands/create.sh

@@ -0,0 +1,205 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+create() {
+    # -----------------------------
+    # 0. Check for help flag
+    # -----------------------------
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        cat << 'EOF'
+Usage: create [JIRA_LINK] [TITLE...]
+
+Create a new git branch with the pattern: feature/<ISSUE>-<title>
+
+Options:
+  -h, --help    Show this help message
+
+Configuration:
+  - Branch prefix can be changed by editing the 'GITBASH_FEATURE_BRANCH_PREFIX' variable
+  - Default: "feature/"
+
+Interactive mode (no arguments):
+  $ create
+  Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):
+  > https://jira.company.com/browse/PROJ-123
+  Parsed issue number: PROJ-123
+
+  Enter branch title (will be converted to lowercase with dashes):
+  > Fix Login Bug
+  
+  Branch name: feature/PROJ-123-fix-login-bug
+  Create this branch? (y/N): y
+
+One-liner mode (with arguments):
+  $ create https://jira.company.com/browse/PROJ-123 fix login bug
+  Parsed issue number: PROJ-123
+  
+  Branch name: feature/PROJ-123-fix-login-bug
+  Create this branch? (y/N): y
+
+  $ create PROJ-456 add user settings
+  Parsed issue number: PROJ-456
+  
+  Branch name: feature/PROJ-456-add-user-settings
+  Create this branch? (y/N): y
+
+Examples:
+  create https://jira.company.com/browse/PROJ-123 make some fixes
+  create PROJ-456 implement new feature
+  create https://company.atlassian.net/browse/ABC-789 refactor code
+
+EOF
+        return 0
+    fi
+
+    # -----------------------------
+    # 1. Get Jira link from user (or from arguments)
+    # -----------------------------
+    local jira_link
+    local branch_title
+    
+    if [[ -n "${1:-}" ]]; then
+        # Arguments provided - use one-liner mode
+        jira_link="$1"
+        shift
+        # Join remaining arguments as title
+        branch_title="$*"
+    else
+        # Interactive mode
+        echo "Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):"
+        read -rp " > " jira_link
+    fi
+
+    if [[ -z "$jira_link" ]]; then
+        echo "Error: No Jira link provided."
+        return 1
+    fi
+
+    # -----------------------------
+    # 2. Parse issue number from Jira link
+    # -----------------------------
+    local issue_number
+    # First try to match just the issue number pattern (e.g., PROJ-123)
+    issue_number=$(echo "$jira_link" | grep -o -E '^[A-Z]+-[0-9]+$' | head -1)
+    
+    # If not a direct match, try to extract from URL
+    if [[ -z "$issue_number" ]]; then
+        # Match patterns like PROJ-123, ABC-456, etc.
+        # Supports both /browse/PROJ-123 and selectedIssue=PROJ-123 formats
+        issue_number=$(echo "$jira_link" | grep -o -E '(browse/|selectedIssue=)[A-Z]+-[0-9]+' | grep -o '[A-Z]\+-[0-9]\+' | head -1)
+    fi
+
+    if [[ -z "$issue_number" ]]; then
+        echo "Warning: Could not parse issue number from Jira link. Using NOISSUE."
+        issue_number="NOISSUE"
+        # If parsing failed and we had arguments, include the first arg in the title
+        if [[ -n "$branch_title" ]]; then
+            branch_title="$jira_link $branch_title"
+        else
+            branch_title="$jira_link"
+        fi
+    else
+        echo "Parsed issue number: $issue_number"
+    fi
+    echo
+
+    # -----------------------------
+    # 3. Get branch title from user (if not already provided)
+    # -----------------------------
+    if [[ -z "$branch_title" ]]; then
+        echo "Enter branch title (will be converted to lowercase with dashes):"
+        read -rp " > " branch_title
+    fi
+
+    if [[ -z "$branch_title" ]]; then
+        echo "Error: No branch title provided."
+        return 1
+    fi
+
+    # Convert title to lowercase and replace spaces/special chars with dashes
+    branch_title=$(echo "$branch_title" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//;s/-$//')
+
+    # -----------------------------
+    # 4. Construct branch name
+    # -----------------------------
+    local branch_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
+    local branch_name="${branch_prefix}${issue_number}-${branch_title}"
+    
+    echo
+    echo "Branch name: $branch_name"
+    echo
+
+    # -----------------------------
+    # 5. Check if branch already exists
+    # -----------------------------
+    if git show-ref --verify --quiet "refs/heads/$branch_name"; then
+        echo "⚠ Branch '$branch_name' already exists locally."
+        read -rp "Switch to this branch instead? (Y/n): " ans
+        case "$ans" in
+            [nN][oO]|[nN])
+                echo "Aborted."
+                return 1
+                ;;
+            *)
+                git checkout "$branch_name"
+                echo "✓ Switched to existing branch: $branch_name"
+                return 0
+                ;;
+        esac
+    fi
+
+    # -----------------------------
+    # 6. Update main/master branch before creating new branch
+    # -----------------------------
+    # Detect base branch: main or master
+    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
+        echo "⚠ Could not detect 'main' or 'master' branch. Creating branch from current HEAD."
+        base_branch=""
+    fi
+
+    if [[ -n "$base_branch" ]]; then
+        echo "Updating '$base_branch' from origin..."
+        if git fetch origin "$base_branch:$base_branch" 2>/dev/null; then
+            echo "✓ '$base_branch' is up to date."
+        else
+            echo "⚠ Could not update '$base_branch' from origin. Creating branch from local '$base_branch'."
+        fi
+    fi
+
+    # -----------------------------
+    # 7. Create branch
+    # -----------------------------
+    echo "Creating branch..."
+    if [[ -n "$base_branch" ]]; then
+        # Create branch from updated base branch
+        if git checkout -b "$branch_name" "$base_branch"; then
+            echo "✓ Successfully created and switched to branch: $branch_name (from $base_branch)"
+        else
+            echo "✗ Failed to create branch."
+            return 1
+        fi
+    else
+        # Fallback: create from current HEAD
+        if git checkout -b "$branch_name"; then
+            echo "✓ Successfully created and switched to branch: $branch_name"
+        else
+            echo "✗ Failed to create branch."
+            return 1
+        fi
+    fi
+
+    # -----------------------------
+    # 8. Push branch to origin and set up tracking
+    # -----------------------------
+    echo "Pushing branch to origin and setting up tracking..."
+    if git push -u origin "$branch_name"; then
+        echo "✓ Successfully pushed '$branch_name' to origin with tracking."
+    else
+        echo "⚠ Failed to push branch to origin. You can push it later with: git push -u origin $branch_name"
+    fi
+}

package/commands/pr.sh

@@ -0,0 +1,130 @@
+## pr opens the current pr, if in repo
+pr() {
+  local should_push=false
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      -h|--help)
+        cat << 'EOF'
+Usage: pr [OPTIONS]
+
+Open the current branch's pull request in your browser.
+If no PR exists, opens GitHub's compare page to create one.
+
+Options:
+  -p, --push    Push current branch to origin before opening PR
+  -h, --help    Show this help message
+
+Behavior:
+  - Must be run inside a git repository
+  - Uses the 'origin' remote URL
+  - Opens a compare URL for the current branch
+  - Automatically converts SSH URLs to HTTPS
+
+Examples:
+  $ pr
+  # Opens: https://github.com/user/repo/compare/feature-branch?expand=1
+
+  $ git checkout feature/helix/LOVE-123-fix-bug
+  $ pr
+  # Opens: https://github.com/user/repo/compare/feature/helix/LOVE-123-fix-bug?expand=1
+
+  # Push before opening PR
+  $ pr -p
+  Pushing 'feature-branch' to origin...
+  ✓ Successfully pushed 'feature-branch' to origin.
+  # Opens: https://github.com/user/repo/compare/feature-branch?expand=1
+
+Notes:
+  - Works with both SSH and HTTPS remote URLs
+  - Opens in your default browser using the 'open' command
+  - Branch name is automatically URL-encoded by the browser
+
+EOF
+        return 0
+        ;;
+      -p|--push)
+        should_push=true
+        shift
+        ;;
+      -*)
+        echo "Unknown option: $1"
+        echo "Usage: pr [-p|--push]"
+        return 1
+        ;;
+      *)
+        echo "Unknown argument: $1"
+        echo "Usage: pr [-p|--push]"
+        return 1
+        ;;
+    esac
+  done
+
+  # Ensure we're inside a Git repo
+  if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    echo "Not inside a git repository."
+    return 1
+  fi
+
+  # Remote URL (e.g. git@github.com:user/repo.git or https://github.com/user/repo.git)
+  remote=$(git config --get remote.origin.url)
+
+  if [[ -z "$remote" ]]; then
+    echo "No remote 'origin' found."
+    return 1
+  fi
+
+  # Convert SSH URLs to HTTPS URLs
+  remote_https=$remote
+  remote_https=${remote_https/git@github.com:/https://github.com/}
+  remote_https=${remote_https%.git}
+
+  # Current branch
+  branch=$(git rev-parse --abbrev-ref HEAD)
+
+  # Push if requested
+  if [[ "$should_push" == true ]]; then
+    # Check if remote has updates and pull first
+    git fetch origin "$branch" 2>/dev/null
+    local local_commit=$(git rev-parse HEAD)
+    local remote_commit=$(git rev-parse "origin/$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 "$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 "$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 '$branch' to origin..."
+    git push origin "$branch"
+    if [[ $? -eq 0 ]]; then
+      echo "✓ Successfully pushed '$branch' to origin."
+    else
+      echo "⚠ Failed to push '$branch' to origin."
+      return 1
+    fi
+  fi
+
+  # Construct compare URL
+  url="$remote_https/compare/$branch?expand=1"
+
+  # Open in browser
+  open "$url"
+}