gitbash 1.1.0 → 1.2.0

package/commands/commit.sh

@@ -11,6 +11,8 @@ source "$SOURCE_DIR/_utils.sh"
 commit() {
   local should_push=false
   local staged_only=false
+  local amend_mode=false
+  local show_prefix_menu=false
   local msg_parts=()
 
   # Parse arguments
@@ -27,9 +29,23 @@ 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
+  -p, --push      Push to origin after successful commit
+  -s, --staged    Commit only staged changes (skip prompt, ignore unstaged)
+  -a, --amend     Amend the last commit instead of creating a new one
+  -t, --type      Show conventional commit type selector (feat, fix, docs, etc.)
+  -h, --help      Show this help message
+
+Conventional Commit Types (with --type):
+  feat:     A new feature
+  fix:      A bug fix
+  docs:     Documentation only changes
+  style:    Code style changes (formatting, whitespace)
+  refactor: Code change that neither fixes a bug nor adds a feature
+  perf:     Performance improvement
+  test:     Adding or fixing tests
+  build:    Build system or dependency changes
+  ci:       CI/CD configuration changes
+  chore:    Other changes that don't modify src or test files
 
 Interactive mode (no message):
   $ commit
@@ -42,6 +58,15 @@ With message argument:
   [main 5d6e7f8] implement new feature
    3 files changed, 42 insertions(+), 8 deletions(-)
 
+With type selector:
+  $ commit -t fix broken tests
+  # Shows type menu, then commits as "fix: broken tests"
+
+Amend last commit:
+  $ commit --amend fix typo in docs
+  [main abc123] fix typo in docs
+   1 file changed, 1 insertion(+)
+
 With push option:
   $ commit update documentation -p
   [main 9a8b7c6] update documentation
@@ -49,18 +74,14 @@ With push option:
   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
+  commit -t add user endpoint               # Conventional commit with type menu
+  commit --amend fix typo                   # Amend last commit
 
 EOF
         return 0
@@ -73,9 +94,17 @@ EOF
         staged_only=true
         shift
         ;;
+      -a|--amend)
+        amend_mode=true
+        shift
+        ;;
+      -t|--type)
+        show_prefix_menu=true
+        shift
+        ;;
       -*)
         echo "Unknown option: $1"
-        echo "Usage: commit [message] [-p|--push] [-s|--staged]"
+        echo "Usage: commit [message] [-p|--push] [-s|--staged] [-a|--amend] [-t|--type]"
         return 1
         ;;
       *)
@@ -98,6 +127,58 @@ EOF
     prompt_read "Commit message: " msg
   fi
 
+  # Show conventional commit type menu if requested
+  if [[ "$show_prefix_menu" == true ]]; then
+    if ! command -v fzf >/dev/null 2>&1; then
+      print_error "fzf is required for type selector. Install it or provide message directly."
+      return 1
+    fi
+
+    local type_options
+    type_options=$(cat << 'TYPES'
+feat     - A new feature
+fix      - A bug fix
+docs     - Documentation only changes
+style    - Code style changes (formatting, whitespace)
+refactor - Code change that neither fixes nor adds a feature
+perf     - Performance improvement
+test     - Adding or fixing tests
+build    - Build system or dependency changes
+ci       - CI/CD configuration changes
+chore    - Other changes that don't modify src/test files
+TYPES
+)
+
+    local selected_type
+    selected_type=$(echo "$type_options" | fzf --prompt="Commit type > " \
+              -i \
+              --reverse \
+              --border \
+              --header="Select conventional commit type" \
+              --no-multi \
+              --bind=enter:accept \
+    ) </dev/tty || true
+
+    if [[ -z "$selected_type" ]]; then
+      echo "Aborted."
+      return 1
+    fi
+
+    # Extract just the type keyword (first word)
+    local type_keyword
+    type_keyword=$(echo "$selected_type" | awk '{print $1}')
+    
+    # Prepend to message
+    msg="${type_keyword}: ${msg}"
+    print_info "Commit message: $msg"
+  fi
+
+  # Build commit flags
+  local commit_flags=()
+  if [[ "$amend_mode" == true ]]; then
+    commit_flags+=("--amend")
+  fi
+
   # Check if there are staged changes
   local has_staged
   has_staged=$(git diff --cached --name-only)
