Add feature to convert existing branches to stack branches

This commit adds the ability to run 'git stack create' without arguments
to convert the current branch into a stack branch by appending '-0' to
its name. When run without arguments on a non-stack branch, the command
will prompt for confirmation before converting.

- Modified create_branch function to handle no-argument case
- Added test_convert_to_stack function to verify the new functionality
- Updated run_all_tests to include the new test
- Maintains backward compatibility with existing usage

Author: Dag Jomar Mersland

bin/gitstack.sh

@@ -55,12 +55,46 @@ function usage() {
 # Create a new branch: "<base_name>-0"
 function create_branch() {
   local base_name="$1"
+  local current_branch
+  current_branch=$(git rev-parse --abbrev-ref HEAD)
 
+  # If no base name provided, try to convert current branch
   if [ -z "$base_name" ]; then
-    echo "Error: Missing <base_name> for 'create'."
-    usage
+    # Check if already on a stack branch
+    if get_stack_info; then
+      echo "Already on a stack branch '$current_branch'."
+      exit 0
+    fi
+    
+    # Prompt for confirmation
+    read -r -p "Already on a branch named $current_branch. Create a stack from this branch? [Y/n] " response
+    response=${response:-y}  # Default to yes
+    
+    if [[ ! "$response" =~ ^[Yy]$ ]]; then
+      echo "Conversion cancelled."
+      exit 0
+    fi
+    
+    # Create new stack branch
+    local new_branch="${current_branch}-0"
+    
+    # Check if the new branch already exists
+    if git rev-parse --verify "$new_branch" &>/dev/null; then
+      echo "Error: Branch '$new_branch' already exists. Aborting."
+      exit 1
+    fi
+    
+    echo "Creating stack branch: $new_branch"
+    if ! git checkout -b "$new_branch"; then
+      echo "Error: Failed to create branch '$new_branch'."
+      exit 1
+    fi
+    
+    echo "Branch '$new_branch' successfully created and checked out."
+    return 0
   fi
 
+  # Original functionality for when base_name is provided
   local new_branch="${base_name}-0"
 
   # Check if branch already exists
@@ -783,6 +817,60 @@ function next_stack() {
   echo "Successfully checked out next branch '$next_branch'."
 }
 
+# Force-push all branches in a stack to remote
+# Usage: fp_stack [base_name]
+# If no base_name is provided, uses the current branch's stack
+function fp_stack() {
+  local base_name="$1"
+  local current_branch
+  current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+  # If no base name provided, try to get it from current branch
+  if [ -z "$base_name" ]; then
+    if ! get_stack_info; then
+      echo "Error: Not currently on a stack branch and no stack name provided."
+      echo "Usage: $0 fp [stack-name]"
+      exit 1
+    fi
+    base_name="$STACK_BASE"
+  fi
+
+  # Get all branches in the stack
+  local branches
+  branches=$(git branch --list "${base_name}-[0-9]*" --format="%(refname:short)" | sort -V)
+  
+  if [ -z "$branches" ]; then
+    echo "Error: No branches found in stack '$base_name'"
+    exit 1
+  fi
+
+  # Save current branch to return to it later
+  local original_branch="$current_branch"
+  local success=true
+
+  echo "Force-pushing branches in stack '$base_name' to remote..."
+  while read -r branch; do
+    echo "Pushing $branch..."
+    if ! git push -f origin "$branch"; then
+      echo "Error: Failed to push branch '$branch'"
+      success=false
+      break
+    fi
+  done <<< "$branches"
+
+  # Return to original branch if different
+  if [ "$original_branch" != "$current_branch" ]; then
+    git checkout "$original_branch"
+  fi
+
+  if [ "$success" = true ]; then
+    echo "✅ Successfully force-pushed all branches in stack '$base_name'"
+  else
+    echo "⚠️  Some branches may not have been pushed successfully"
+    exit 1
+  fi
+}
+
 # Only process arguments if script is run directly (not sourced)
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   subcommand="$1"

bin/gitstack_test.sh

@@ -413,6 +413,30 @@ function test_stack_navigation() {
   rm -f test1.txt test2.txt test3.txt
 }
 
+# Test convert to stack functionality
+function test_convert_to_stack() {
+  echo "Testing convert to stack..."
+  
+  # Create a regular branch
+  git checkout main 2>/dev/null || git checkout master 2>/dev/null
+  git checkout -b dj/my-feature
+  
+  # Test converting to stack branch
+  # Simulate user input 'y' for the prompt
+  echo "y" | "$SCRIPT_DIR/gitstack.sh" create
+  
+  local current
+  current=$(current_branch)
+  if [ "$current" = "dj/my-feature-0" ]; then
+    echo "✅ Successfully converted 'dj/my-feature' to 'dj/my-feature-0'"
+  else
+    fail "Failed to convert branch to stack, got '$current'"
+  fi
+  
+  git checkout main 2>/dev/null || git checkout master 2>/dev/null
+  git branch -D dj/my-feature-0
+}
+
 # Run all tests
 function run_all_tests() {
   source_gitstack
@@ -423,6 +447,7 @@ function run_all_tests() {
   test_status_command
   test_fix_command
   test_stack_navigation
+  test_convert_to_stack
 }
 
 # Get the absolute path of the script directory