@@ -105,8 +186,28 @@ EOF
   local has_unstaged
   has_unstaged=$(git diff --name-only)
 
+  # For amend mode, we might not need new changes
+  if [[ "$amend_mode" == true ]]; then
+    if [[ -z "$has_staged" && -z "$has_unstaged" ]]; then
+      print_info "Amending commit message only..."
+      git commit --amend -m "$msg"
+    else
+      # Has changes to add
+      if [[ "$staged_only" == true ]]; then
+        if [[ -z "$has_staged" ]]; then
+          print_info "Amending commit message only (no staged changes)..."
+          git commit --amend -m "$msg"
+        else
+          print_info "Amending with staged changes..."
+          git commit --amend -m "$msg"
+        fi
+      else
+        print_info "Amending with all changes..."
+        git add -A && git commit --amend -m "$msg"
+      fi
+    fi
   # If --staged flag is set, only commit staged changes
-  if [[ "$staged_only" == true ]]; then
+  elif [[ "$staged_only" == true ]]; then
     if [[ -z "$has_staged" ]]; then
       echo "No staged changes to commit."
       return 1
@@ -153,31 +254,31 @@ EOF
     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..."
+        print_info "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."
+          print_warning "Failed to pull remote changes. Please resolve conflicts and try again."
           return 1
         fi
-        echo "✓ Pulled latest changes."
+        print_success "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..."
+        print_info "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."
+          print_warning "Failed to pull remote changes. Please resolve conflicts and try again."
           return 1
         fi
-        echo "✓ Rebased on latest changes."
+        print_success "Rebased on latest changes."
       fi
     fi
     
-    echo "Pushing '$current_branch' to origin..."
+    print_info "Pushing '$current_branch' to origin..."
     git push origin "$current_branch"
     if [[ $? -eq 0 ]]; then
-      echo "✓ Successfully pushed '$current_branch' to origin."
+      print_success "Successfully pushed '$current_branch' to origin."
     else
-      echo "⚠ Failed to push '$current_branch' to origin."
+      print_warning "Failed to push '$current_branch' to origin."
       return 1
     fi
   fi

package/commands/commits.sh

@@ -55,29 +55,8 @@ EOF
     # -----------------------------
     # 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."
-        prompt_read "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
+    require_git_repo || return 1
+    require_fzf || return 1
 
     # -----------------------------
     # 2. Get commit count
@@ -193,7 +172,7 @@ Showing last $count commits" \
     prompt_read "Revert these ${#commits_to_revert[@]} commit(s)? (y/N): " confirm
     case "$confirm" in
         [yY][eE][sS]|[yY])
-            echo "Reverting commits..."
+            print_info "Reverting commits..."
             
             # Reverse the array to revert oldest first (avoids conflicts)
             local reversed=()
@@ -204,15 +183,15 @@ Showing last $count commits" \
             for hash in "${reversed[@]}"; do
                 echo "Reverting $hash ..."
                 if git revert --no-edit "$hash"; then
-                    echo "✓ Reverted $hash"
+                    print_success "Reverted $hash"
                 else
-                    echo "✗ Failed to revert $hash (conflict?)"
+                    print_error "Failed to revert $hash (conflict?)"
                     echo "  Resolve the conflict and run 'git revert --continue'"
                     return 1
                 fi
             done
             echo ""
-            echo "✓ All selected commits reverted."
+            print_success "All selected commits reverted."
             ;;
         *)
             echo "Revert cancelled."

package/commands/create.sh

@@ -8,24 +8,41 @@ source "$SOURCE_DIR/_utils.sh"
 
 create() {
     # -----------------------------
-    # 0. Check for help/version flag
+    # 0. Check for help/version flag and parse options
     # -----------------------------
-    if [[ "${1:-}" == "-v" || "${1:-}" == "--version" ]]; then
-        echo "gitbash ${FUNCNAME[0]} v$VERSION"
-        return 0
-    fi
-    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
-        cat << 'EOF'
-Usage: create [JIRA_LINK] [TITLE...]
+    local show_type_menu=false
+    local branch_type=""
+    local positional_args=()
+    
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            -v|--version)
+                echo "gitbash ${FUNCNAME[0]} v$VERSION"
+                return 0
+                ;;
+            -h|--help)
+                cat << 'EOF'
+Usage: create [OPTIONS] [JIRA_LINK] [TITLE...]
 
-Create a new git branch with the pattern: feature/<ISSUE>-<title>
+Create a new git branch with the pattern: <prefix>/<ISSUE>-<title>
 
 Options:
-  -h, --help    Show this help message
+  -h, --help       Show this help message
+  -t, --type       Show branch type selector menu (feature, bugfix, hotfix, release)
+  --feature        Use 'feature/' prefix (default)
+  --bugfix         Use 'bugfix/' prefix
+  --hotfix         Use 'hotfix/' prefix
+  --release        Use 'release/' prefix
 
 Configuration:
-  - Branch prefix can be changed by editing the 'GITBASH_FEATURE_BRANCH_PREFIX' variable
-  - Default: "feature/"
+  - Default branch prefix can be set via GITBASH_FEATURE_BRANCH_PREFIX in ~/.gitbashrc
+  - Run 'gitbash --config' to set default prefix
+
+Branch Types:
+  feature/  - New features and enhancements
+  bugfix/   - Bug fixes
+  hotfix/   - Urgent production fixes
+  release/  - Release preparation branches
 
 Interactive mode (no arguments):
   $ create
@@ -39,6 +56,20 @@ Interactive mode (no arguments):
   Branch name: feature/PROJ-123-fix-login-bug
   Create this branch? (y/N): y
 
+With type selector:
+  $ create -t PROJ-123 urgent fix
+  Branch type >
+  > feature/ - New features and enhancements
+    bugfix/  - Bug fixes
+    hotfix/  - Urgent production fixes
+    release/ - Release preparation branches
+  
+  # Select hotfix/, creates: hotfix/PROJ-123-urgent-fix
+
+Quick type flags:
+  $ create --bugfix PROJ-456 fix crash
+  # Creates: bugfix/PROJ-456-fix-crash
+
 One-liner mode (with arguments):
   $ create https://jira.company.com/browse/PROJ-123 fix login bug
   Parsed issue number: PROJ-123
@@ -46,33 +77,99 @@ One-liner mode (with arguments):
   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
+  create -t PROJ-789 some work                    # Show type menu
+  create --hotfix PROJ-999 critical fix           # Use hotfix prefix
 
 EOF
-        return 0
+                return 0
+                ;;
+            -t|--type)
+                show_type_menu=true
+                shift
+                ;;
+            --feature)
+                branch_type="feature/"
+                shift
+                ;;
+            --bugfix)
+                branch_type="bugfix/"
+                shift
+                ;;
+            --hotfix)
+                branch_type="hotfix/"
+                shift
+                ;;
+            --release)
+                branch_type="release/"
+                shift
+                ;;
+            *)
+                positional_args+=("$1")
+                shift
+                ;;
+        esac
+    done
+
+    # -----------------------------
+    # 1. Determine branch prefix
+    # -----------------------------
+    local branch_prefix
+    if [[ -n "$branch_type" ]]; then
+        branch_prefix="$branch_type"
+    elif [[ "$show_type_menu" == true ]]; then
+        if ! command -v fzf >/dev/null 2>&1; then
+            print_error "fzf is required for type selector. Install it or use --feature/--bugfix/--hotfix/--release flags."
+            return 1
+        fi
+
+        local type_options
+        type_options=$(cat << 'TYPES'
+feature/ - New features and enhancements
+bugfix/  - Bug fixes  
+hotfix/  - Urgent production fixes
+release/ - Release preparation branches
+TYPES
+)
+
+        local selected_type
+        selected_type=$(echo "$type_options" | fzf --prompt="Branch type > " \
+                  -i \
+                  --reverse \
+                  --border \
+                  --header="Select branch type" \
+                  --no-multi \
+                  --bind=enter:accept \
+        ) </dev/tty || true
+
+        if [[ -z "$selected_type" ]]; then
+            echo "Aborted."
+            return 1
+        fi
+
+        # Extract just the prefix (first word)
+        branch_prefix=$(echo "$selected_type" | awk '{print $1}')
+    else
+        branch_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
     fi
 
     # -----------------------------
-    # 1. Get Jira link from user (or from arguments)
+    # 2. Get Jira link from user (or from arguments)
     # -----------------------------
     local jira_link
     local branch_title
     
-    if [[ -n "${1:-}" ]]; then
+    if [[ ${#positional_args[@]} -gt 0 ]]; then
         # Arguments provided - use one-liner mode
-        jira_link="$1"
-        shift
+        jira_link="${positional_args[0]}"
         # Join remaining arguments as title
-        branch_title="$*"
+        if [[ ${#positional_args[@]} -gt 1 ]]; then
+            branch_title="${positional_args[*]:1}"
+        else
+            branch_title=""
+        fi
     else
         # Interactive mode
         echo "Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):"
@@ -131,7 +228,7 @@ EOF
     # -----------------------------
     # 4. Construct branch name
     # -----------------------------
-    local branch_prefix="${GITBASH_FEATURE_BRANCH_PREFIX:-feature/}"
+    # branch_prefix is set earlier from type menu, flag, or config
     local branch_name="${branch_prefix}${issue_number}-${branch_title}"
     
     echo
@@ -142,7 +239,7 @@ EOF
     # 5. Check if branch already exists
     # -----------------------------
     if git show-ref --verify --quiet "refs/heads/$branch_name"; then
-        echo "⚠ Branch '$branch_name' already exists locally."
+        print_warning "Branch '$branch_name' already exists locally."
         prompt_read "Switch to this branch instead? (Y/n): " ans
         case "$ans" in
             [nN][oO]|[nN])
@@ -151,7 +248,7 @@ EOF
                 ;;
             *)
                 git checkout "$branch_name"
-                echo "✓ Switched to existing branch: $branch_name"
+                print_success "Switched to existing branch: $branch_name"
                 return 0
                 ;;
         esac
@@ -167,37 +264,37 @@ EOF
     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."
+        print_warning "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..."
+        print_info "Updating '$base_branch' from origin..."
         if git fetch origin "$base_branch:$base_branch" 2>/dev/null; then
-            echo "✓ '$base_branch' is up to date."
+            print_success "'$base_branch' is up to date."
         else
-            echo "⚠ Could not update '$base_branch' from origin. Creating branch from local '$base_branch'."
+            print_warning "Could not update '$base_branch' from origin. Creating branch from local '$base_branch'."
         fi
     fi
 
     # -----------------------------
     # 7. Create branch
     # -----------------------------
-    echo "Creating branch..."
+    print_info "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)"
+            print_success "Successfully created and switched to branch: $branch_name (from $base_branch)"
         else
-            echo "✗ Failed to create branch."
+            print_error "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"
+            print_success "Successfully created and switched to branch: $branch_name"
         else
-            echo "✗ Failed to create branch."
+            print_error "Failed to create branch."
             return 1
         fi
     fi
@@ -205,10 +302,10 @@ EOF
     # -----------------------------
     # 8. Push branch to origin and set up tracking
     # -----------------------------
-    echo "Pushing branch to origin and setting up tracking..."
+    print_info "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."
+        print_success "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"
+        print_warning "Failed to push branch to origin. You can push it later with: git push -u origin $branch_name"
     fi
 }